diff --git a/.gitignore b/.gitignore
index 23a7add1..93f5fe3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ po/quot.sed
 po/stamp-it
 SlackBuild
 stamp-h1
+po/*.po
+m4/*
diff --git a/Expense/expense.c b/Expense/expense.c
index 4822b31a..ea411485 100644
--- a/Expense/expense.c
+++ b/Expense/expense.c
@@ -4,7 +4,7 @@
  * This is a plugin for J-Pilot which implements an interface to the
  * Palm Expense application.
  *
- * Copyright (C) 1999 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/KeyRing/keyring.c b/KeyRing/keyring.c
index f5e715a9..62d22339 100644
--- a/KeyRing/keyring.c
+++ b/KeyRing/keyring.c
@@ -4,7 +4,7 @@
  * This is a plugin for J-Pilot for the KeyRing Palm program.
  * It keeps records and uses DES3 encryption.
  *
- * Copyright (C) 2001 by Judd Montgomery
+ * Copyright (C) 2001-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SyncTime/synctime.c b/SyncTime/synctime.c
index d5ac91af..dafc9ee6 100644
--- a/SyncTime/synctime.c
+++ b/SyncTime/synctime.c
@@ -4,7 +4,7 @@
  * This is a plugin for J-Pilot which sets the time on the handheld
  * to the current time of the desktop.
  *
- * Copyright (C) 1999 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/address.c b/address.c
index d39e9249..6b103571 100644
--- a/address.c
+++ b/address.c
@@ -2,7 +2,7 @@
  * address.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/address.h b/address.h
index 9febd786..34f1e820 100644
--- a/address.h
+++ b/address.h
@@ -2,7 +2,7 @@
  * address.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/address_gui.c b/address_gui.c
index ca7b56d0..62e7f7ab 100644
--- a/address_gui.c
+++ b/address_gui.c
@@ -2,7 +2,7 @@
  * address_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2006 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/alarms.c b/alarms.c
index 2123734a..6f7e2f4d 100644
--- a/alarms.c
+++ b/alarms.c
@@ -2,7 +2,7 @@
  * alarms.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2000-2002 by Judd Montgomery
+ * Copyright (C) 2000-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/alarms.h b/alarms.h
index 13b0e901..a06ec27f 100644
--- a/alarms.h
+++ b/alarms.h
@@ -2,7 +2,7 @@
  * alarms.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 2000-2002 by Judd Montgomery
+ * Copyright (C) 2000-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/calendar.c b/calendar.c
index 6147ba29..37f9e581 100644
--- a/calendar.c
+++ b/calendar.c
@@ -2,7 +2,7 @@
  * calendar.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2009 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/calendar.h b/calendar.h
index 90baac1d..98d7d569 100644
--- a/calendar.h
+++ b/calendar.h
@@ -2,7 +2,7 @@
  * calendar.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2010 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/category.c b/category.c
index e1decde6..b59f05ea 100644
--- a/category.c
+++ b/category.c
@@ -2,7 +2,7 @@
  * category.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2009-2010 by Judd Montgomery
+ * Copyright (C) 2009-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/contact.c b/contact.c
index eae67cc5..5ca3df68 100644
--- a/contact.c
+++ b/contact.c
@@ -2,7 +2,7 @@
  * contact.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2006 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/dat.c b/dat.c
index b008b37e..56d372e3 100644
--- a/dat.c
+++ b/dat.c
@@ -2,7 +2,7 @@
  * dat.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2001-2002 by Judd Montgomery
+ * Copyright (C) 2001-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/datebook.c b/datebook.c
index cda87225..6cf74594 100644
--- a/datebook.c
+++ b/datebook.c
@@ -2,7 +2,7 @@
  * datebook.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/datebook.h b/datebook.h
index 039bfcc0..826911c6 100644
--- a/datebook.h
+++ b/datebook.h
@@ -2,7 +2,7 @@
  * datebook.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/datebook_gui.c b/datebook_gui.c
index 907e81fc..da30306a 100644
--- a/datebook_gui.c
+++ b/datebook_gui.c
@@ -2,7 +2,7 @@
  * datebook_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/dialer.c b/dialer.c
index f0953eda..3e728244 100644
--- a/dialer.c
+++ b/dialer.c
@@ -2,7 +2,7 @@
  * dialer.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/dialer/jpilot-dial.c b/dialer/jpilot-dial.c
index a7554772..5922e2b2 100644
--- a/dialer/jpilot-dial.c
+++ b/dialer/jpilot-dial.c
@@ -2,7 +2,7 @@
  * jpilot-dial.c
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2004 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/export.h b/export.h
index 8fa4d884..ebadc4ab 100644
--- a/export.h
+++ b/export.h
@@ -2,7 +2,7 @@
  * export.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/export_gui.c b/export_gui.c
index f9ac35f4..57ac964b 100644
--- a/export_gui.c
+++ b/export_gui.c
@@ -2,7 +2,7 @@
  * export_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/i18n.h b/i18n.h
index 27ab00ec..da2a8c52 100644
--- a/i18n.h
+++ b/i18n.h
@@ -2,7 +2,7 @@
  * i18n.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/icons/appl_menu_icons.h b/icons/appl_menu_icons.h
index 10c455cd..4c218b14 100644
--- a/icons/appl_menu_icons.h
+++ b/icons/appl_menu_icons.h
@@ -2,7 +2,7 @@
  * appl_menu_icons.h
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2010 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/icons/clist_mini_icons.h b/icons/clist_mini_icons.h
index df3f6a02..49b2c2d5 100644
--- a/icons/clist_mini_icons.h
+++ b/icons/clist_mini_icons.h
@@ -2,7 +2,7 @@
  * clist_mini_icons.h
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2010 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/icons/lock_icons.h b/icons/lock_icons.h
index e11ee8b7..0db2b2e4 100644
--- a/icons/lock_icons.h
+++ b/icons/lock_icons.h
@@ -2,7 +2,7 @@
  * lock_icons.h
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2010 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/import_gui.c b/import_gui.c
index 416efbf8..6fddcb28 100644
--- a/import_gui.c
+++ b/import_gui.c
@@ -2,7 +2,7 @@
  * import_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/install_gui.c b/install_gui.c
index 82cc8f11..1bc9718e 100644
--- a/install_gui.c
+++ b/install_gui.c
@@ -2,7 +2,7 @@
  * install_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2010 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/install_user.c b/install_user.c
index 9c2055e5..6aa3fc84 100644
--- a/install_user.c
+++ b/install_user.c
@@ -2,7 +2,7 @@
  * install_user.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2005 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/install_user.h b/install_user.h
index 81376a6a..33ca34c3 100644
--- a/install_user.h
+++ b/install_user.h
@@ -2,7 +2,7 @@
  * jpilot.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2003 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/jp-contact.c b/jp-contact.c
index fbf1cf2b..88d7f7f9 100644
--- a/jp-contact.c
+++ b/jp-contact.c
@@ -2,7 +2,7 @@
  * contact.c:  Translate Palm contact data formats
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2003-2006 by Judd Montgomery
+ * Copyright (C) 2003-2014 by Judd Montgomery
  *
  * This code is NOT derived from contact.c from pilot-link
  *  pilot-link's contact.c was based on this code.
diff --git a/jp-pi-contact.h b/jp-pi-contact.h
index f6999b62..f36e679d 100644
--- a/jp-pi-contact.h
+++ b/jp-pi-contact.h
@@ -2,7 +2,7 @@
  * jp-pi-contact.h:  Translate Palm contact data formats
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2003-2006 by Judd Montgomery
+ * Copyright (C) 2003-2014 by Judd Montgomery
  *
  * This code is NOT derived from pi-contact.h from pilot-link.
  *  pilot-link's pi-contact.h was based on this code.
diff --git a/jpilot-merge.c b/jpilot-merge.c
index 58989594..e69feaa6 100644
--- a/jpilot-merge.c
+++ b/jpilot-merge.c
@@ -2,7 +2,7 @@
  * merge.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2010-2011 by Judd Montgomery
+ * Copyright (C) 2010-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/jpilot-sync.c b/jpilot-sync.c
index 16bf9518..6de4f61e 100644
--- a/jpilot-sync.c
+++ b/jpilot-sync.c
@@ -2,7 +2,7 @@
  * jpilot-sync.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/jpilot.c b/jpilot.c
index 43f84425..59b40e65 100644
--- a/jpilot.c
+++ b/jpilot.c
@@ -2,7 +2,7 @@
  * jpilot.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2003 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/jpilot.h b/jpilot.h
index c38c5b25..b1cef729 100644
--- a/jpilot.h
+++ b/jpilot.h
@@ -2,7 +2,7 @@
  * jpilot.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2003 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/libplugin.c b/libplugin.c
index fcfe7872..e1847871 100644
--- a/libplugin.c
+++ b/libplugin.c
@@ -2,7 +2,7 @@
  * libplugin.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/libplugin.h b/libplugin.h
index cd247c24..0fd77e8e 100644
--- a/libplugin.h
+++ b/libplugin.h
@@ -2,7 +2,7 @@
  * libplugin.h
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/log.c b/log.c
index 5e4aedd8..fd99fff7 100644
--- a/log.c
+++ b/log.c
@@ -2,7 +2,7 @@
  * log.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/log.h b/log.h
index 279b8319..b387c6fb 100644
--- a/log.h
+++ b/log.h
@@ -2,7 +2,7 @@
  * log.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/memo.c b/memo.c
index 597fa9ec..d559eb34 100644
--- a/memo.c
+++ b/memo.c
@@ -2,7 +2,7 @@
  * memo.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/memo.h b/memo.h
index b9a3270e..81c1231c 100644
--- a/memo.h
+++ b/memo.h
@@ -2,7 +2,7 @@
  * memo.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/memo_gui.c b/memo_gui.c
index ade7c2cc..825361bd 100644
--- a/memo_gui.c
+++ b/memo_gui.c
@@ -2,7 +2,7 @@
  * memo_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/monthview_gui.c b/monthview_gui.c
index 29b6f093..f57566ac 100644
--- a/monthview_gui.c
+++ b/monthview_gui.c
@@ -2,7 +2,7 @@
  * monthview_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/password.c b/password.c
index f139b0fc..a5e69646 100644
--- a/password.c
+++ b/password.c
@@ -2,7 +2,7 @@
  * password.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/password.h b/password.h
index 177b998f..f1a03ee2 100644
--- a/password.h
+++ b/password.h
@@ -2,7 +2,7 @@
  * password.h
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/plugins.c b/plugins.c
index 46691473..06f26bee 100644
--- a/plugins.c
+++ b/plugins.c
@@ -2,7 +2,7 @@
  * plugins.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/plugins.h b/plugins.h
index 79327985..057dedfb 100644
--- a/plugins.h
+++ b/plugins.h
@@ -2,7 +2,7 @@
  * plugins.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/po/ca.po b/po/ca.po
index e40868bb..07901995 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,663 +6,954 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.2\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2002-01-24 14:20GMT\n"
 "Last-Translator: Leopold Palomo <lepalom@wol.es>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "error"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "Error llegint"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, fuzzy, c-format
 msgid "Error reading file: %s\n"
 msgstr "Error llegint"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "error"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
 msgstr ""
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, fuzzy, c-format
 msgid "Unable to open file: %s\n"
 msgstr "No s'ha pogut obrir %s\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "No s'ha pogut obrir %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "L'arxiu no sembla tenir el format d'adreces\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "No registrat"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "D'acord"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "No"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Sí"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s és un directori"
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Error obrint arxiu"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Voleu sobreescriure l'arxiu %s?"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Sobreescriure arxiu?"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, fuzzy, c-format
 msgid "Error opening file: %s"
 msgstr "Error obrint arxiu"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr ""
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-#, fuzzy
-msgid "Field"
-msgstr "Ha fallat.\n"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Categoria"
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Privat"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr ""
+
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr ""
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "Empresa/Nom"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Nom/Empresa"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Nom/Empresa"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Empresa/Nom"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr ""
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr ""
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, fuzzy, c-format
 msgid "executing command = [%s]\n"
 msgstr "Executa aquesta ordre"
 
-#. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
-msgid "Category: "
-msgstr "Categoria"
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
+#: ../address_gui.c:2479
+msgid "Birthday"
 msgstr ""
 
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "Ha fallat.\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
 msgstr ""
 
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#. Category menu
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
+msgid "Category: "
+msgstr "Categoria"
+
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr ""
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr ""
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr ""
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "Cap registre"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d de %d registres"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Nom"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Adreces"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Altres"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Cap"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
 msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telèfon"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 #, fuzzy
 msgid "Quick Find: "
 msgstr "Cerca ràpida"
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Anul·lar"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr ""
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Suprimir"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 #, fuzzy
 msgid "Delete the selected record"
 msgstr "%s registres esborrats."
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete"
 msgstr "Suprimir"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete the selected record"
 msgstr "%s registres esborrats."
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 #, fuzzy
 msgid "Copy the selected record"
 msgstr "Afegir registre"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Nou registre"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 #, fuzzy
 msgid "Add a new record"
 msgstr "Afegir registre"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Afegir registre"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 #, fuzzy
 msgid "Add the new record"
 msgstr "Afegir registre"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Aplicar Canvis"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr ""
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privat"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "Nom"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "Adreces"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "Altres"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "Anul·lar"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "Tot"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Suprimir"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "Mostra\n"
 "a la llista"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "Vista ràpida"
+#: ../address_gui.c:4347
+msgid "Reminder"
+msgstr ""
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "Dies"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Tot"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minuts"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Hores"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr ""
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, fuzzy, c-format
-msgid "Unable to open %s%s file\n"
+msgid "Unable to open file: %s%s\n"
 msgstr "No s'ha pogut obrir %s\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Cita"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Cita"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Cita"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr ""
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr ""
-
-#: ../alarms.c:1531
-#, fuzzy, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "No s'ha pogut obrir %s\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-#, fuzzy
-msgid "rename failed"
-msgstr "Instal·lació de %s ha fallat"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "El fitxer del PC està corrupte?\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek ha fallat - error greu\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+#, fuzzy
+msgid "rename failed"
+msgstr "Instal·lació de %s ha fallat"
+
+#: ../category.c:407
 #, fuzzy
 msgid "Move"
 msgstr "Dll"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr ""
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr ""
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr ""
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr ""
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr ""
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr ""
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr ""
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr ""
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr ""
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
 msgstr ""
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr ""
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr ""
 
-#. correctly translate title
-#: ../category.c:813
+#. Category names in host character set
+#: ../category.c:733
 #, fuzzy
-msgid "category name"
+msgid "Category"
 msgstr "Categoria"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr ""
 
-#: ../category.c:845
+#: ../category.c:841
 #, fuzzy
 msgid "Rename"
 msgstr "Nom"
 
-#: ../category.c:960
-msgid "debug"
-msgstr ""
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr ""
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr ""
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr ""
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+msgid "It should be:"
 msgstr ""
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr ""
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr ""
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Repetir tots els"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Repetir els dies:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Repetir tots els"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Repetir els dies:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Repetir els dies:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Repetir els dies:"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Di"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Dll"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Dt"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Dc"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Dj"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Dv"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Ds"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Finalitza a la data"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Repetir els dies:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "número de registres = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Cap"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Alarma"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Repetir tots els"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Dia de la setmana"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 #, fuzzy
 msgid "Error"
 msgstr "error"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "L'arxiu no sembla tenir el format d'agenda (datebook.dat)\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr ""
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Exportar"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Exportar tots els registres de l'agenda"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Desar com"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Explorador"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr ""
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "Tancar"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Cap"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Comença a la data"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Finalitza a la data"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Dilluns"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Dijous"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Divendres"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4t/4a"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Últim"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -672,18 +963,18 @@ msgid ""
 "Which do you want?"
 msgstr ""
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr ""
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Aquest és un esdeveniment que es repeteix. \n"
 "Voleu aplicar aquests canvis \n"
@@ -691,240 +982,219 @@ msgstr ""
 "o a TOTS els esdeveniments \n"
 "com aquest ?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Actual"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "cap"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "dia"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "setmana"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "mes"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "any"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "No pot tenir una cita que es repeteix cada %d %s(s)\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
 #, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr ""
 "No pot tenir una cita repetida setmanalment que no es repeteix a cap dia de "
 "la setmana .\n"
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Sense temps"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 #, fuzzy
 msgid "Invalid Appointment"
 msgstr "Cita"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
 msgstr ""
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Sense data"
 
-#: ../datebook_gui.c:3021
+#: ../datebook_gui.c:3491
 #, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
-msgstr ""
-
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr ""
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Setmana"
 
-#: ../datebook_gui.c:4206
-#, fuzzy
-msgid "W"
-msgstr "Dc"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+msgid "View appointments by week   Ctrl+W"
 msgstr ""
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Mes"
 
-#: ../datebook_gui.c:4218
-#, fuzzy
-msgid "M"
-msgstr "Dll"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+msgid "View appointments by month   Ctrl+M"
 msgstr ""
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Cats"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Temps"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr ""
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Tasca"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Venciment"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarma"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "Dies"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "Aquest esdeveniment no te hora particular"
-
-#: ../datebook_gui.c:4493
-msgid "Starts on"
-msgstr "Comença en"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+#, fuzzy
+msgid "Date:"
+msgstr "Data"
 
-#: ../datebook_gui.c:4507
+#. Start date and time
+#: ../datebook_gui.c:5280
 #, fuzzy
-msgid "Start Time"
+msgid "Start"
 msgstr "Comença en"
 
-#: ../datebook_gui.c:4525
+#. End date and time
+#: ../datebook_gui.c:5297
 #, fuzzy
-msgid "End Time"
-msgstr "Temps"
+msgid "End"
+msgstr "Acaba en"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr ""
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Dia"
 
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Any"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Aquest esdeveniment no es repetirà"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "La freqüència és cada "
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "Di(a)(es)"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Acaba en"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "Setman(a)(es)"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "Repetir els dies:"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "Mes"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Repetir tots els"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Dia de la setmana"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Data"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "Any(s)"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr ""
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr ""
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr ""
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr ""
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr ""
 
@@ -932,504 +1202,386 @@ msgstr ""
 msgid "Extension"
 msgstr ""
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 #, fuzzy
 msgid "Dial Command"
 msgstr "Ordre d'alarma"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr ""
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Explorador"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr ""
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr ""
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importar"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Per anar dins un directori ocult escriure'l i prémer TAB"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "Fet"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr ""
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr ""
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr ""
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr ""
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, fuzzy, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Tots els registres d'aquesta categoria"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Importar"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr ""
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Instal·lar"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "Per anar dins un directori ocult escriure'l i prémer TAB"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Fitxers per instal.lar"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr ""
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Afegir"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Fitxers per instal.lar"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Suprimir"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Instal·lar"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/Arxiu/_Instal·lar"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "Nom"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "Identificador d'usuari-->%d"
 
-#: ../jpilot-dump.c:95
-msgid " +D +A +T +M format like date +format.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:98
-msgid " -f displays help for format codes.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:99
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr "Llibreta d'adreces"
-
-#: ../jpilot-dump.c:100
-msgid " -N dump appts for today in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:101
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:102
-#, fuzzy
-msgid " -A dump Address book.\n"
-msgstr "Llibreta d'adreces"
-
-#: ../jpilot-dump.c:103
-msgid " -T dump ToDo list as CSV.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr ""
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr ""
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr ""
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr ""
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr ""
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "No hi ha suport d'impressió per aquest conduit."
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "No hi ha suport d'impressió per aquest conducte."
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "No hi ha suport d'exportació per aquest conducte."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Anul·lar"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 #, fuzzy
 msgid "Cancel Sync"
 msgstr "Anul·lar"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Sincronitzar de totes maneres?"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 #, fuzzy
 msgid "Sync Problem"
 msgstr "Sincronitzar memo"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+#, fuzzy
+msgid " User: "
+msgstr "Identificador d'usuari-->%d"
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr ""
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Quant a %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 #, fuzzy
 msgid "/_File"
 msgstr "/Arxiu"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Arxiu/tear"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Arxiu/_Cercar"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Arxiu/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Arxiu/_Instal·lar"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Arxiu/_Importar"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Arxiu/_Exportar"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Arxiu/Preferències"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Arxiu/_Imprimir"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 #, fuzzy
 msgid "/File/Install User"
 msgstr "/Arxiu/_Instal·lar"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Arxiu/Restaurar "
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Arxiu/Eixir"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Visualitzar"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 #, fuzzy
 msgid "/View/Hide Private Records"
 msgstr "/Visualitzar/Oculta-Mostra registres privats"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 #, fuzzy
 msgid "/View/Show Private Records"
 msgstr "/Visualitzar/Oculta-Mostra registres privats"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 #, fuzzy
 msgid "/View/Mask Private Records"
 msgstr "/Visualitzar/Oculta-Mostra registres privats"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 #, fuzzy
 msgid "/View/sep1"
 msgstr "/Arxiu/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Visualitzar/Agenda"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Visualitzar/Adreces"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Visualitzar/Tasques"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Visualitzar/Memos"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 #, fuzzy
 msgid "/_Plugins"
 msgstr "/Connectors"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 #, fuzzy
 msgid "/_Web"
 msgstr "Dc"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr ""
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr ""
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr ""
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr ""
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr ""
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr ""
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr ""
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr ""
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr ""
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/Ajuda/PayBack program"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 #, fuzzy
 msgid "/Help/About J-Pilot"
 msgstr "/Ajuda/J-Pilot"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, fuzzy, c-format
 msgid "/_Plugins/%s"
 msgstr "/Connectors/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Ajuda/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr ""
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr ""
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 #, fuzzy
 msgid "Unable to open pipe\n"
 msgstr "No s'ha pogut obrir %s\n"
 
-#: ../jpilot.c:2422
-#, fuzzy
-msgid " User: "
-msgstr "Identificador d'usuari-->%d"
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "Neteja"
-
-#: ../jpilot.c:2649
-#, fuzzy
-msgid "Show private records   Ctrl-Z"
-msgstr "/Visualitzar/Oculta-Mostra registres privats"
-
-#: ../jpilot.c:2654
-#, fuzzy
-msgid "Show private records"
-msgstr "/Visualitzar/Oculta-Mostra registres privats"
-
-#: ../jpilot.c:2659
+#: ../jpilot.c:1949
 #, fuzzy
-msgid "Hide private records   Ctrl-Z"
+msgid "Show private records   Ctrl+Z"
 msgstr "/Visualitzar/Oculta-Mostra registres privats"
 
-#: ../jpilot.c:2664
+#: ../jpilot.c:1954
 #, fuzzy
-msgid "Hide private records"
+msgid "Hide private records   Ctrl+Z"
 msgstr "/Visualitzar/Oculta-Mostra registres privats"
 
-#: ../jpilot.c:2669
+#: ../jpilot.c:1959
 #, fuzzy
-msgid "Mask private records   Ctrl-Z"
+msgid "Mask private records   Ctrl+Z"
 msgstr "Imprimir tots els registres"
 
-#: ../jpilot.c:2674
+#: ../jpilot.c:1971
 #, fuzzy
-msgid "Mask private records"
-msgstr "Imprimir tots els registres"
-
-#: ../jpilot.c:2684
-#, fuzzy
-msgid "Sync your palm to the desktop   Ctrl-Y"
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Sincronitzar el seu palm amb l'escriptori"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
+#: ../jpilot.c:1983
 #, fuzzy
-msgid "Font"
-msgstr "Mes"
+msgid "Stop Sync process"
+msgstr "Sincronitzar la llibreta d'adreces"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1437,1606 +1589,2120 @@ msgstr ""
 "Sincronitzar el seu palm amb l'escriptori\n"
 "i després fer una còpia de seguretat"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Agenda/Aneu a avui"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Llista de coses a fer"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Memo Pad"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr ""
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr ""
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr ""
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
-msgstr ""
-
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr ""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Joc de caràcters"
 
-#: ../jpilot.c:2898
-msgid "\"."
+#: ../jpilot.c:2194
+msgid "Select a UTF-8 encoding"
 msgstr ""
 
-#: ../jpilot.c:2900
-msgid "Select a UTF-8 encoding"
+#: ../jpilot-dump.c:92
+#, c-format
+msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:93
 #, c-format
-msgid "Unknown PC header version = %d\n"
+msgid " -v display version and exit\n"
 msgstr ""
 
-#: ../libplugin.c:416
-#, fuzzy, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "Error llegint"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, c-format
+msgid " -h display help text\n"
+msgstr ""
+
+#: ../jpilot-dump.c:95
+#, c-format
+msgid " -f display help for format codes\n"
+msgstr ""
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
+#: ../jpilot-dump.c:96
 #, fuzzy, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "Error llegint"
+msgid " -D dump DateBook\n"
+msgstr "Llibreta d'adreces"
 
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+#: ../jpilot-dump.c:97
+#, c-format
+msgid " -i dump DateBook in iCalendar format\n"
 msgstr ""
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-#, fuzzy
-msgid "Unable to open PC records file\n"
-msgstr "No s'ha pogut obrir %s\n"
-
-#: ../libplugin.c:493 ../utils.c:1959
-#, fuzzy
-msgid "Couldn't find record to delete\n"
-msgstr "No puc trobar un fitxer buit DB. \n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr "Llibreta d'adreces"
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:99
 #, c-format
-msgid "Unknown header version %d\n"
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr ""
 
-#: ../libplugin.c:524
-#, fuzzy
-msgid "Couldn't open PC records file\n"
-msgstr "No puc obrir el fitxer %s. \n"
-
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
+#: ../jpilot-dump.c:100
 #, fuzzy, c-format
-msgid "Error opening file: %s\n"
-msgstr "Error obrint arxiu"
-
-#: ../libplugin.c:714
-#, fuzzy
-msgid "Error reading PC file 1\n"
-msgstr "Error llegint"
+msgid " -A dump Address book\n"
+msgstr "Llibreta d'adreces"
 
-#: ../libplugin.c:730
-#, fuzzy
-msgid "Error reading PC file 2\n"
-msgstr "Error llegint"
+#: ../jpilot-dump.c:101
+#, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr ""
 
-#: ../libplugin.c:903
+#: ../jpilot-dump.c:102
 #, fuzzy, c-format
-msgid "Error reading %s 5\n"
-msgstr "Error llegint"
+msgid " -M dump Memos\n"
+msgstr "Llibreta d'adreces"
 
-#: ../log.c:95
-#, fuzzy, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "No puc obrir el fitxer de registre, renuncio. \n"
+#: ../jpilot-dump.c:163
+#, c-format
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../log.c:102
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
 #, fuzzy, c-format
-msgid "Unable to open log file\n"
+msgid "%s: Unable to open file:%s\n"
 msgstr "No s'ha pogut obrir %s\n"
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Imported Memo %s\n"
+msgid "Records added         = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "L'arxiu no sembla tenir el format de notes (memopad.dat)\n"
-
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:271
 #, c-format
-msgid "Can't export memo %d\n"
+msgid "Records deleted       = %d\n"
 msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "Vista mensual"
-
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Contrasenya del palm"
-
-#: ../password.c:333
-#, fuzzy
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Introduïu la contrasenya del PalmOS"
-
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "Introduïu la contrasenya del PalmOS"
-
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
 msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:273
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
+msgid "Records written       = %d\n"
 msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
 msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
 msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:293
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
 msgstr ""
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:294
 #, c-format
-msgid " plugin is invalid: [%s]\n"
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
 msgstr ""
 
-#: ../plugins.c:296
-#, fuzzy, c-format
-msgid "Plugin:[%s]\n"
-msgstr "/Connectors/%s"
-
-#: ../plugins.c:297
+#: ../jpilot-merge.c:295
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
+msgid "  The merge will leave your databases in an unsync-able state.\n"
 msgstr ""
 
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
+#: ../jpilot-merge.c:296
+#, c-format
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
 msgstr ""
 
-#: ../prefs.c:394
-msgid "%d %B %Y"
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
 msgstr ""
 
-#: ../prefs.c:395
-msgid "%d. %B %Y"
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
 msgstr ""
 
-#: ../prefs.c:396
-msgid "%d %B, %Y"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
 msgstr ""
 
-#: ../prefs.c:397
-msgid "%Y. %B. %d"
+#: ../jpilot-sync.c:64
+#, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
 msgstr ""
 
-#: ../prefs.c:398
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, c-format
+msgid " -v display version and compile options\n"
+msgstr ""
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, c-format
+msgid " -d display debug info to stdout\n"
+msgstr ""
+
+#: ../jpilot-sync.c:68
+#, c-format
+msgid " -P skip loading plugins\n"
+msgstr ""
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr ""
+
+#: ../jpilot-sync.c:71
+#, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Error obrint arxiu"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Error obrint arxiu"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "error"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr ""
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+#, fuzzy
+msgid "Unable to open PC records file\n"
+msgstr "No s'ha pogut obrir %s\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+#, fuzzy
+msgid "Couldn't find record to delete\n"
+msgstr "No puc trobar un fitxer buit DB. \n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr ""
+
+#: ../libplugin.c:180
+#, fuzzy, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "Error llegint"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, fuzzy, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "Error llegint"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, fuzzy, c-format
+msgid "Error opening file: %s\n"
+msgstr "Error obrint arxiu"
+
+#: ../libplugin.c:524
+#, fuzzy, c-format
+msgid "Error reading %s 5\n"
+msgstr "Error llegint"
+
+#: ../libplugin.c:799
+#, fuzzy
+msgid "Error reading PC file 1\n"
+msgstr "Error llegint"
+
+#: ../libplugin.c:815
+#, fuzzy
+msgid "Error reading PC file 2\n"
+msgstr "Error llegint"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr ""
+
+#: ../log.c:98
+#, fuzzy, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "No puc obrir el fitxer de registre, renuncio. \n"
+
+#: ../log.c:108
+#, fuzzy, c-format
+msgid "Unable to open log file\n"
+msgstr "No s'ha pogut obrir %s\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr ""
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr ""
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "L'arxiu no sembla tenir el format de notes (memopad.dat)\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr ""
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Memo Pad"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Vista mensual"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Contrasenya del palm"
+
+#: ../password.c:306
+#, fuzzy
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Introduïu la contrasenya del PalmOS"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Introduïu la contrasenya del PalmOS"
+
+#: ../pidfile.c:69
+#, fuzzy
+msgid "removing stale pidfile\n"
+msgstr "No puc obrir l'arxiu jpilot_to_install.\n"
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Error llegint"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr ""
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr ""
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr ""
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr ""
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr ""
+
+#: ../plugins.c:297
+#, fuzzy, c-format
+msgid "Plugin:[%s]\n"
+msgstr "/Connectors/%s"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr ""
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr ""
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr ""
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr ""
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr ""
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr ""
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
+msgstr ""
+
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr ""
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Local"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Paràmetres"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 #, fuzzy
 msgid "Datebook"
 msgstr "Sincronitzar l'agenda"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 #, fuzzy
 msgid "ToDo"
 msgstr "Llista de coses a fer"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 #, fuzzy
 msgid "Memo"
 msgstr "Sincronitzar memo"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Alarma"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Conductes"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "Format de data curta"
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "Format de data llarg "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "Format d'hora "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "El primer dia de la setmana és "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "El meu fitxer de colors GTK és."
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Port Sèrie (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Sincronitzar memo"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr ""
+#. Serial Rate
+#: ../prefs_gui.c:605
+#, fuzzy
+msgid "Serial Rate"
+msgstr "Velocitat port sèrie "
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Nombre de copies de seguretat per arxivar "
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Mostrar els registres suprimits (per defecte: NO)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Mostrar els registres modificats (per defecte: NO)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr ""
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+msgid "Show popup tooltips (default YES) (requires restart)"
+msgstr ""
+
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr ""
 
-#. ********************************************************************
-#. Datebook preference tab
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Ressaltar els dies amb cites"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr ""
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr ""
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 #, fuzzy
 msgid "Use DateBk note tags"
 msgstr "Utilitzar marcadors DateBk (no recomanat)"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr ""
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 #, fuzzy
 msgid "Mail Command"
 msgstr "Ordre d'alarma"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, fuzzy, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%t és substituït per l'hora de l'alarma"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Amagar les tasques acabades"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr ""
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr ""
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr ""
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr ""
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Utilitzar Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Obrir la finestra d'alarmes per el recordatori de cites"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Executa aquesta ordre"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr ""
 "ADVERTÈNCIA: executar ordres arbitràries de l'intèrpret d'ordres pot ser "
 "perillós!!!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Ordre d'alarma"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t és substituït per l'hora de l'alarma"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d és substituït per la data de l'alarma"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D és substituït per lla descripció de l'alarma"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N és substituït per la nota de l'alarma"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr ""
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr ""
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Sincronitzar l'agenda"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Sincronitzar la llibreta d'adreces"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Sincronitzat tasques a fer"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Sincronitzar memo"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "Sincronitzar memo32 (pedit32)"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 #, fuzzy
 msgid "Sync Manana"
 msgstr "Sincronitzar de totes maneres?"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr ""
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, fuzzy, c-format
 msgid "Sync %s (%s)"
 msgstr "Ometent %s\n"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Opcions d'impressió"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Tamany del paper"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Impressió dia a dia"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Impressió setmanal"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Impressió mensual"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "Un registre"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "%s registres esborrats."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Tots els registres d'aquesta categoria"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Imprimir tots els registres"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Un registre per pàgina"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " Línia en blanc entre cada registre"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Ordre d'impressió (ex. lpr, o cat > fitxer.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "/Arxiu/Restaurar "
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Fitxers per instal.lar"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr ""
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr ""
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr ""
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr ".Prémer el botó HotSync ara"
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr ""
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "Nom"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 #, fuzzy
 msgid "datebook"
 msgstr "Sincronitzar l'agenda"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 #, fuzzy
 msgid "address"
 msgstr "Adreces"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 #, fuzzy
 msgid "todo"
 msgstr "Sincronitzat tasques a fer"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 #, fuzzy
 msgid "memo"
 msgstr "Sincronitzar memo"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "Sincronitzar memo"
+
+#: ../search_gui.c:419
 #, fuzzy
 msgid "plugin ?"
 msgstr "/Connectors"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Cap registre trobat"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Cercar"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Cercar a: "
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Sensible a caixa"
 
-#: ../sync.c:139
+#: ../sync.c:118
 #, fuzzy
 msgid "open lock file failed\n"
 msgstr "No puc obrir el fitxer de registre. \n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 #, fuzzy
 msgid "lock failed\n"
 msgstr "Ha fallat.\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr ""
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:244
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "Comprovi el seu port sèrie i els paràmetres\n"
+
+#: ../sync.c:677
+#, fuzzy
+msgid "Unable to read home dir\n"
+msgstr "No s'ha pogut obrir %s\n"
+
+#: ../sync.c:1085 ../sync.c:1423
+#, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (Creador d'ID '%s') està actualitzat, s'omet.\n"
+
+#: ../sync.c:1089 ../sync.c:1427
+#, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Anant a '%s' (Creador d'ID '%s')..."
+
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr ""
+
+#: ../sync.c:1100 ../sync.c:1438
+#, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr ""
+
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "D'acord\n"
+
+#: ../sync.c:1304
+#, c-format
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "Ometent %s (Creator ID '%s')\n"
+
+#: ../sync.c:1498
+#, c-format
+msgid "Installing %s "
+msgstr "Instal·lant %s"
+
+#: ../sync.c:1504 ../sync.c:1540
 #, fuzzy, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr ".Prémer el botó HotSync ara\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"No es pot obrir '%s'!\n"
+
+#: ../sync.c:1508
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"No es pot obrir '%s'!\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(Creació d'identificació és '%s')..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(Creació d'identificació és '%s')..."
 
-#: ../sync.c:297
+#: ../sync.c:1530
 #, c-format
-msgid "Exiting with status %s\n"
+msgid "(SDcard dir %s)... "
 msgstr ""
 
-#: ../sync.c:298
-msgid "Finished\n"
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr "No s'ha pogut obrir %s\n"
+
+#: ../sync.c:1615
+#, c-format
+msgid "Install %s failed"
+msgstr "Instal·lació de %s ha fallat"
+
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Ha fallat.\n"
+
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "S' ha instal·lat %s"
+
+#: ../sync.c:1736
+#, fuzzy, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "Error llegint"
+
+#: ../sync.c:1742 ../sync.c:1772
+#, fuzzy, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "Error llegint"
+
+#: ../sync.c:1763
+#, fuzzy, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Error llegint"
+
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr ""
+
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr ""
+
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr ""
+
+#: ../sync.c:2106 ../sync.c:2824
+#, c-format
+msgid "Syncing %s\n"
+msgstr "Ometent %s\n"
+
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
+#, c-format
+msgid "Wrote an %s record."
+msgstr "Escrits %s registres."
+
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
+#, c-format
+msgid "Writing an %s record failed."
+msgstr "Escrivint %s registre/s va fallà."
+
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
+#, c-format
+msgid "Deleting an %s record failed."
+msgstr "Esborrant %s registre/s va fallà."
+
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
+#, c-format
+msgid "Deleted an %s record."
+msgstr "Esborrats %s registres."
+
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "Esborrats %s registres."
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
+#, c-format
+msgid "Wrote a %s record."
+msgstr "Escrits %s registres."
+
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
+#, c-format
+msgid "Writing a %s record failed."
+msgstr "Escrivint %s registres va fallà."
+
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
+#, c-format
+msgid "Deleting a %s record failed."
+msgstr "Esborrant %s registre/s va fallà."
+
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
+#, c-format
+msgid "Deleted a %s record."
+msgstr "%s registres esborrats."
+
+#: ../sync.c:2133 ../sync.c:2486
+#, c-format
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
+
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
+
+#: ../sync.c:2368 ../sync.c:2708
+msgid ""
+"dlp_DeleteRecord failed\n"
+"This could be because the record was already deleted on the Palm\n"
 msgstr ""
+"dlp_DeleteRecord ha fallat\n"
+"Això pot ser perquè el registre ja estava esborrat en el Palm\n"
 
-#: ../sync.c:432
+#: ../sync.c:2937
 msgid "Finished installing user information.\n"
 msgstr ""
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "Comprovi el seu port sèrie i els paràmetres\n"
-
-#: ../sync.c:674
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr "Sincronitzant amb el dispositiu %s\n"
 
-#: ../sync.c:675
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr ".Prémer el botó HotSync ara\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, fuzzy, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr "Últim nom d'usuari-->\"%s\"\n"
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, fuzzy, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr "Últim identificador d'usuari-->\"%d\"\n"
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, fuzzy, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr "Nom d'usuari-->\"%s\"\n"
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, fuzzy, c-format
 msgid " This User ID-->%d\n"
 msgstr "Identificador d'usuari-->%d\n"
 
-#: ../sync.c:795
+#: ../sync.c:3204
 #, fuzzy, c-format
 msgid "Username is \"%s\"\n"
 msgstr "Nom d'usuari-->\"%s\"\n"
 
-#: ../sync.c:796
+#: ../sync.c:3205
 #, fuzzy, c-format
 msgid "User ID is %d\n"
 msgstr "Identificador d'usuari-->%d"
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr "Última sincronització amb el PC= %d\n"
 
-#: ../sync.c:799
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr "Aquest PC = %lu\n"
 
-#: ../sync.c:800
-#, fuzzy, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Últim nom d'usuari-->\"%s\"\n"
-
-#: ../sync.c:801
-#, fuzzy, c-format
-msgid "Last UserID = %d\n"
-msgstr "Últim identificador d'usuari-->\"%d\"\n"
-
-#: ../sync.c:802
-#, c-format
-msgid "Username = [%s]\n"
-msgstr ""
-
-#: ../sync.c:803
-#, c-format
-msgid "userID = %d\n"
-msgstr ""
-
-#: ../sync.c:821
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr "Sincronització anul·lada\n"
 
-#: ../sync.c:843
+#: ../sync.c:3255
 #, fuzzy
 msgid "Finished restoring handheld.\n"
 msgstr "/Arxiu/Restaurar "
 
-#: ../sync.c:844
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr "Caldria sincronitzar per actualitzar J-Pilot.\n"
 
-#: ../sync.c:874
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr "Fent una sincronització ràpida.\n"
 
-#: ../sync.c:913
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr "Fent una sincronització lenta.\n"
 
-#: ../sync.c:1014
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr "Gràcies per fer servir J-Pilot."
 
-#: ../sync.c:1056
+#: ../sync.c:3411 ../sync.c:3479
 #, fuzzy
 msgid "Finished.\n"
 msgstr "Ha fallat.\n"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:3446
 #, c-format
-msgid "Syncing %s\n"
-msgstr "Ometent %s\n"
-
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
-#, c-format
-msgid "Wrote an %s record."
-msgstr "Escrits %s registres."
-
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
-#, c-format
-msgid "Writing an %s record failed."
-msgstr "Escrivint %s registre/s va fallà."
-
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
-#, c-format
-msgid "Deleting an %s record failed."
-msgstr "Esborrant %s registre/s va fallà."
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:3447
 #, c-format
-msgid "Deleted an %s record."
-msgstr "Esborrats %s registres."
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:3478
 #, c-format
-msgid "Wrote a %s record."
-msgstr "Escrits %s registres."
+msgid "Exiting with status %s\n"
+msgstr ""
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../todo.c:264
 #, c-format
-msgid "Writing a %s record failed."
-msgstr "Escrivint %s registres va fallà."
+msgid "ToDo description text > %d, truncating to %d\n"
+msgstr ""
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../todo.c:270
 #, c-format
-msgid "Deleting a %s record failed."
-msgstr "Esborrant %s registre/s va fallà."
+msgid "ToDo note text > %d, truncating to %d\n"
+msgstr ""
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
-#, c-format
-msgid "Deleted a %s record."
-msgstr "%s registres esborrats."
+#: ../todo_gui.c:159
+msgid "Due Date"
+msgstr "Data de venciment"
 
-#: ../sync.c:1133
-#, c-format
-msgid "number of records = %d\n"
-msgstr "número de registres = %d\n"
+#: ../todo_gui.c:532
+msgid "File doesn't appear to be todo.dat format\n"
+msgstr "L'arxiu no sembla tenir el format de tasques pendents (todo.dat)\n"
 
-#: ../sync.c:1260 ../sync.c:2435
-msgid ""
-"dlp_DeleteRecord failed\n"
-"This could be because the record was already deleted on the Palm\n"
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
 msgstr ""
-"dlp_DeleteRecord ha fallat\n"
-"Això pot ser perquè el registre ja estava esborrat en el Palm\n"
-
-#: ../sync.c:1358 ../sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (Creador d'ID '%s') està actualitzat, s'omet.\n"
-
-#: ../sync.c:1362 ../sync.c:1774
-#, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Anant a '%s' (Creador d'ID '%s')..."
 
-#: ../sync.c:1369 ../sync.c:1780
+#: ../todo_gui.c:688
 #, c-format
-msgid "Failed, unable to create file %s\n"
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
 msgstr ""
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../todo_gui.c:726
 #, c-format
-msgid "Failed, unable to back up database %s\n"
+msgid "Can't export todo %d\n"
 msgstr ""
 
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "D'acord\n"
-
-#: ../sync.c:1687
-#, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "Ometent %s (Creator ID '%s')\n"
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Data de venciment"
 
-#: ../sync.c:1861
-#, c-format
-msgid "Installing %s "
-msgstr "Instal·lant %s"
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Data de venciment"
 
-#: ../sync.c:1867
+#: ../todo_gui.c:771
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"No es pot obrir '%s'!\n"
+msgid "Priority: %d\n"
+msgstr "Prioritat: "
 
-#: ../sync.c:1871
+#: ../todo_gui.c:772
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"No es pot obrir '%s'!\n"
+msgid "Completed: %s\n"
+msgstr "Acabat"
 
-#: ../sync.c:1883
+#: ../todo_gui.c:774
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(Creació d'identificació és '%s')..."
+msgid "Description: %s\n"
+msgstr ""
 
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
-#, fuzzy, c-format
+#: ../todo_gui.c:777
+#, c-format
 msgid ""
+"Note: %s\n"
 "\n"
-"Unable to open file: %s\n"
-msgstr "No s'ha pogut obrir %s\n"
-
-#: ../sync.c:1960
-#, c-format
-msgid "Install %s failed"
-msgstr "Instal·lació de %s ha fallat"
+msgstr ""
 
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "Ha fallat.\n"
+#: ../todo_gui.c:1610
+msgid "Priority out of range\n"
+msgstr ""
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
-msgid "Installed %s "
-msgstr "S' ha instal·lat %s"
+msgid "No date"
+msgstr "Sense data"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, fuzzy, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "No s'ha pogut obrir %s\n"
+#. Completed checkbox
+#: ../todo_gui.c:2411
+msgid "Completed"
+msgstr "Acabat"
 
-#: ../sync.c:2180
+#: ../todo_gui.c:2418
 #, fuzzy
-msgid "Unable to read home dir\n"
-msgstr "No s'ha pogut obrir %s\n"
-
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: nombre de registres = %d\n"
+msgid "Priority:"
+msgstr "Prioritat: "
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "disc: nombre de registres = %d\n"
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
 
-#: ../sync.c:2888
-#, fuzzy, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "Error llegint"
+#: ../todo_gui.c:2441
+msgid "Date Due:"
+msgstr "Data de venciment:"
 
-#: ../sync.c:2894 ../sync.c:2936
-#, fuzzy, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "Error llegint"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Avui"
 
-#: ../sync.c:2916 ../sync.c:2928
+#: ../utils.c:575
 #, fuzzy, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Error llegint"
-
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
-#, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr ""
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "No puc trobar un fitxer buit DB. \n"
 
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
-msgstr ""
+#: ../utils.c:578
+#, fuzzy
+msgid " may not be installed.\n"
+msgstr "jpilot no pot ser instal·lat?.\n"
 
-#: ../sync.c:3074 ../sync.c:3082
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
+msgid "Can't create directory %s\n"
 msgstr ""
 
-#: ../todo.c:248
-#, c-format
-msgid "ToDo description text > %d, truncating to %d\n"
-msgstr ""
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s és un directori"
 
-#: ../todo.c:255
+#: ../utils.c:628
 #, c-format
-msgid "ToDo note text > %d, truncating to %d\n"
+msgid "Unable to get write permission for directory %s\n"
 msgstr ""
 
-#: ../todo.c:380
-#, fuzzy, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "Error llegint"
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Desar registres canviats?"
 
-#: ../todo_gui.c:149
-msgid "Due Date"
-msgstr "Data de venciment"
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Voleu desar els canvis d'aquest registre?"
 
-#: ../todo_gui.c:535
-msgid "File doesn't appear to be todo.dat format\n"
-msgstr "L'arxiu no sembla tenir el format de tasques pendents (todo.dat)\n"
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Desar nou registre?"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
-#, c-format
-msgid "Can't export todo %d\n"
-msgstr ""
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Voleu desar aquest nou registre?"
 
-#: ../todo_gui.c:1547
-msgid "Priority out of range\n"
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
 msgstr ""
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../utils.c:1874
 #, c-format
-msgid "No date"
-msgstr "Sense data"
-
-#. The completed check box
-#: ../todo_gui.c:2206
-msgid "Completed"
-msgstr "Acabat"
-
-#: ../todo_gui.c:2214
-msgid "Priority: "
-msgstr "Prioritat: "
-
-#: ../todo_gui.c:2234
-msgid "Date Due:"
-msgstr "Data de venciment:"
-
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "Cap"
-
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
+msgid " -p skip loading plugins\n"
 msgstr ""
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
+#: ../utils.c:1875
+#, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr ""
 
-#: ../utils.c:75
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1876
+#, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr ""
 
-#: ../utils.c:76
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
 msgstr ""
 
-#: ../utils.c:77
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
 msgstr ""
 
-#: ../utils.c:78
-msgid " -i makes program iconify itself upon launch.\n"
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
 msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr ""
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr ""
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr ""
 
-#: ../utils.c:107
+#: ../utils.c:1921
+#, fuzzy
+msgid "Error reading file"
+msgstr "Error llegint"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr ""
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr ""
 
-#: ../utils.c:110
+#: ../utils.c:1976
 #, fuzzy
 msgid "Installed Path"
 msgstr "S' ha instal·lat %s"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr ""
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr ""
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 #, fuzzy
 msgid "yes"
 msgstr "Sí"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-#, fuzzy
-msgid "no"
-msgstr "cap"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 #, fuzzy
 msgid "Private record support"
 msgstr "Imprimir tots els registres"
 
-#: ../utils.c:128
-msgid "Datebk support"
-msgstr ""
-
-#: ../utils.c:134
-#, fuzzy
-msgid "Plugin support"
-msgstr "/Connectors"
-
-#: ../utils.c:140
-#, fuzzy
-msgid "Manana support"
-msgstr "/Connectors"
-
-#: ../utils.c:146
-msgid "NLS support (foreign languages)"
-msgstr ""
-
-#: ../utils.c:152
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
 #, fuzzy
-msgid "GTK2 support"
-msgstr "/Connectors"
-
-#: ../utils.c:207
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Avui és %A, %x %X"
-
-#: ../utils.c:209
-#, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Avui és %%A, %s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "Avui"
-
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "Desar registres canviats?"
-
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "Voleu desar els canvis d'aquest registre?"
-
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "Desar nou registre?"
-
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "Voleu desar aquest nou registre?"
+msgid "no"
+msgstr "cap"
 
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
-msgid "Can't get HOME environment variable\n"
+#: ../utils.c:1990
+msgid "Datebk support"
 msgstr ""
 
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
-msgstr ""
+#: ../utils.c:1996
+#, fuzzy
+msgid "Plugin support"
+msgstr "/Connectors"
 
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
-#, c-format
-msgid "Can't create directory %s\n"
+#: ../utils.c:2002
+#, fuzzy
+msgid "Manana support"
+msgstr "/Connectors"
+
+#: ../utils.c:2008
+msgid "NLS support (foreign languages)"
 msgstr ""
 
-#: ../utils.c:1399
-#, fuzzy, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr "L'arxiu no sembla tenir el format d'adreces\n"
+#: ../utils.c:2014
+#, fuzzy
+msgid "GTK2 support"
+msgstr "/Connectors"
 
-#: ../utils.c:1405
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "I can't write files in directory %s\n"
+msgid "Can't get HOME environment variable\n"
 msgstr ""
 
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:2064
+#, c-format
+msgid "HOME environment variable is too long to process\n"
 msgstr ""
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:2567
+msgid "Edit Categories..."
 msgstr ""
 
-#: ../utils.c:1483
-#, fuzzy
-msgid "Error opening file: next_id\n"
-msgstr "Error obrint arxiu"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC ID és 0.\n"
 
-#: ../utils.c:1657
+#: ../utils.c:3234
 #, fuzzy, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "No puc trobar un fitxer buit DB. \n"
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "He generat un nou PC ID. És %lu\n"
 
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-#, fuzzy
-msgid " may not be installed.\n"
-msgstr "jpilot no pot ser instal·lat?.\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1839
-#, fuzzy
-msgid "Error reading file"
-msgstr "Error llegint"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "Avui és %A, %x %X"
 
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC ID és 0.\n"
+#: ../utils.c:3539
+#, c-format
+msgid "Today is %%A, %s %s"
+msgstr "Avui és %%A, %s %s"
 
-#: ../utils.c:2517
+#: ../utils.c:3768
 #, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "He generat un nou PC ID. És %lu\n"
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
+msgstr ""
 
-#: ../weekview_gui.c:326
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
+msgstr "Error llegint"
+
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
+msgstr "Error llegint"
+
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Vista setmanal"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr ""
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr ""
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr ""
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr ""
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr ""
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr ""
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr ""
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr ""
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 #, fuzzy
 msgid "France"
 msgstr "Anul·lar"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr ""
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr ""
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr ""
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr ""
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 #, fuzzy
 msgid "Indonesia"
 msgstr "cap"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr ""
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 #, fuzzy
 msgid "Italy"
 msgstr "Instal·lar"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr ""
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr ""
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr ""
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr ""
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr ""
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr ""
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr ""
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr ""
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr ""
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr ""
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr ""
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 #, fuzzy
 msgid "Spain"
 msgstr "Imprimir"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 #, fuzzy
 msgid "Sweden"
 msgstr "setmana"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr ""
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 #, fuzzy
 msgid "Taiwan"
 msgstr "Imprimir"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 #, fuzzy
 msgid "Thailand"
 msgstr "Imprimir"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr ""
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr ""
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr ""
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr ""
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr ""
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr ""
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr ""
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Actual"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "cap"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr ""
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr ""
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr ""
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr ""
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Ajuda"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr ""
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Diumenge"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr ""
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr ""
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr ""
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr ""
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Imprimir"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr ""
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Sincronitzar"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Diumenge"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr ""
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr ""
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr ""
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr ""
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr ""
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Imprimir"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
 msgstr ""
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Cats"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr ""
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
 msgstr ""
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
 msgstr ""
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr ""
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr ""
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr ""
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr ""
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr ""
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Temps:"
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr ""
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Quant a %s"
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 #, fuzzy
 msgid "Category:"
 msgstr "Categoria"
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 #, fuzzy
 msgid "Type:"
 msgstr "Temps:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr ""
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 #, fuzzy
 msgid "Currency:"
 msgstr "Actual"
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-#, fuzzy
-msgid "Date:"
-msgstr "Data"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Mes"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Dia"
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Any"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 #, fuzzy
 msgid "Amount:"
 msgstr "Quant a %s"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr ""
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 #, fuzzy
 msgid "City:"
 msgstr "Categoria"
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr ""
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+"%s fou escrit per\n"
+"Judd Montgomery (c) 1999-2001.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 #, fuzzy
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Introduïu la contrasenya del PalmOS"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 #, fuzzy
 msgid "Enter a NEW KeyRing Password"
 msgstr "Introduïu la contrasenya del PalmOS"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Introduïu la contrasenya del PalmOS"
 
-#: ../KeyRing/keyring.c:1636
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr ""
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "Anul·lar"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, c-format
+msgid "Can't export key %d\n"
 msgstr ""
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 #, fuzzy
 msgid ""
 "Change\n"
@@ -3044,54 +3710,201 @@ msgid ""
 "Password"
 msgstr "Introduïu la contrasenya del PalmOS"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "Anul·lar"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr ""
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "Nom"
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr ""
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "Contrasenya del palm"
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 #, fuzzy
 msgid "Generate Password"
 msgstr "Introduïu la contrasenya del PalmOS"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "Sincronitzar memo"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+"%s fou escrit per\n"
+"Judd Montgomery (c) 1999-2001.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "Fet"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Sobreescrit arxiu"
+
+#, fuzzy
+#~ msgid "Field"
+#~ msgstr "Ha fallat.\n"
+
+#~ msgid "Quick View"
+#~ msgstr "Vista ràpida"
+
+#, fuzzy
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "No s'ha pogut obrir %s\n"
+
+#, fuzzy
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "No s'ha pogut obrir %s\n"
+
+#, fuzzy
+#~ msgid "category name"
+#~ msgstr "Categoria"
+
+#~ msgid "Close"
+#~ msgstr "Tancar"
+
+#~ msgid "none"
+#~ msgstr "cap"
+
+#, fuzzy
+#~ msgid "W"
+#~ msgstr "Dc"
+
+#, fuzzy
+#~ msgid "M"
+#~ msgstr "Dll"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Aquest esdeveniment no te hora particular"
+
+#, fuzzy
+#~ msgid "Start Time"
+#~ msgstr "Comença en"
+
+#, fuzzy
+#~ msgid "End Time"
+#~ msgstr "Temps"
+
+#~ msgid "Done"
+#~ msgstr "Fet"
+
+#~ msgid "Add"
+#~ msgstr "Afegir"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Nom"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Ajuda/PayBack program"
+
+#~ msgid "Clear"
+#~ msgstr "Neteja"
+
+#, fuzzy
+#~ msgid "Show private records"
+#~ msgstr "/Visualitzar/Oculta-Mostra registres privats"
+
+#, fuzzy
+#~ msgid "Hide private records"
+#~ msgstr "/Visualitzar/Oculta-Mostra registres privats"
+
+#, fuzzy
+#~ msgid "Mask private records"
+#~ msgstr "Imprimir tots els registres"
+
+#, fuzzy
+#~ msgid "Font"
+#~ msgstr "Mes"
+
+#, fuzzy
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "No puc obrir el fitxer %s. \n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "El primer dia de la setmana és "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Port Sèrie (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "Sincronitzar memo32 (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "Un registre"
+
+#, fuzzy
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr ".Prémer el botó HotSync ara\n"
+
+#, fuzzy
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Últim nom d'usuari-->\"%s\"\n"
+
+#, fuzzy
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Últim identificador d'usuari-->\"%d\"\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: nombre de registres = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "disc: nombre de registres = %d\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr "L'arxiu no sembla tenir el format d'adreces\n"
+
 #~ msgid "Quit"
 #~ msgstr "Eixir!"
 
@@ -3102,9 +3915,6 @@ msgstr "Fet"
 #~ msgid "Directory"
 #~ msgstr "%s és un directori"
 
-#~ msgid "Overwrite File"
-#~ msgstr "Sobreescrit arxiu"
-
 #, fuzzy
 #~ msgid "Filename"
 #~ msgstr "Nom"
@@ -3190,32 +4000,13 @@ msgstr "Fet"
 #~ msgid "Error reading at %s : %s %d\n"
 #~ msgstr "Error llegint"
 
-#~ msgid "Serial Rate "
-#~ msgstr "Velocitat port sèrie "
-
 #, fuzzy
 #~ msgid "Cannot open "
 #~ msgstr "No puc obrir el fitxer de registre. \n"
 
-#, fuzzy
-#~ msgid "_to_install file\n"
-#~ msgstr "No puc obrir l'arxiu jpilot_to_install.\n"
-
 #~ msgid "RTh"
 #~ msgstr "Dj"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s %s was written by\n"
-#~ "Judd Montgomery (Copyright) 1999-2002.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-#~ msgstr ""
-#~ "%s fou escrit per\n"
-#~ "Judd Montgomery (c) 1999-2001.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-
 #, fuzzy
 #~ msgid "Last Syned UserID-->\"%d\"\n"
 #~ msgstr "Últim identificador d'usuari-->\"%d\"\n"
diff --git a/po/cs.po b/po/cs.po
index 234e99c7..f7cdcb96 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,37 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.8-pre12\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2005-10-07 22:31+0200\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2007-09-06 21:58+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: address.c:288 address.c:552 alarms.c:352 dat.c:181 dat.c:655 dat.c:857
-#: dat.c:991 dat.c:1130 datebook.c:96 datebook.c:397 datebook.c:404
-#: datebook.c:434 datebook.c:1053 jpilot.c:1534 libplugin.c:467
-#: libplugin.c:646 libplugin.c:753 libplugin.c:832 libplugin.c:873 memo.c:95
-#: memo.c:367 plugins.c:108 prefs.c:314 prefs.c:339 prefs.c:854 sync.c:252
-#: sync.c:1153 sync.c:2320 todo.c:206 todo.c:548 utils.c:2307
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: address.c:345 address.c:352 datebook.c:347 libplugin.c:179 memo.c:163
-#: memo.c:170 todo.c:291 todo.c:298 utils.c:1965 utils.c:1970 utils.c:1981
-#: utils.c:1986 utils.c:1997 utils.c:2002 utils.c:2014 utils.c:2019
-msgid "error"
-msgstr "chyba"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Chyba při čtení informace o kategoriích %s\n"
 
-#: address.c:412 address_gui.c:1686 datebook.c:693 libplugin.c:706
-#: libplugin.c:730 memo.c:244 memo_gui.c:996 todo_gui.c:1318
-#: Expense/expense.c:1138 Expense/expense.c:2152
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Chyba při čtení souboru: %s\n"
 
-#: address_gui.c:261 datebook_gui.c:2524 memo_gui.c:184 todo_gui.c:305
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "chyba"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -47,361 +62,557 @@ msgstr ""
 "Tento záznam je odstraněn.\n"
 "Pro provádění změn jej obnovte nebo zkopírujte.\n"
 
-#: address_gui.c:469 category.c:159 category.c:165 category.c:213
-#: category.c:270 datebook_gui.c:372 memo_gui.c:301 sync.c:1116 sync.c:1122
-#: sync.c:2295 sync.c:2515 sync.c:2521 sync.c:2638 sync.c:2904 todo_gui.c:445
-#: utils.c:2721 utils.c:2770 utils.c:2776 utils.c:2849 utils.c:2855
-#: utils.c:2918 utils.c:2981 utils.c:2987 utils.c:3050 utils.c:3057
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Nemohu otevřít soubor: %s\n"
 
-#: address_gui.c:548
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Nemohu otevřít soubor: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Soubor zřejmě není ve formátu address.dat\n"
 
-#: address_gui.c:558 datebook_gui.c:582 memo_gui.c:436 todo_gui.c:571
-#: Expense/expense.c:619 Expense/expense.c:1406
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Nezařazeno"
 
-#: address_gui.c:697 alarms.c:226 category.c:420 category.c:871 category.c:911
-#: datebook_gui.c:669 datebook_gui.c:1149 export_gui.c:339 jpilot.c:363
-#: jpilot.c:409 jpilot.c:477 jpilot.c:521 jpilot.c:968 jpilot.c:1869
-#: memo_gui.c:526 password.c:352 restore_gui.c:307 todo_gui.c:661 utils.c:1084
-#: utils.c:1256 KeyRing/keyring.c:1322
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
+#. current category name
+#. previous category name
+#. entry text, in Pilot character set
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "Budiž"
 
-#: address_gui.c:698 datebook_gui.c:670 memo_gui.c:527 todo_gui.c:662
-#: utils.c:1274
-msgid "Yes"
-msgstr "Ano"
-
-#: address_gui.c:698 datebook_gui.c:670 memo_gui.c:527 todo_gui.c:662
-#: utils.c:1274
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Ne"
 
-#: address_gui.c:722 datebook_gui.c:697 memo_gui.c:537 todo_gui.c:688
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
+msgid "Yes"
+msgstr "Ano"
+
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s je adresář"
 
-#: address_gui.c:724 address_gui.c:741 datebook_gui.c:699 datebook_gui.c:716
-#: memo_gui.c:539 memo_gui.c:556 todo_gui.c:690 todo_gui.c:707
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Chyba při otevírání souboru"
 
-#: address_gui.c:725 datebook_gui.c:700 memo_gui.c:540 todo_gui.c:691
-msgid "Directory"
-msgstr "Adresář"
-
-#: address_gui.c:728 datebook_gui.c:703 memo_gui.c:543 todo_gui.c:694
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Chcete přepsat soubor %s?"
 
-#: address_gui.c:730 datebook_gui.c:705 memo_gui.c:545 todo_gui.c:696
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Přepsat soubor?"
 
-#: address_gui.c:731 datebook_gui.c:706 memo_gui.c:546 todo_gui.c:697
-msgid "Overwrite File"
-msgstr "Přepsat soubor"
-
-#: address_gui.c:739 datebook_gui.c:714 memo_gui.c:554 todo_gui.c:705
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Chyba při otevírání souboru: %s"
 
-#: address_gui.c:742 datebook_gui.c:717 memo_gui.c:557 todo_gui.c:708
-msgid "Filename"
-msgstr "Název souboru"
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
 
-#: address_gui.c:750
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Nemohu exportovat adresu %d\n"
 
-#: address_gui.c:815 address_gui.c:823 address_gui.c:840
-msgid "Field"
-msgstr "Pole"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Kategorie: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Soukromé"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "E-mail"
 
-#: address_gui.c:1039 datebook_gui.c:985 memo_gui.c:612 todo_gui.c:844
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Neznámý typ exportu\n"
 
-#: address_gui.c:1230 address_gui.c:2655
-msgid "Company/Name"
-msgstr "Firma/Jméno"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
 
-#: address_gui.c:1232 address_gui.c:2657
-msgid "Name/Company"
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
 msgstr "Jméno/Firma"
 
-#: address_gui.c:1330 datebook_gui.c:2602 memo_gui.c:913 todo_gui.c:1246
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
+msgstr "Jméno/Firma"
+
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Firma/Jméno"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Nemůžete upravit záznam, který byl odstraněn\n"
 
-#: address_gui.c:1473 address_gui.c:1857 address_gui.c:2368 memo_gui.c:821
-#: memo_gui.c:1079 memo_gui.c:1358 todo_gui.c:1112 todo_gui.c:1515
-#: todo_gui.c:1528 todo_gui.c:1961
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Kategorie není platná\n"
 
-#: address_gui.c:1531 alarms.c:607 dialer.c:165
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "spouštím příkaz = [%s]\n"
 
-#: address_gui.c:1775 Expense/expense.c:1603 KeyRing/keyring.c:1577
-#: KeyRing/keyring.c:1656
-msgid "Category: "
-msgstr "Kategorie: "
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
 
-#: address_gui.c:1807 address_gui.c:2827
-msgid "kana("
-msgstr "kana("
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
 
-#: address_gui.c:1919 address_gui.c:2937
-msgid "E-mail"
-msgstr "E-mail"
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "zamčení selhalo\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
+#. Category menu
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
+msgid "Category: "
+msgstr "Kategorie: "
 
-#: address_gui.c:1921 address_gui.c:1924 address_gui.c:2938
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Pošta"
 
-#: address_gui.c:1929 address_gui.c:1932 address_gui.c:2941 dialer.c:308
-#: dialer.c:333
+#. Dial Phone Button
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Vytočit"
 
-#: address_gui.c:2142 address_gui.c:2166
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Nepojmenovaný-"
 
-#: address_gui.c:2239 memo_gui.c:1268 todo_gui.c:1850
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 záznamů"
 
-#: address_gui.c:2242 datebook_gui.c:2399 memo_gui.c:1271 todo_gui.c:1853
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d z %d záznamů"
 
-#: address_gui.c:2635 category.c:450 category.c:464 category.c:471
-#: category.c:489 category.c:496 category.c:514 category.c:594 category.c:789
-#: memo_gui.c:1508 todo_gui.c:2116 Expense/expense.c:1609
-msgid "Edit Categories"
-msgstr "Upravit kategorie"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Jméno"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Adresa"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Jiné"
 
-#: address_gui.c:2662
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Poznámka"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
+
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefon"
 
-#: address_gui.c:2684
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Rychlé hledání: "
 
-#: address_gui.c:2700 category.c:421 category.c:877 category.c:917
-#: datebook_gui.c:1154 datebook_gui.c:1582 datebook_gui.c:4371
-#: export_gui.c:344 memo_gui.c:1552 password.c:362 print_gui.c:338
-#: restore_gui.c:312 todo_gui.c:2169 utils.c:1094 KeyRing/keyring.c:1332
+#. Cancel button
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: address_gui.c:2700 datebook_gui.c:4371 memo_gui.c:1552 todo_gui.c:2169
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "Zrušit změny"
 
-#: address_gui.c:2705 category.c:421 category.c:844 datebook_gui.c:4376
-#: memo_gui.c:1557 todo_gui.c:2174 Expense/expense.c:1646
-#: KeyRing/keyring.c:1612
+#. Delete Button
+#. Delete button
+#. Delete Button
+#. Delete button
+#. Delete, Copy, New, etc. buttons
+#. Delete button
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Odstranit"
 
-#: address_gui.c:2705 datebook_gui.c:4376 memo_gui.c:1557 todo_gui.c:2174
-#: Expense/expense.c:1646 KeyRing/keyring.c:1612
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Odstranit vybraný záznam"
 
-#: address_gui.c:2711 datebook_gui.c:4382 memo_gui.c:1563 todo_gui.c:2180
+#. Undelete Button
+#. Undelete button
+#. Undelete Button
+#. Undelete button
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Obnovit"
 
-#: address_gui.c:2711 datebook_gui.c:4382 memo_gui.c:1563 todo_gui.c:2180
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Zrušit odstranění vybraného záznamu"
 
-#: address_gui.c:2717 datebook_gui.c:4388 memo_gui.c:1569 todo_gui.c:2186
-#: Expense/expense.c:1651 KeyRing/keyring.c:1617
+#. Copy button
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: address_gui.c:2717 datebook_gui.c:4388 memo_gui.c:1569 todo_gui.c:2186
-#: Expense/expense.c:1651 KeyRing/keyring.c:1617
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Zkopírovat vybraný záznam"
 
-#: address_gui.c:2723 datebook_gui.c:4394 memo_gui.c:1575 todo_gui.c:2192
-#: Expense/expense.c:1656 KeyRing/keyring.c:1622
+#. New button
+#. New Record button
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Nový záznam"
 
-#: address_gui.c:2723 datebook_gui.c:4394 memo_gui.c:1575 todo_gui.c:2192
-#: Expense/expense.c:1656 KeyRing/keyring.c:1622
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Přidat nový záznam"
 
-#: address_gui.c:2728 datebook_gui.c:4400 memo_gui.c:1581 todo_gui.c:2198
-#: Expense/expense.c:1661 KeyRing/keyring.c:1627
+#. "Add Record" button
+#. Add Record button
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Přidat záznam"
 
-#: address_gui.c:2728 datebook_gui.c:4400 memo_gui.c:1581 todo_gui.c:2198
-#: Expense/expense.c:1661 KeyRing/keyring.c:1627
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Přidat nový záznam"
 
-#: address_gui.c:2738 datebook_gui.c:4410 memo_gui.c:1591 todo_gui.c:2208
-#: Expense/expense.c:1670 KeyRing/keyring.c:1636
+#. "Apply Changes" button
+#. Apply Changes button
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Provést změny"
 
-#: address_gui.c:2738 datebook_gui.c:4410 memo_gui.c:1591 todo_gui.c:2208
-#: Expense/expense.c:1670 KeyRing/keyring.c:1636
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "Potvrdit změny"
 
-#: address_gui.c:2755 datebook_gui.c:4461 memo_gui.c:1609 todo_gui.c:2271
+#. Private check box
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Soukromé"
 
-#: address_gui.c:2775 KeyRing/keyring.c:1485
-msgid "Name"
-msgstr "Jméno"
-
-#: address_gui.c:2783 prefs_gui.c:370
-msgid "Address"
-msgstr "Adresa"
-
-#: address_gui.c:2791 Expense/expense.c:571 Expense/expense.c:1427
-msgid "Other"
-msgstr "Jiné"
+#: ../address_gui.c:4169
+msgid "Change Photo"
+msgstr ""
 
-#: address_gui.c:2799 datebook_gui.c:1332 datebook_gui.c:1582 utils.c:2677
-msgid "All"
-msgstr "Vše"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Odstranit"
 
-#: address_gui.c:3002
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "Zobrazovat\n"
 "v seznamu"
 
-#: address_gui.c:3010
-msgid "Quick View"
-msgstr "Náhled"
-
-#: alarms.c:232
-msgid "Remind me"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
 msgstr "Připomenout mi"
 
-#: alarms.c:242 datebook_gui.c:4443
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "Dnů"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Vše"
+
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minut"
 
-#: alarms.c:244 datebook_gui.c:4447
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Hodin"
 
-#: alarms.c:439
+#: ../alarms.c:253
+msgid "Remind me"
+msgstr "Připomenout mi"
+
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "Nemohu otevřít soubor %s%s\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "Nemohu otevřít soubor: %s%s\n"
 
-#: alarms.c:524
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Připomenutí akce"
 
-#: alarms.c:527
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Minulá akce"
 
-#: alarms.c:530
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Odložená akce"
 
-#: alarms.c:533 datebook_gui.c:4279
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Akce"
 
-#: alarms.c:614
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "Upozornění J-Pilot"
 
-#: alarms.c:1131
-msgid "infinite loop, breaking\n"
-msgstr "nekonečná smyčka, přerušuji\n"
-
-#: alarms.c:1499
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Nemohu otevřít soubor %s.alarms\n"
-
-#: category.c:192 sync.c:2552 utils.c:2797 utils.c:2885 utils.c:3007
-#: utils.c:3077
-msgid "rename failed"
-msgstr "přejmenování selhalo"
-
-#: category.c:229 category.c:286 sync.c:1145 sync.c:2311
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "Poškozený soubor na PC?\n"
 
-#: category.c:236 category.c:246 category.c:293 category.c:304 category.c:314
-#: sync.c:1190 sync.c:1210 sync.c:1270 sync.c:1281 sync.c:2373 sync.c:2400
-#: sync.c:2452 sync.c:2462
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek selhal - fatální chyba\n"
 
-#: category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "přejmenování selhalo"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Přesunout"
 
-#: category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Upravit kategorie"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Již se používá maximální počet kategorií (16)"
 
-#: category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Zadejte novou kategorii"
 
-#: category.c:465
+#: ../category.c:451 ../category.c:475
+#, fuzzy
+msgid "Edit Categories Error"
+msgstr "Upravit kategorie"
+
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Musíte vybrat kategorii kterou přejmenovat"
 
-#: category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "Nemůžete upravovat kategorii %s.\n"
-
-#: category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "Zadejte název nové kategorie"
 
-#: category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Musíte vybrat kategorii, kterou odstranit"
 
-#: category.c:494
-#, c-format
-msgid "You can't delete category %s.\n"
-msgstr "Nemůžete odstranit kategorii %s.\n"
-
-#: category.c:510
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
@@ -410,196 +621,338 @@ msgstr ""
 "V %2$s je %1$d záznamů.\n"
 "Chcete je přesunout do %3$s nebo odstranit?"
 
-#: category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "neplatný stav soubor %s řádek %d\n"
 
-#: category.c:592
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "Kategorii %s nelze použít více než jednou"
 
-#: category.c:814
-msgid "category name"
-msgstr "název kategorie"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "Kategorie:"
 
-#: category.c:832
+#: ../category.c:834
 msgid "New"
 msgstr "Nový"
 
-#: category.c:838
+#: ../category.c:841
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: category.c:924
-msgid "debug"
-msgstr "ladění"
-
-#: dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "neznámý typ ="
 
-#: dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "počet polí na řádku != %d, neznámý formát\n"
 
-#: dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "počet polí != %d, neznámý formát\n"
 
-#: dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Neznámý formát, soubor má špatné schéma\n"
 
-#: dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Schéma souboru je:"
 
-#: dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "Mělo by být:  "
 
-#: dat.c:674 dat.c:692 dat.c:874 dat.c:887 dat.c:1010 dat.c:1023 dat.c:1147
-#: dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr "%s:%d Záznam %d, pole %d: Neplatný typ. Očekáván %d, nalezen %d\n"
 
-#: dat.c:675 dat.c:693 dat.c:875 dat.c:888 dat.c:992 dat.c:1011 dat.c:1024
-#: dat.c:1148 dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "čtení souboru přerušeno\n"
 
-#: datebook.c:650
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "Neznámý repeatType (%d) nalezen v DatebookDB\n"
 
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Opakovat podle:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Opakovat ve dnech:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Opakovat podle:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Opakovat ve dnech:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Opakovat ve dnech:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Opakovat ve dnech:"
+
 # FIXME: this is in libc
-#: datebook_gui.c:222 datebook_gui.c:229 datebook_gui.c:4078
-#: datebook_gui.c:4085
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Ne"
 
-#: datebook_gui.c:223 datebook_gui.c:4079
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Po"
 
-#: datebook_gui.c:224 datebook_gui.c:4080
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Út"
 
-#: datebook_gui.c:225 datebook_gui.c:4081
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "St"
 
-#: datebook_gui.c:226 datebook_gui.c:4082
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Čt"
 
-#: datebook_gui.c:227 datebook_gui.c:4083
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Pá"
 
-#: datebook_gui.c:228 datebook_gui.c:4084
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "So"
 
-#: datebook_gui.c:561 datebook_gui.c:2055
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Skončit dne"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Opakovat ve dnech:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "počet záznamů = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Poznámka"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Upozornění"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Opakovat podle:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Dne v týdnu"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Popis akce > %d, zkracuji na %d\n"
 
-#: datebook_gui.c:571 datebook_gui.c:986 datebook_gui.c:2116
-#: datebook_gui.c:2123
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Chyba"
 
-#: datebook_gui.c:572
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Soubor zřejmě není ve formátu datebook.dat\n"
 
-#: datebook_gui.c:986
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "Neznámý typ exportu"
 
-#: datebook_gui.c:1095 export_gui.c:258 jpilot.c:554
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Exportovat"
 
-#: datebook_gui.c:1112
+#. Label for instructions
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Exportovat všechny záznamy diáře"
 
-#: datebook_gui.c:1131 export_gui.c:320
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: datebook_gui.c:1141 export_gui.c:331
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Procházet"
 
-#: datebook_gui.c:1291
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Kategorie diáře"
 
-#: datebook_gui.c:1326 import_gui.c:311 prefs_gui.c:763
-msgid "Done"
-msgstr "Hotovo"
-
-#: datebook_gui.c:1338 datebook_gui.c:4626
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Nic"
 
-#: datebook_gui.c:1450
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Začít dne"
 
-#: datebook_gui.c:1455
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Skončit dne"
 
 # FIXME: again
-#: datebook_gui.c:1549 prefs.c:413
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Neděle"
 
-#: datebook_gui.c:1550 prefs.c:414
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Pondělí"
 
-#: datebook_gui.c:1551
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: datebook_gui.c:1552
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Středa"
 
-#: datebook_gui.c:1553
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: datebook_gui.c:1554
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Pátek"
 
-#: datebook_gui.c:1555
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Sobota"
 
-#: datebook_gui.c:1558
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4."
 
-#: datebook_gui.c:1558
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Poslední"
 
-#: datebook_gui.c:1561
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -614,70 +967,76 @@ msgstr ""
 "%s měsíce.\n"
 "Co chcete?"
 
-#: datebook_gui.c:1569 datebook_gui.c:1587
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "Otázka?"
 
-#: datebook_gui.c:1569 datebook_gui.c:1587
-msgid "Answer: "
-msgstr "Odpověď: "
-
-#: datebook_gui.c:1577
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Toto je opakující se událost.\n"
 "Chcete aplikovat změny pouze\n"
 "na AKTUÁLNÍ událost nebo na\n"
 "VŠECHNY výskyty této události?"
 
-#: datebook_gui.c:1582
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Aktuální"
 
-#: datebook_gui.c:1823
-msgid "none"
-msgstr "nic"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: datebook_gui.c:1824
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "den"
 
-#: datebook_gui.c:1825
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "týden"
 
-#: datebook_gui.c:1826
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "měsíc"
 
-#: datebook_gui.c:1827
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "rok"
 
 # FIXME: unlocalizable
-#: datebook_gui.c:2111 datebook_gui.c:2114
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Nemůžete mít akci, která se opakuje každých %d %s\n"
 
-#: datebook_gui.c:2124
-msgid "You can not have a weekly repeating appointment that doesn't repeat on any day of the week."
-msgstr "Nemůžete mít týdně opakovanou akci, která se neopakuje v žádném dnu v týdnu."
+#: ../datebook_gui.c:2339
+#, fuzzy
+msgid ""
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
+"day of the week."
+msgstr ""
+"Nemůžete mít týdně opakovanou akci, která se neopakuje v žádném dnu v týdnu."
 
-#: datebook_gui.c:2277
+#. This is a timeless event
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Bez času"
 
-#: datebook_gui.c:2618
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Neplatná akce"
 
-#: datebook_gui.c:2619
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -685,360 +1044,301 @@ msgstr ""
 "Koncové datum této akce\n"
 "je před počátečním datem"
 
-#: datebook_gui.c:2874 datebook_gui.c:4660 datebook_gui.c:4690
-#: datebook_gui.c:4746 datebook_gui.c:4795 todo_gui.c:135 todo_gui.c:2262
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Neurčen"
 
-#: datebook_gui.c:2988
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "Chyba v DateBookDB advanceUnits = %d\n"
 
-#: datebook_gui.c:3159
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "Neznámý repeatType nalezen v DatebookDB\n"
-
-#: datebook_gui.c:3192
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a., %s"
 
-#: datebook_gui.c:3197 monthview_gui.c:210 weekview_gui.c:204
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (DNES)"
 
-#: datebook_gui.c:4184 datebook_gui.c:4628
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Týden"
 
-#: datebook_gui.c:4190
-msgid "W"
-msgstr "T"
-
-#: datebook_gui.c:4192
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "Zobrazit akce po týdnech"
 
-#: datebook_gui.c:4195 datebook_gui.c:4629
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Měsíc"
 
-#: datebook_gui.c:4202
-msgid "M"
-msgstr "M"
-
-#: datebook_gui.c:4204
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "Zobrazit akce po měsících"
 
-#: datebook_gui.c:4209
+#. Make Category button
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Kat."
 
-#: datebook_gui.c:4278
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Čas"
 
-#: datebook_gui.c:4315
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Zobrazit úkoly"
 
-#: datebook_gui.c:4330 todo_gui.c:2131
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Úkol"
 
-#: datebook_gui.c:4331 todo_gui.c:2132
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Termín"
 
-#: datebook_gui.c:4428
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Upozornění"
 
-#: datebook_gui.c:4449
-msgid "Days"
-msgstr "Dnů"
-
-#: datebook_gui.c:4472
-msgid "This Event has no particular time"
-msgstr "Tato akce nemá přiřazen čas."
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "Datum:"
 
-#: datebook_gui.c:4480
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Začíná"
 
-#: datebook_gui.c:4494
-msgid "Start Time"
-msgstr "Čas začátku"
-
-#: datebook_gui.c:4512
-msgid "End Time"
-msgstr "Čas konce"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "Konec"
 
-#: datebook_gui.c:4610
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "Značky DateBk"
 
-#: datebook_gui.c:4627
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Den"
 
-#: datebook_gui.c:4630
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Rok"
 
-#: datebook_gui.c:4634
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Tato akce se neopakuje"
 
-#: datebook_gui.c:4644 datebook_gui.c:4676 datebook_gui.c:4732
-#: datebook_gui.c:4779
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Opakovat každý"
 
-#: datebook_gui.c:4649
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "Den"
 
-#: datebook_gui.c:4652 datebook_gui.c:4684 datebook_gui.c:4740
-#: datebook_gui.c:4787
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Konec"
 
-#: datebook_gui.c:4681
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "Týden"
 
-#: datebook_gui.c:4697
-msgid "Repeat on Days:"
-msgstr "Opakovat ve dnech:"
-
-#: datebook_gui.c:4737
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "Měsíc"
 
-#: datebook_gui.c:4754
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Opakovat podle:"
 
-#: datebook_gui.c:4758
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Dne v týdnu"
 
-#: datebook_gui.c:4767
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Data"
 
-#: datebook_gui.c:4784
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "Rok"
 
-#: dialer.c:196
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Vytáčeč telefonu"
 
-#: dialer.c:231
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Prefix 1"
 
-#: dialer.c:253
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Prefix 2"
 
-#: dialer.c:275
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Prefix 3"
 
-#: dialer.c:290
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Telefonní číslo:"
 
-#: dialer.c:321
+#: ../dialer.c:319
 msgid "Extension"
 msgstr "Klapka"
 
-#: dialer.c:344
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "Příkaz pro vytáčení"
 
-#: dialer.c:365
-msgid "Dismiss"
-msgstr "Zavřít"
-
-#: export_gui.c:116
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Prohlížeč souborů"
 
-#: export_gui.c:276
+#. Label for instructions
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Vyberte záznamy, které exportovat"
 
-#: export_gui.c:278
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Použijte klávesy Ctrl a Shift"
 
-#: import_gui.c:265 import_gui.c:304 import_gui.c:417 import_gui.c:497
-#: jpilot.c:510
+#. Import button
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importovat"
 
-#: import_gui.c:298 install_gui.c:311
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Pro přepnutí do skrytého adresáře napište jeho jméno a stiskněte TAB"
-
-#: import_gui.c:324
-msgid "Import File Type"
-msgstr "Typ importovaného souboru"
-
-#: import_gui.c:436
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "Záznam byl označen jako soukromý"
 
-#: import_gui.c:438
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "Záznam nebyl označen jako soukromý"
 
-#: import_gui.c:445
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "Kategorie před importem byla: [%s]"
 
-#: import_gui.c:451
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Záznam bude umístěn do kategorie [%s]"
 
-#: import_gui.c:504
+#. Import All button
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Importovat vše"
 
-#: import_gui.c:511
+#. Skip button
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Přeskočit"
 
-#: import_gui.c:518
-msgid "Quit"
-msgstr "Konec"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "Pro přepnutí do skrytého adresáře napište jeho jméno a stiskněte TAB"
 
-#: install_gui.c:258
-msgid "Install"
-msgstr "Instalovat"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Typ importovaného souboru"
 
-#: install_gui.c:288
-msgid "Files to be installed"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
 msgstr "Soubory, které instalovat"
 
-#: install_gui.c:317
-msgid "Add"
-msgstr "Přidat"
-
-#: install_gui.c:324
-msgid "Remove"
-msgstr "Odstranit"
-
-#: install_gui.c:331 monthview_gui.c:511 search_gui.c:585 weekview_gui.c:337
-msgid "Close"
-msgstr "Zavřít"
-
-#: jpilot-dump.c:64
-msgid " +B +M +A +T format like date +format (use -? for more info).\n"
-msgstr " +B +M +A +T formát jako date +format (pro více informací použijte -?).\n"
-
-#: jpilot-dump.c:65
-msgid " -v displays version and exits.\n"
-msgstr " -v zobrazí verzi a skončí.\n"
-
-#: jpilot-dump.c:66 utils.c:77
-msgid " -h displays help and exits.\n"
-msgstr " -h zobrazí nápovědu a skončí.\n"
-
-#: jpilot-dump.c:67
-msgid " -B dump dateBook.\n"
-msgstr " -B vypsat dateBook.\n"
-
-#: jpilot-dump.c:68
-msgid " -NYYYY/MM/DD dump apps on YYYY/MM/DD in dateBook.\n"
-msgstr " -NRRRR/MM/DD vypsat akce dne DD.MM:RRRR v dateBook.\n"
-
-#: jpilot-dump.c:69
-msgid " -N dump apps on today in dateBook.\n"
-msgstr " -N vypsat akce dnes v dateBook.\n"
-
-#: jpilot-dump.c:70
-msgid " -M dump Memos.\n"
-msgstr " -M vypsat Poznámky.\n"
-
-#: jpilot-dump.c:71
-msgid " -A dump Address book.\n"
-msgstr " -A vypsat Kontakty.\n"
-
-#: jpilot-dump.c:72
-msgid " -T dump Todo list as CSV.\n"
-msgstr " -T vypsat Seznam úkolů jako CSV.\n"
-
-#: jpilot-sync.c:65
-msgid " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr " Nastavení J-Pilot jsou čtena pro získání portu, rychlosti, počtu záloh atd.\n"
-
-#: jpilot-sync.c:66
-msgid " -v = version\n"
-msgstr " -v = verze\n"
-
-#: jpilot-sync.c:67
-msgid " -h = help\n"
-msgstr " -h = nápověda\n"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Instalovat"
 
-#: jpilot-sync.c:68
-msgid " -d = run in debug mode\n"
-msgstr " -d = spustit v ladicím režimu\n"
+#: ../install_user.c:116 ../install_user.c:218
+#, fuzzy
+msgid "Install User"
+msgstr "/Soubor/Instalovat uživatele"
 
-#: jpilot-sync.c:69
-msgid " -P = do not load plugins.\n"
-msgstr " -P = nenačítat zásuvné moduly.\n"
+#: ../install_user.c:137
+msgid ""
+"A PalmOS(c) device needs a user name and a user ID in order to sync properly."
+msgstr ""
 
-#: jpilot-sync.c:70
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = Synchronizovat a zazálohovat, jinak jen synchronizovat.\n"
+#: ../install_user.c:144
+msgid ""
+"If you want to sync more than 1 PalmOS(c) device each one should have a "
+"different ID and preferably a different user name."
+msgstr ""
 
-#: jpilot-sync.c:71
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l = opakovat, jinak synchronizovat jednou a skončit.\n"
+#. Instruction label
+#: ../install_user.c:166
+msgid "Most people choose their name or nickname for the user name."
+msgstr ""
 
-#: jpilot-sync.c:72
-msgid " -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr " -p {port} = Použít pro synchronizaci tento port místo čtení nastavení.\n"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
+msgstr "Jméno uživatele"
 
-#: jpilot.c:142
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Neplatné zadání geometrie: \"%s\"\n"
+#: ../install_user.c:184
+msgid "The ID should be a random number."
+msgstr ""
 
-#: jpilot.c:386
-msgid "Help"
-msgstr "Nápověda"
+#: ../install_user.c:192 ../restore_gui.c:295
+msgid "User ID"
+msgstr "ID uživatele"
 
-#: jpilot.c:450 monthview_gui.c:517 print_gui.c:332 weekview_gui.c:343
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Tisk"
 
-#: jpilot.c:451
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Tento modul nepodporuje tisk."
 
-#: jpilot.c:511
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Tento modul nepodporuje import."
 
-#: jpilot.c:555
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Tento modul nepodporuje export."
 
-#: jpilot.c:731
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Zrušit synchronizaci"
+
+#. -------------------------------------------
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Tento palm nemá stejné jméno uživatele nebo\n"
@@ -1046,264 +1346,248 @@ msgstr ""
 "minule. Synchronizace může mít nežádoucí důsledky.\n"
 "Pokud si nejste jisti, přečtěte si příručku uživatele."
 
-#: jpilot.c:738
+#. -------------------------------------------
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Tent palm má id uživatele NULL.\n"
 "Každý palm musí pro správnou synchronizaci mít jedinečné id uživatele.\n"
 "Pokud byl tvrdě resetován, obnovte jej použitím obnovit z menu\n"
 "nebo použijte pilot-xfer.\n"
-"Jméno uživatele a ID přidejte použitím nástroje install-user v příkazovém řádku,\n"
+"Jméno uživatele a ID přidejte použitím nástroje install-user v příkazovém "
+"řádku,\n"
 "nebo použijte install-user v menu\n"
 "Pokud si nejste jisti, přečtěte si příručku uživatele."
 
-#: jpilot.c:745
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Zrušit synchronizaci"
 
-#: jpilot.c:745
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Přesto synchronizovat"
 
-#: jpilot.c:755 jpilot.c:760
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Problém při synchronizaci"
 
-#: jpilot.c:755 jpilot.c:760
-msgid "Sync"
-msgstr "Synchronizovat"
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr " Uživatel: "
 
-#: jpilot.c:959
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "Neznámý příkaz od procesu synchronizace\n"
 
-#: jpilot.c:980 Expense/expense.c:516 KeyRing/keyring.c:512
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "O %s"
 
-#: jpilot.c:1382
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: jpilot.c:1383
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Soubor/tear"
 
-#: jpilot.c:1384
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Soubor/_Hledat"
 
-#: jpilot.c:1385 jpilot.c:1391 jpilot.c:1394
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Soubor/sep1"
 
-#: jpilot.c:1386
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Soubor/_Instalovat"
 
-#: jpilot.c:1387
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Soubor/Importovat"
 
-#: jpilot.c:1388
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Soubor/Exportovat"
 
-#: jpilot.c:1389 jpilot.c:2825
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Soubor/Nastavení"
 
-#: jpilot.c:1390
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Soubor/_Tisk"
 
-#: jpilot.c:1392
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Soubor/Instalovat uživatele"
 
-#: jpilot.c:1393
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Soubor/Obnovit handheld"
 
-#: jpilot.c:1395
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Soubor/U_končit"
 
-#: jpilot.c:1396
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Zobrazit"
 
-#: jpilot.c:1397 jpilot.c:1398 jpilot.c:1399 jpilot.c:1653
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Zobrazit/Skrýt soukromé záznamy"
 
-#: jpilot.c:1398
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Zobrazit/Zobrazovat soukromé záznamy"
 
-#: jpilot.c:1399
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Zobrazit/Maskovat soukromé záznamy"
 
-#: jpilot.c:1400
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Zobrazit/sep1"
 
-#: jpilot.c:1401
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Zobrazit/Diář"
 
-#: jpilot.c:1402
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Zobrazit/Kontakty"
 
-#: jpilot.c:1403
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Zobrazit/Úkoly"
 
-#: jpilot.c:1404
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Zobrazit/Poznámky"
 
-#: jpilot.c:1405 jpilot.c:1539
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Moduly"
 
-#: jpilot.c:1407
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_WWW"
 
-#: jpilot.c:1408
+#. web
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/WWW/Netscape"
 
-#: jpilot.c:1412
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/WWW/Mozilla"
 
-#: jpilot.c:1417
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/WWW/Galeon"
 
-#: jpilot.c:1422
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/WWW/Opera"
 
-#: jpilot.c:1426
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/WWW/GnomeUrl"
 
-#: jpilot.c:1428
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/WWW/Lynx"
 
-#: jpilot.c:1430
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/WWW/Links"
 
-#: jpilot.c:1432
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/WWW/W3M"
 
-#: jpilot.c:1434
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/WWW/Konqueror"
 
-#: jpilot.c:1437
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Nápověda"
 
-#: jpilot.c:1438
-msgid "/Help/PayBack program"
-msgstr "/Nápověda/Program PayBack"
-
-#: jpilot.c:1439
-msgid "/Help/J-Pilot"
+#: ../jpilot.c:1163
+#, fuzzy
+msgid "/Help/About J-Pilot"
 msgstr "/Nápověda/J-Pilot"
 
-#: jpilot.c:1506
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Moduly/%s"
 
-#: jpilot.c:1517
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Nápověda/%s"
 
-#: jpilot.c:1816
-msgid "Font Selection Dialog"
-msgstr "Dialog výběru písma"
-
-#: jpilot.c:2154
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
-#: jpilot.c:2199
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "Nenačítám zásuvné moduly.\n"
 
-#: jpilot.c:2203
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "Ignoruji všechna upozornění.\n"
 
-#: jpilot.c:2207
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "Ignoruji minulá upozornění.\n"
 
-#: jpilot.c:2302 jpilot.c:2310
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "Nemohu otevřít rouru\n"
 
-#: jpilot.c:2361
-msgid " User: "
-msgstr " Uživatel: "
-
-#: jpilot.c:2508
-msgid "Clear"
-msgstr "Vymazat"
-
-#: jpilot.c:2579
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "Zobrazovat soukromé záznamy   Ctrl-Z"
 
-#: jpilot.c:2584
-msgid "Show private records"
-msgstr "Zobrazovat soukromé záznamy"
-
-#: jpilot.c:2589
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "Skrýt soukromé záznamy   Ctrl-Z"
 
-#: jpilot.c:2594
-msgid "Hide private records"
-msgstr "Skrýt soukromé záznamy"
-
-#: jpilot.c:2599
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "Maskovat soukromé záznamy   Ctrl-Z"
 
-#: jpilot.c:2604
-msgid "Mask private records"
-msgstr "Maskovat soukromé záznamy"
-
-#: jpilot.c:2614
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Synchronizovat váš palm s desktopem   Ctrl-Y"
 
-#: jpilot.c:2620
-msgid "Font"
-msgstr "Písmo"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Synchronizovat kontakty"
 
-#: jpilot.c:2635
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1311,1502 +1595,2091 @@ msgstr ""
 "Synchronizovat palm s desktopem\n"
 "a pak provést zálohu"
 
-#: jpilot.c:2749
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Diář/Jít na dnešek"
 
-#: jpilot.c:2751
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Kontakty"
 
-#: jpilot.c:2753
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Seznam úkolů"
 
-#: jpilot.c:2755
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Poznámky"
 
-#: jpilot.c:2807
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "Udělat to teď"
 
-#: jpilot.c:2807
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Připomeň mi to později"
 
-#: jpilot.c:2807
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "Už mi to neříkej!"
 
-#: jpilot.c:2821
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters (accents for example).\n"
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
+"(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
-"J-Pilot používá grafický toolkit GTK2. Tato verze toolkit používá pro kódování znaků UTF-8.\n"
-"Měli byste zvolit znakovou sadu UTF-8, abyste mohli vidět ne-ASCII znaky (např. diakritiku).\n"
+"J-Pilot používá grafický toolkit GTK2. Tato verze toolkit používá pro "
+"kódování znaků UTF-8.\n"
+"Měli byste zvolit znakovou sadu UTF-8, abyste mohli vidět ne-ASCII znaky "
+"(např. diakritiku).\n"
 "\n"
 
-#: jpilot.c:2824
-msgid "Go to the menu \""
-msgstr "Jděte do menu \""
-
-#: jpilot.c:2826
-msgid "\" and change the \""
-msgstr "\" a změňte \""
-
-#: jpilot.c:2827 prefs_gui.c:390
-msgid "Character Set "
+#. Character Set
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Znaková sada "
 
-#: jpilot.c:2828
-msgid "\"."
-msgstr "\"."
-
-#: jpilot.c:2830
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Zvolit kódování UTF-8"
 
-#: libplugin.c:153
-#, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "Neznámá verze hlavičky PC = %d\n"
-
-#: libplugin.c:441
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d Chyba při otevírání souboru: %s\n"
-
-#: libplugin.c:447 libplugin.c:476 sync.c:2880 todo.c:391
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Chyba při čtení souboru: %s\n"
-
-#: libplugin.c:503 utils.c:1899
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+#: ../jpilot-dump.c:92
+#, fuzzy, c-format
+msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
-"Tento záznam již byl odstraněn.\n"
-"Bude z Palmu odstraněn při příští synchronizaci.\n"
+" +B +M +A +T formát jako date +format (pro více informací použijte -?).\n"
 
-#: libplugin.c:512 utils.c:1908 utils.c:1945
-msgid "Unable to open PC records file\n"
-msgstr "Nemohu otevřít soubor záznamů PC\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v zobrazí verzi a skončí.\n"
 
-#: libplugin.c:518 utils.c:1914
-msgid "Couldn't find record to delete\n"
-msgstr "Nemohu najít záznam, který odstranit\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h zobrazí nápovědu a skončí.\n"
 
-#: libplugin.c:537 utils.c:1932
-#, c-format
-msgid "Unknown header version %d\n"
-msgstr "Neznámá verze hlavičky %d\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -h zobrazí nápovědu a skončí.\n"
 
-#: libplugin.c:550
-msgid "Couldn't open PC records file\n"
-msgstr "Nemohu otevřít soubor záznamů PC\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -B vypsat dateBook.\n"
 
-#: libplugin.c:607 libplugin.c:699 utils.c:1459 utils.c:1471
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "Error opening file: %s\n"
-msgstr "Chyba při otevírání souboru: %s\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: libplugin.c:636
-msgid "Error reading PC file 1\n"
-msgstr "Chyba při čtení souboru PC 1\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N vypsat akce dnes v dateBook.\n"
 
-#: libplugin.c:652
-msgid "Error reading PC file 2\n"
-msgstr "Chyba při čtení souboru PC 2\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr " -NRRRR/MM/DD vypsat akce dne DD.MM:RRRR v dateBook.\n"
 
-#: libplugin.c:824
-#, c-format
-msgid "Error reading %s 5\n"
-msgstr "Chyba při čtení %s 5\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr " -A vypsat Kontakty.\n"
 
-#: log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Nemohu otevřít soubor záznamu, vzdávám to.\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -T vypsat Seznam úkolů jako CSV.\n"
+
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M vypsat Poznámky.\n"
 
-#: log.c:102
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "Nemohu otevřít soubor záznamu\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: memo_gui.c:318
-msgid "Memo text > 65535, truncating\n"
-msgstr "Text poznámky > 65535, zkracuji\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "Nemohu otevřít soubor: %s\n"
 
-#: memo_gui.c:348
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "Importována poznámka %s\n"
-
-#: memo_gui.c:419
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Soubor zřejmě není ve formátu memopad.dat\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: memo_gui.c:568 memo_gui.c:583
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "Nemohu exportovat poznámku %d\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: monthview_gui.c:475
-msgid "Monthly View"
-msgstr "Pohled na měsíc"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: password.c:304
-msgid "Palm Password"
-msgstr "Heslo Palmu"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: password.c:329
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Nesprávné, vložte znovu heslo PalmOS"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: password.c:331
-msgid "Enter PalmOS Password"
-msgstr "Vložte heslo PalmOS"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: plugins.c:88 plugins.c:200 restore_gui.c:133
-msgid "infinite loop"
-msgstr "nekonečná smyčka"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: plugins.c:213
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "Při čtení %s%s řádek 1:[%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: plugins.c:214
-msgid "Wrong Version\n"
-msgstr "Špatná verze\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: plugins.c:215
-msgid "Check preferences->conduits\n"
-msgstr "Zkontrolujte nastavení->moduly\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: plugins.c:271
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
-"Otevření selhalo u zásuvného modulu [%s]\n"
-" chyba [%s]\n"
 
-#: plugins.c:288 plugins.c:314
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " zásuvný modul není platný: [%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: plugins.c:296
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "Zásuvný modul:[%s]\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: plugins.c:297
+#: ../jpilot-merge.c:299
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "Tento zásuvný modul má verzi (%d.%d).\n"
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "Je moc starý pro práci s touto verzí J-Pilot.\n"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: prefs.c:391
-msgid "%B %d, %Y"
-msgstr "%B %d, %Y"
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+" Nastavení J-Pilot jsou čtena pro získání portu, rychlosti, počtu záloh "
+"atd.\n"
 
-#: prefs.c:392
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v zobrazí verzi a přepínače při překladu a skončí.\n"
 
-#: prefs.c:393
-msgid "%d. %B %Y"
-msgstr "%d. %B %Y"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d zobrazuje ladicí informace na stdout.\n"
 
-#: prefs.c:394
-msgid "%d %B, %Y"
-msgstr "%d %B, %Y"
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr "Nenačítám zásuvné moduly.\n"
 
-#: prefs.c:395
-msgid "%Y. %B. %d"
-msgstr "%Y. %B. %d"
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
 
-#: prefs.c:396
-msgid "%Y %B %d"
-msgstr "%Y %B %d"
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l = opakovat, jinak synchronizovat jednou a skončit.\n"
 
-#: prefs_gui.c:334
-msgid "Preferences"
-msgstr "Nastavení"
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+" -p {port} = Použít pro synchronizaci tento port místo čtení nastavení.\n"
 
-#: prefs_gui.c:364
-msgid "Locale"
-msgstr "Locale"
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Chyba při otevírání souboru: %s\n"
 
-#: prefs_gui.c:366
-msgid "Settings"
-msgstr "Nastavení"
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
 
-#: prefs_gui.c:368
-msgid "Datebook"
-msgstr "Diář"
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Chyba při otevírání souboru: next_id\n"
 
-#: prefs_gui.c:372
-msgid "ToDo"
-msgstr "Úkoly"
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
 
-#: prefs_gui.c:374
-msgid "Memo"
-msgstr "Poznámky"
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Chyba"
 
-#: prefs_gui.c:376
-msgid "Alarms"
-msgstr "Upozornění"
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
 
-#: prefs_gui.c:378
-msgid "Conduits"
-msgstr "Moduly"
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
 
-#: prefs_gui.c:403
-msgid "Short date format "
-msgstr "Formát krátkého data "
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#: prefs_gui.c:416
-msgid "Long date format "
-msgstr "Formát dlouhého data "
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
 
-#: prefs_gui.c:429
-msgid "Time format "
-msgstr "Formát času "
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
 
-#: prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "První den týdne je "
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "Vaše proměnná prostředí HOME je na mě moc dlouhá\n"
 
-#: prefs_gui.c:464
-msgid "My GTK colors file is "
-msgstr "Můj soubor barev GTK je "
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
 
-#: prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Sériový port (/dev/ttyS0, /dev/pilot)"
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
 
-#: prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr "Rychlost přenosu (nemá vliv na USB)"
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#: prefs_gui.c:507
-msgid "Number of backups to be archived"
-msgstr "Počet záloh, které archivovat"
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
 
-#: prefs_gui.c:524
-msgid "Show deleted records (default NO)"
-msgstr "Zobrazovat odstraněné záznamy (implicitně NE)"
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"Tento záznam již byl odstraněn.\n"
+"Bude z Palmu odstraněn při příští synchronizaci.\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "Nemohu otevřít soubor záznamů PC\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "Nemohu najít záznam, který odstranit\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "Neznámá verze hlavičky %d\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d Chyba při otevírání souboru: %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Chyba při čtení souboru: %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "Chyba při otevírání souboru: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "Chyba při čtení %s 5\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "Chyba při čtení souboru PC 1\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "Chyba při čtení souboru PC 2\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "Neznámá verze hlavičky PC = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Nemohu otevřít soubor záznamu, vzdávám to.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "Nemohu otevřít soubor záznamu\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "Text poznámky > 65535, zkracuji\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "Importována poznámka %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Soubor zřejmě není ve formátu memopad.dat\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "Nemohu exportovat poznámku %d\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Poznámky"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Pohled na měsíc"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Heslo Palmu"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Nesprávné, vložte znovu heslo PalmOS"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Vložte heslo PalmOS"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Chyba při čtení souboru: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "nekonečná smyčka"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "Při čtení %s%s řádek 1:[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "Špatná verze\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "Zkontrolujte nastavení->moduly\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"Otevření selhalo u zásuvného modulu [%s]\n"
+" chyba [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " zásuvný modul není platný: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "Zásuvný modul:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "Tento zásuvný modul má verzi (%d.%d).\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "Je moc starý pro práci s touto verzí J-Pilot.\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr "%B %d, %Y"
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr "%d. %B %Y"
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr "%d %B, %Y"
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
+msgstr "%Y. %B. %d"
 
-#: prefs_gui.c:528
+#: ../prefs.c:423
+msgid "%Y %B %d"
+msgstr "%Y %B %d"
+
+#: ../prefs_gui.c:452
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: ../prefs_gui.c:483
+msgid "Locale"
+msgstr "Locale"
+
+#: ../prefs_gui.c:485
+msgid "Settings"
+msgstr "Nastavení"
+
+#: ../prefs_gui.c:487
+msgid "Datebook"
+msgstr "Diář"
+
+#: ../prefs_gui.c:491
+msgid "ToDo"
+msgstr "Úkoly"
+
+#: ../prefs_gui.c:493
+msgid "Memo"
+msgstr "Poznámky"
+
+#: ../prefs_gui.c:495
+msgid "Alarms"
+msgstr "Upozornění"
+
+#: ../prefs_gui.c:497
+msgid "Conduits"
+msgstr "Moduly"
+
+#. Shortdate
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
+msgstr "Formát krátkého data "
+
+#. Longdate
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
+msgstr "Formát dlouhého data "
+
+#. Time
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
+msgstr "Formát času "
+
+#. GTK colors file
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
+msgstr "Můj soubor barev GTK je "
+
+#. Port
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Problém při synchronizaci"
+
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
+
+#. Number of backups
+#: ../prefs_gui.c:625
+msgid "Number of backups to be archived"
+msgstr "Počet záloh, které archivovat"
+
+#. Show deleted files check box
+#: ../prefs_gui.c:643
+msgid "Show deleted records (default NO)"
+msgstr "Zobrazovat odstraněné záznamy (implicitně NE)"
+
+#. Show modified files check box
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Zobrazovat změněné odstraněné záznamy (implicitně NE)"
 
-#: prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
-msgstr "Žádat o potvrzení před instalací souborů (J-Pilot -> PDA) (implicitně ANO)"
+msgstr ""
+"Žádat o potvrzení před instalací souborů (J-Pilot -> PDA) (implicitně ANO)"
 
-#: prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#. Show tooltips check box
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Zobrazovat vyskakovací tipy (implicitně ANO)"
 
-#: prefs_gui.c:545
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
+#. Show highlight days check box
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Zvýrazňovat v kalendáři dny s akcí"
 
-#: prefs_gui.c:551
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr "Označit dnešek v pohledech na den, týden a měsíc"
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr "Připojit roky k výročím v pohledech na den, týden a měsíc"
+
+#. Show use DateBk check box
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "Používat značky poznámek DateBk"
 
-#: prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "Podpora DateBk v tomto přeložení zakázána"
 
-#: prefs_gui.c:560
-msgid "Annotate today in day, week, and month views"
-msgstr "Označit dnešek v pohledech na den, týden a měsíc"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
+msgstr ""
 
-#: prefs_gui.c:565
-msgid "Append years on anniversaries in day, week, and month views"
-msgstr "Připojit roky k výročím v pohledech na den, týden a měsíc"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
+msgstr ""
 
-#: prefs_gui.c:577
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Příkaz pro poštu"
 
-#: prefs_gui.c:591
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s je nahrazeno časem e-mailovou adresou"
 
-#: prefs_gui.c:599
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Skrýt dokončené úkoly"
 
-#: prefs_gui.c:603
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Skrýt úkoly, které ještě nemají být hotovy"
 
-#: prefs_gui.c:607
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Zaznamenat datum dokončení"
 
-#: prefs_gui.c:612
+#. Use Manana check box
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Použít databázi Manana"
 
-#: prefs_gui.c:620
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "Použít implicitní počet zbývajících dnů"
 
-#: prefs_gui.c:640
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Používat Memo32 (pedit32)"
 
-#: prefs_gui.c:647
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
+#. ********************************************************************
+#. Alarms preference tab
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Otevírat okna s upozorněním pro připomínání akcí"
 
-#: prefs_gui.c:651
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Spustit tento příkaz"
 
-#: prefs_gui.c:655
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "VAROVÁNÍ: provádění libovolných příkazů shellu může být nebezpečné!!!"
 
-#: prefs_gui.c:663
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Příkaz pro upozornění"
 
-#: prefs_gui.c:676
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t je nahrazeno časem upozornění"
 
-#: prefs_gui.c:680
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d je nahrazeno datem upozornění"
 
-#: prefs_gui.c:685
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D je nahrazeno popisem upozornění"
 
-#: prefs_gui.c:689
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N je nahrazeno poznámkou upozornění"
 
-#: prefs_gui.c:693
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (nahrazení popisu) je v tomto přeložení zakázáno"
 
-#: prefs_gui.c:697
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%D (nahrazení poznámky) je v tomto přeložení zakázáno"
 
-#: prefs_gui.c:706
+#. ********************************************************************
+#. Conduits preference tab
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Synchronizovat diář"
 
-#: prefs_gui.c:710
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Synchronizovat kontakty"
 
-#: prefs_gui.c:714
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Synchronizovat úkoly"
 
-#: prefs_gui.c:718
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Synchronizovat poznámky"
 
-#: prefs_gui.c:722
-msgid "Sync memo32 (pedit32)"
-msgstr "Synchronizovat memo32 (pedit32)"
-
-#: prefs_gui.c:727
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Synchronizovat Manana"
 
-#: prefs_gui.c:733
+#. Show use Japanese Kana extention check box
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Používat J-OS (Ne japonský PalmOS:WorkPad/CLIE)"
 
-#: prefs_gui.c:746
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "Synchronizovat %s (%s)"
 
-#: print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Možnosti tisku"
 
-#: print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Velikost papíru"
 
-#: print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Denní sestava"
 
-#: print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Týdenní sestava"
 
-#: print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Měsíční sestava"
 
-#: print_gui.c:261
-msgid "One record"
-msgstr "Jeden záznam"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Odstraněn záznam %s."
 
-#: print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Všechny záznamy této kategorie"
 
-#: print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Vytisknout všechny záznamy"
 
-#: print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Jeden záznam na stránku"
 
-#: print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " Prázdné řádky mezi záznamy"
 
-#: print_gui.c:318
+#. Print Command
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Tiskový příkaz (např. lpr nebo cat > soubor.ps)"
 
-#: restore_gui.c:68 restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Obnovit handheld"
 
-#: restore_gui.c:249
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Soubory, které instalovat"
+
+#. Label for instructions
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Pro obnovení vašeho handheldu:"
 
-#: restore_gui.c:252
-msgid "1. Choose all the applications you wish to restore.  The default is all."
-msgstr "1. Zavřete všechny aplikace, které chcete obnovit. Implicitně se obnovují všechny."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
+msgstr ""
+"1. Zavřete všechny aplikace, které chcete obnovit. Implicitně se obnovují "
+"všechny."
 
-#: restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Zadejte jméno uživatele a ID uživatele."
 
-#: restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Stiskněte tlačítko Budiž."
 
-#: restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "To přepíše data, která momentálně jsou v handheldu."
 
-#: restore_gui.c:282
-msgid "User Name"
-msgstr "Jméno uživatele"
+#: ../search_gui.c:142
+msgid "datebook"
+msgstr "diář"
+
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
+msgid "address"
+msgstr "Kontakty"
+
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
+msgid "todo"
+msgstr "úkoly"
+
+#: ../search_gui.c:359
+msgid "memo"
+msgstr "poznámky"
+
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "poznámky"
+
+#: ../search_gui.c:419
+msgid "plugin ?"
+msgstr "zásuvný modul ?"
+
+#: ../search_gui.c:499
+msgid "No records found"
+msgstr "Nenalezeny žádné záznamy"
+
+#: ../search_gui.c:598
+msgid "Search"
+msgstr "Hledat"
+
+#. Search label
+#: ../search_gui.c:615
+msgid "Search for: "
+msgstr "Hledat: "
+
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
+msgid "Case Sensitive"
+msgstr "Rozlišovat velikost písmen"
+
+#: ../sync.c:118
+msgid "open lock file failed\n"
+msgstr "otevření souboru zámku selhalo\n"
+
+#: ../sync.c:131
+msgid "lock failed\n"
+msgstr "zamčení selhalo\n"
+
+#: ../sync.c:136
+#, c-format
+msgid "sync file is locked by pid %d\n"
+msgstr "soubor synchronizace je zamčen pid %d\n"
+
+#: ../sync.c:175
+msgid "unlock failed\n"
+msgstr "odemčení selhalo\n"
+
+#: ../sync.c:180
+#, c-format
+msgid "sync is locked by pid %d\n"
+msgstr "synchronizace je zamčena pid %d\n"
+
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "Zkontrolujte svůj sériový port a nastavení\n"
+
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "Nemohu číst domovský adresář\n"
+
+#: ../sync.c:1085 ../sync.c:1423
+#, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (ID tvůrce '%s') je aktuální, stahování přeskočeno.\n"
+
+#: ../sync.c:1089 ../sync.c:1427
+#, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Stahuji '%s' (ID tvůrce '%s')... "
+
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "Selhalo, nemohu vytvořit soubor %s\n"
+
+#: ../sync.c:1100 ../sync.c:1438
+#, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr "Selhalo, nemohu zazálohovat databázi %s\n"
+
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "Budiž\n"
+
+#: ../sync.c:1304
+#, c-format
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "Přeskakuji %s (ID tvůrce '%s')\n"
+
+#: ../sync.c:1498
+#, c-format
+msgid "Installing %s "
+msgstr "Instaluji %s "
+
+#: ../sync.c:1504 ../sync.c:1540
+#, c-format
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Nemohu otevřít soubor: '%s': %s!\n"
+
+#: ../sync.c:1508
+#, c-format
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Nemohu synchronizovat soubor: '%s': poškozený soubor?\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(ID tvůrce je '%s')..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(ID tvůrce je '%s')..."
+
+#: ../sync.c:1530
+#, c-format
+msgid "(SDcard dir %s)... "
+msgstr ""
+
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
+#, c-format
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"Nemohu otevřít soubor: %s\n"
+
+#: ../sync.c:1615
+#, c-format
+msgid "Install %s failed"
+msgstr "Instalace %s selhala"
+
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Chyba.\n"
+
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "Nainstalováno %s "
 
-#: restore_gui.c:295
-msgid "User ID"
-msgstr "ID uživatele"
+#: ../sync.c:1736
+#, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d Chyba při získávání informace o aplikaci %s\n"
 
-#: search_gui.c:118
-msgid "datebook"
-msgstr "diář"
+#: ../sync.c:1742 ../sync.c:1772
+#, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d Chyba při rozbalování informace o aplikaci %s\n"
 
-#: search_gui.c:199
-msgid "address"
-msgstr "Kontakty"
+#: ../sync.c:1763
+#, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Chyba při čtení bloku appinfo pro %s\n"
 
-#: search_gui.c:265
-msgid "todo"
-msgstr "úkoly"
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "Nemohu přidat kategorii %s do vzdáleného.\n"
 
-#: search_gui.c:319
-msgid "memo"
-msgstr "poznámky"
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "Příliš mnoho kategorií na vzdáleném.\n"
 
-#: search_gui.c:375
-msgid "plugin ?"
-msgstr "zásuvný modul ?"
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Všechny záznamy na desktopu v %s budou přesunuty do %s.\n"
 
-#: search_gui.c:447
-msgid "No records found"
-msgstr "Nenalezeny žádné záznamy"
+#: ../sync.c:2106 ../sync.c:2824
+#, c-format
+msgid "Syncing %s\n"
+msgstr "Synchronizuji %s\n"
 
-#: search_gui.c:526 search_gui.c:579
-msgid "Search"
-msgstr "Hledat"
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
+#, c-format
+msgid "Wrote an %s record."
+msgstr "Zapsal jsem záznam %s."
 
-#: search_gui.c:541
-msgid "Search for: "
-msgstr "Hledat: "
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
+#, c-format
+msgid "Writing an %s record failed."
+msgstr "Zápis záznamu %s selhal."
 
-#: search_gui.c:548
-msgid "Case Sensitive"
-msgstr "Rozlišovat velikost písmen"
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
+#, c-format
+msgid "Deleting an %s record failed."
+msgstr "Odstraňování záznamu %s selhalo."
 
-#: sync.c:139
-msgid "open lock file failed\n"
-msgstr "otevření souboru zámku selhalo\n"
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
+#, c-format
+msgid "Deleted an %s record."
+msgstr "Odstraněn záznam %s."
 
-#: sync.c:152
-msgid "lock failed\n"
-msgstr "zamčení selhalo\n"
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "Odstraněn záznam %s."
 
-#: sync.c:155
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
-msgid "sync file is locked by pid %d\n"
-msgstr "soubor synchronizace je zamčen pid %d\n"
+msgid "Wrote a %s record."
+msgstr "Zapsán záznam %s."
 
-#: sync.c:189
-msgid "unlock failed\n"
-msgstr "odemčení selhalo\n"
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
+#, c-format
+msgid "Writing a %s record failed."
+msgstr "Zápis záznamu %s selhal."
 
-#: sync.c:192
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
-msgid "sync is locked by pid %d\n"
-msgstr "synchronizace je zamčena pid %d\n"
+msgid "Deleting a %s record failed."
+msgstr "Odstraňování záznamu %s selhalo."
 
-#: sync.c:244
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s: stiskněte tlačítko hotsync na kolébce nebo \"kill %d\"\n"
+msgid "Deleted a %s record."
+msgstr "Odstraněn záznam %s."
 
-#: sync.c:297
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "Exiting with status %s\n"
-msgstr "Končím se stavem %s\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
+
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: sync.c:298
-msgid "Finished\n"
-msgstr "Dokončeno\n"
+#: ../sync.c:2368 ../sync.c:2708
+msgid ""
+"dlp_DeleteRecord failed\n"
+"This could be because the record was already deleted on the Palm\n"
+msgstr ""
+"dlp_DeleteRecord selhalo\n"
+"To je možná protože záznam již byl na Palmu odstraněn\n"
 
-#: sync.c:432
+#: ../sync.c:2937
 msgid "Finished installing user information.\n"
 msgstr "Instalace informací o uživateli dokončena.\n"
 
-#: sync.c:457 sync.c:574
-msgid "Check your serial port and settings\n"
-msgstr "Zkontrolujte svůj sériový port a nastavení\n"
-
-#: sync.c:672
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr " Synchronizuji se zařízením %s\n"
 
-#: sync.c:673
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr " Teď stiskněte tlačítko HotSync\n"
 
-#: sync.c:725 sync.c:747 sync.c:769
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr "Jméno uživatele poslední synchronizace-->\"%s\"\n"
 
-#: sync.c:726 sync.c:748 sync.c:770
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr "Poslední ID uživatele synchronizace-->\"%d\"\n"
 
-#: sync.c:727 sync.c:749 sync.c:771
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr " Toto jméno uživatele-->\"%s\"\n"
 
-#: sync.c:728 sync.c:750 sync.c:772
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
 msgid " This User ID-->%d\n"
 msgstr " Toto ID uživatele-->\"%d\"\n"
 
-#: sync.c:793
+#: ../sync.c:3204
 #, c-format
 msgid "Username is \"%s\"\n"
 msgstr "Jméno uživatele je \"%s\"\n"
 
-#: sync.c:794
+#: ../sync.c:3205
 #, c-format
 msgid "User ID is %d\n"
 msgstr "ID uživatele je %d\n"
 
-#: sync.c:796 sync.c:802
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr "lastSyncPC = %d\n"
 
-#: sync.c:797
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr "Toto PC = %lu\n"
 
-#: sync.c:798
-#, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Poslední jméno uživatele = [%s]\n"
-
-#: sync.c:799
-#, c-format
-msgid "Last UserID = %d\n"
-msgstr "Poslední ID uživatele = %d\n"
-
-#: sync.c:800
-#, c-format
-msgid "Username = [%s]\n"
-msgstr "Jméno uživatele = [%s]\n"
-
-#: sync.c:801
-#, c-format
-msgid "userID = %d\n"
-msgstr "ID uživatele = %d\n"
-
-#: sync.c:819
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr "Synchronizace přerušena\n"
 
 # FIXME: so don't make it translatable!
-#: sync.c:841
+#: ../sync.c:3255
 msgid "Finished restoring handheld.\n"
 msgstr "Finished restoring handheld.\n"
 
-#: sync.c:842
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr "You may need to sync to update J-Pilot.\n"
 
-#: sync.c:872
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr "Provádím rychlou synchronizaci.\n"
 
-#: sync.c:911
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr "Provádím pomalou synchronizaci.\n"
 
-#: sync.c:1012
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr "Děkujeme vám za použití J-Pilot."
 
-#: sync.c:1054
+#: ../sync.c:3411 ../sync.c:3479
 msgid "Finished.\n"
 msgstr "Finished.\n"
 
-#: sync.c:1090 sync.c:2612
-#, c-format
-msgid "Syncing %s\n"
-msgstr "Synchronizuji %s\n"
-
-#: sync.c:1096 sync.c:2276 sync.c:2618
-#, c-format
-msgid "Wrote an %s record."
-msgstr "Zapsal jsem záznam %s."
-
-#: sync.c:1098 sync.c:2278 sync.c:2620
-#, c-format
-msgid "Writing an %s record failed."
-msgstr "Zápis záznamu %s selhal."
-
-#: sync.c:1100 sync.c:2280 sync.c:2622
-#, c-format
-msgid "Deleting an %s record failed."
-msgstr "Odstraňování záznamu %s selhalo."
-
-#: sync.c:1102 sync.c:2282 sync.c:2624
-#, c-format
-msgid "Deleted an %s record."
-msgstr "Odstraněn záznam %s."
-
-#: sync.c:1105 sync.c:2285 sync.c:2627
-#, c-format
-msgid "Wrote a %s record."
-msgstr "Zapsán záznam %s."
-
-#: sync.c:1107 sync.c:2287 sync.c:2629
-#, c-format
-msgid "Writing a %s record failed."
-msgstr "Zápis záznamu %s selhal."
-
-#: sync.c:1109 sync.c:2289 sync.c:2631
-#, c-format
-msgid "Deleting a %s record failed."
-msgstr "Odstraňování záznamu %s selhalo."
-
-#: sync.c:1111 sync.c:2291 sync.c:2633
+#: ../sync.c:3446
 #, c-format
-msgid "Deleted a %s record."
-msgstr "Odstraněn záznam %s."
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#: sync.c:1131
+#: ../sync.c:3447
 #, c-format
-msgid "number of records = %d\n"
-msgstr "počet záznamů = %d\n"
-
-#: sync.c:1258 sync.c:2436
 msgid ""
-"dlp_DeleteRecord failed\n"
-"This could be because the record was already deleted on the Palm\n"
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
 msgstr ""
-"dlp_DeleteRecord selhalo\n"
-"To je možná protože záznam již byl na Palmu odstraněn\n"
-
-#: sync.c:1357 sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (ID tvůrce '%s') je aktuální, stahování přeskočeno.\n"
-
-#: sync.c:1361 sync.c:1774
-#, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Stahuji '%s' (ID tvůrce '%s')... "
 
-#: sync.c:1368 sync.c:1780
+#: ../sync.c:3478
 #, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Selhalo, nemohu vytvořit soubor %s\n"
+msgid "Exiting with status %s\n"
+msgstr "Končím se stavem %s\n"
 
-#: sync.c:1379 sync.c:1789
+#: ../todo.c:264
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Selhalo, nemohu zazálohovat databázi %s\n"
-
-#: sync.c:1383 sync.c:1793 sync.c:1975
-msgid "OK\n"
-msgstr "Budiž\n"
+msgid "ToDo description text > %d, truncating to %d\n"
+msgstr "Popis úkolu > %d, zkracuji na %d\n"
 
-#: sync.c:1686
+#: ../todo.c:270
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "Přeskakuji %s (ID tvůrce '%s')\n"
+msgid "ToDo note text > %d, truncating to %d\n"
+msgstr "Poznámka úkolu > %d, zkracuji na %d\n"
 
-#: sync.c:1861
-#, c-format
-msgid "Installing %s "
-msgstr "Instaluji %s "
+#: ../todo_gui.c:159
+msgid "Due Date"
+msgstr "Termín"
 
-#: sync.c:1867
-#, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"Nemohu otevřít soubor: '%s': %s!\n"
+#: ../todo_gui.c:532
+msgid "File doesn't appear to be todo.dat format\n"
+msgstr "Soubor zřejmě není ve formátu todo.dat\n"
 
-#: sync.c:1871
-#, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
 msgstr ""
-"\n"
-"Nemohu synchronizovat soubor: '%s': poškozený soubor?\n"
-
-#: sync.c:1883
-#, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(ID tvůrce je '%s')..."
 
-#: sync.c:1903 sync.c:1916 sync.c:1931 sync.c:1944
+#: ../todo_gui.c:688
 #, c-format
 msgid ""
+"ToDo exported from %s %s on %s\n"
 "\n"
-"Unable to open file: %s\n"
 msgstr ""
-"\n"
-"Nemohu otevřít soubor: %s\n"
-
-#: sync.c:1960
-#, c-format
-msgid "Install %s failed"
-msgstr "Instalace %s selhala"
 
-#: sync.c:1964
-msgid "Failed.\n"
-msgstr "Chyba.\n"
-
-#: sync.c:1971
-#, c-format
-msgid "Installed %s "
-msgstr "Nainstalováno %s "
-
-#: sync.c:1995 sync.c:2001
+#: ../todo_gui.c:726
 #, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Nemohu otevřít soubor: %s%s\n"
-
-#: sync.c:2181
-msgid "Unable to read home dir\n"
-msgstr "Nemohu číst domovský adresář\n"
+msgid "Can't export todo %d\n"
+msgstr "Nemohu exportovat úkol %d\n"
 
-#: sync.c:2710
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: počet záznamů = %d\n"
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Termín"
 
-#: sync.c:2711
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "disk: počet záznamů = %d\n"
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Termín"
 
-#: sync.c:2889
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d Chyba při získávání informace o aplikaci %s\n"
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "Priorita: "
 
-#: sync.c:2895 sync.c:2937
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d Chyba při rozbalování informace o aplikaci %s\n"
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Dokončeno"
 
-#: sync.c:2917 sync.c:2929
+#: ../todo_gui.c:774
 #, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Chyba při čtení bloku appinfo pro %s\n"
+msgid "Description: %s\n"
+msgstr ""
 
-#: sync.c:3077 sync.c:3081
+#: ../todo_gui.c:777
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "Nemohu přidat kategorii %s do vzdáleného.\n"
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
 
-#: sync.c:3078 sync.c:3084
-msgid "Too many categories on remote.\n"
-msgstr "Příliš mnoho kategorií na vzdáleném.\n"
+#: ../todo_gui.c:1610
+msgid "Priority out of range\n"
+msgstr "Priorita mimo rozsah\n"
 
-#: sync.c:3079 sync.c:3087
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Všechny záznamy na desktopu v %s budou přesunuty do %s.\n"
+msgid "No date"
+msgstr "Neurčen"
 
-#: todo.c:248
-#, c-format
-msgid "ToDo description text > %d, truncating to %d\n"
-msgstr "Popis úkolu > %d, zkracuji na %d\n"
+#. Completed checkbox
+#: ../todo_gui.c:2411
+msgid "Completed"
+msgstr "Dokončeno"
 
-#: todo.c:255
-#, c-format
-msgid "ToDo note text > %d, truncating to %d\n"
-msgstr "Poznámka úkolu > %d, zkracuji na %d\n"
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
+msgstr "Priorita: "
 
-#: todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Chyba při čtení informace o kategoriích %s\n"
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
 
-#: todo_gui.c:154
-msgid "Due Date"
-msgstr "Termín"
+#: ../todo_gui.c:2441
+msgid "Date Due:"
+msgstr "Termín:"
 
-#: todo_gui.c:561
-msgid "File doesn't appear to be todo.dat format\n"
-msgstr "Soubor zřejmě není ve formátu todo.dat\n"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Dnešek"
 
-#: todo_gui.c:720 todo_gui.c:735
+#: ../utils.c:575
 #, c-format
-msgid "Can't export todo %d\n"
-msgstr "Nemohu exportovat úkol %d\n"
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Nemohu najít prázdný DB soubor %s: %s\n"
 
-#: todo_gui.c:1556
-msgid "Priority out of range\n"
-msgstr "Priorita mimo rozsah\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " možná není nainstalován.\n"
 
-#: todo_gui.c:1772
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
 #, c-format
-msgid "No date"
-msgstr "Neurčen"
+msgid "Can't create directory %s\n"
+msgstr "Nemohu vytvořit adresář %s\n"
 
-#: todo_gui.c:2223
-msgid "Completed"
-msgstr "Dokončeno"
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s je adresář"
 
-#: todo_gui.c:2231
-msgid "Priority: "
-msgstr "Priorita: "
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "Nemohu zapisovat soubory do adresáře %s\n"
 
-#: todo_gui.c:2251
-msgid "Date Due:"
-msgstr "Termín:"
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Uložit změněný záznam?"
 
-#: todo_gui.c:2313 Expense/expense.c:1862 KeyRing/keyring.c:1689
-msgid "Note"
-msgstr "Poznámka"
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Chcete uložit změny tohoto záznamu?"
 
-#: utils.c:76
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v zobrazí verzi a přepínače při překladu a skončí.\n"
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Uložit nový záznam?"
 
-#: utils.c:78
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d zobrazuje ladicí informace na stdout.\n"
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Chcete tento nový záznam uložit?"
 
-#: utils.c:79
-msgid " -p do not load plugins.\n"
-msgstr " -p nenačítat zásuvné moduly.\n"
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "nekonečná smyčka, přerušuji\n"
+
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
+msgstr "Nenačítám zásuvné moduly.\n"
 
-#: utils.c:80
-msgid " -a ignore missed alarms since the last time this program was run.\n"
-msgstr " -a ignorovat upozornění zmeškaná od posledního spuštění tohoto programu.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
+msgstr ""
+" -a ignorovat upozornění zmeškaná od posledního spuštění tohoto programu.\n"
 
-#: utils.c:81
-msgid " -A ignore all alarms)); past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A ignorovat všechna upozornění)); minulá i budoucí.\n"
 
-#: utils.c:82
-msgid " -i makes jpilot iconify itself upon launch\n"
-msgstr " -i způsobí, že se jpilot po spuštění ikonifikuje\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: utils.c:83
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " Proměnné prostředí PILOPORT a PILOTRATE se používají pro určení\n"
 
-#: utils.c:84
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " na kterém portu a jakou rychlostí synchronizovat.\n"
 
-#: utils.c:85
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " Pokud PILOTPORT není nastaven, je implicitně /dev/pilot.\n"
 
-#: utils.c:110
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Chyba při čtení souboru"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Datum překladu"
 
-#: utils.c:111
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Přeložen s těmito přepínači:"
 
-#: utils.c:113
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Instalovaná cesta"
 
-#: utils.c:115
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "verze pilot-link"
 
-#: utils.c:119
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "Podpora USB"
 
-#: utils.c:121 utils.c:127 utils.c:133 utils.c:139 utils.c:145 utils.c:151
-#: utils.c:157
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "ano"
 
-#: utils.c:123 utils.c:129 utils.c:135 utils.c:141 utils.c:147 utils.c:153
-#: utils.c:159
-msgid "no"
-msgstr "ne"
-
-#: utils.c:125
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Podpora soukromých záznamů"
 
-#: utils.c:131
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "ne"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Podpora datebk"
 
-#: utils.c:137
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Podpora zásuvných modulů"
 
-#: utils.c:143
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Podpora Manana"
 
-#: utils.c:149
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "Podpora NLS (cizí jazyky)"
 
-#: utils.c:155
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "Podpora GTK2"
 
-#: utils.c:198
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Dnes je %A, %x %X"
-
-#: utils.c:200
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Dnes je %%A, %s %s"
-
-#: utils.c:1089
-msgid "Today"
-msgstr "Dnešek"
+msgid "Can't get HOME environment variable\n"
+msgstr "Nemohu získat proměnnou prostředí HOME\n"
 
-#: utils.c:1283
-msgid "Save Changed Record?"
-msgstr "Uložit změněný záznam?"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
+msgstr "Vaše proměnná prostředí HOME je na mě moc dlouhá\n"
 
-#: utils.c:1284
-msgid "Do you want to save the changes to this record?"
-msgstr "Chcete uložit změny tohoto záznamu?"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Upravit kategorie"
 
-#: utils.c:1289
-msgid "Save New Record?"
-msgstr "Uložit nový záznam?"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "ID PC je 0\n"
 
-#: utils.c:1290
-msgid "Do you want to save this new record?"
-msgstr "Chcete tento nový záznam uložit?"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Vygeneroval jsem nové ID PC. Je to %lu\n"
 
-#: utils.c:1310 KeyRing/keyring.c:1385
-msgid "Can't get HOME environment variable\n"
-msgstr "Nemohu získat proměnnou prostředí HOME\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: utils.c:1317 KeyRing/keyring.c:1390
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "Vaše proměnná prostředí HOME je na mě moc dlouhá\n"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "Dnes je %A, %x %X"
 
-#: utils.c:1342 utils.c:1346
+#: ../utils.c:3539
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr "Nemohu vytvořit adresář %s\n"
+msgid "Today is %%A, %s %s"
+msgstr "Dnes je %%A, %s %s"
 
-#: utils.c:1352
+#: ../utils.c:3768
 #, c-format
 msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
-"%s zřejmě není adresář.\n"
-"Potřebuji, aby byl.\n"
-
-#: utils.c:1360
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "Nemohu zapisovat soubory do adresáře %s\n"
 
-#: utils.c:1418 utils.c:1427
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "Chyba při zápisu hlavičky PC do souboru: next_id\n"
 
-#: utils.c:1423
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
 msgstr "Chyba při zápisu dalšího id do souboru: next_id\n"
 
-#: utils.c:1440
-msgid "Error opening file: next_id\n"
-msgstr "Chyba při otevírání souboru: next_id\n"
-
-#: utils.c:1608
-#, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Nemohu najít prázdný DB soubor %s: %s\n"
-
-#: utils.c:1611
-msgid " may not be installed.\n"
-msgstr " možná není nainstalován.\n"
-
-#: utils.c:1794
-msgid "Error reading file"
-msgstr "Chyba při čtení souboru"
-
-#: utils.c:2475
-msgid "PC ID is 0.\n"
-msgstr "ID PC je 0\n"
-
-#: utils.c:2476
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Vygeneroval jsem nové ID PC. Je to %lu\n"
-
-#: weekview_gui.c:303
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Pohled na týden"
 
-#: Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Austrálie"
 
-#: Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Rakousko"
 
-#: Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Belgie"
 
-#: Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brazílie"
 
-#: Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Kanada"
 
-#: Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Dánsko"
 
-#: Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (Euro)"
 
-#: Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finsko"
 
-#: Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Francie"
 
-#: Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Německo"
 
-#: Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Island"
 
-#: Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Indie"
 
-#: Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Irsko"
 
-#: Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Itálie"
 
-#: Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Japonsko"
 
-#: Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Korea"
 
-#: Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Lucembursko"
 
-#: Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Malajsie"
 
-#: Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Nizozemsko"
 
-#: Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Nový Zéland"
 
-#: Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Norsko"
 
-#: Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "Čínská lidová republika"
 
-#: Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Filipíny"
 
-#: Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Singapur"
 
-#: Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Španělsko"
 
-#: Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Švýcarsko"
 
-#: Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Tchaj-wan"
 
-#: Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Thajsko"
 
-#: Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Spojené království"
 
-#: Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "Spojené státy"
 
-#: Expense/expense.c:505 Expense/expense.c:516
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Výdaje"
 
-#: Expense/expense.c:537 Expense/expense.c:1410
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Let"
 
-#: Expense/expense.c:539 Expense/expense.c:1411
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Snídaně"
 
-#: Expense/expense.c:541 Expense/expense.c:1412
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Autobus"
 
-#: Expense/expense.c:543 Expense/expense.c:1413
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "ObchodníObědy"
 
-#: Expense/expense.c:545 Expense/expense.c:1414
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "PronájemAuta"
 
-#: Expense/expense.c:547 Expense/expense.c:1415
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Večeře"
 
-#: Expense/expense.c:549 Expense/expense.c:1416
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Zábava"
 
-#: Expense/expense.c:551 Expense/expense.c:1417
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fax"
 
-#: Expense/expense.c:553 Expense/expense.c:1418
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Benzín"
 
-#: Expense/expense.c:555 Expense/expense.c:1419
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Dárky"
 
-#: Expense/expense.c:557 Expense/expense.c:1420
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hotel"
 
-#: Expense/expense.c:559 Expense/expense.c:1421
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "VedlejšíVýdaje"
 
-#: Expense/expense.c:561 Expense/expense.c:1422
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Prádelna"
 
-#: Expense/expense.c:563 Expense/expense.c:1423
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limuzína"
 
-#: Expense/expense.c:565 Expense/expense.c:1424
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Nájem"
 
-#: Expense/expense.c:567 Expense/expense.c:1425
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Oběd"
 
-#: Expense/expense.c:569 Expense/expense.c:1426
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Cestovné"
 
-#: Expense/expense.c:573 Expense/expense.c:1428
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Parkovné"
 
-#: Expense/expense.c:575 Expense/expense.c:1429
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Poštovné"
 
-#: Expense/expense.c:577 Expense/expense.c:1430
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Občerstvení"
 
-#: Expense/expense.c:579 Expense/expense.c:1431
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Metro"
 
-#: Expense/expense.c:581 Expense/expense.c:1432
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Zásoby"
 
-#: Expense/expense.c:583 Expense/expense.c:1433
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taxi"
 
-#: Expense/expense.c:585 Expense/expense.c:1434
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Telefon"
 
-#: Expense/expense.c:587 Expense/expense.c:1435
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Spropitné"
 
-#: Expense/expense.c:589 Expense/expense.c:1436
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Poplatky"
 
-#: Expense/expense.c:591 Expense/expense.c:1437
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Vlak"
 
-#: Expense/expense.c:605
-msgid "AmEx"
-msgstr "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr "Výdaj: Neznámý typ výdaje\n"
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr "Výdaj: Neznámý typ platby\n"
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "American Express"
 
-#: Expense/expense.c:607 Expense/expense.c:1400
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Hotovost"
 
-#: Expense/expense.c:609 Expense/expense.c:1401
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Šek"
 
-#: Expense/expense.c:611
-msgid "CreditCard"
-msgstr "KreditníKarta"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
+msgstr "Kreditní karta"
 
-#: Expense/expense.c:613
-msgid "MasterCard"
-msgstr "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
+msgstr "Master Card"
 
-#: Expense/expense.c:615 Expense/expense.c:1404
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Předplatné"
 
-#: Expense/expense.c:617 Expense/expense.c:1405
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: Expense/expense.c:1210
-msgid "Expense: Unknown category\n"
-msgstr "Výdaj: Neznámá kategorie\n"
-
-#: Expense/expense.c:1216
-msgid "Expense: Unknown expense type\n"
-msgstr "Výdaj: Neznámý typ výdaje\n"
-
-#: Expense/expense.c:1222
-msgid "Expense: Unknown payment type\n"
-msgstr "Výdaj: Neznámý typ platby\n"
-
-#: Expense/expense.c:1399
-msgid "American Express"
-msgstr "American Express"
-
-#: Expense/expense.c:1402
-msgid "Credit Card"
-msgstr "Kreditní karta"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Typ:"
 
-#: Expense/expense.c:1403
-msgid "Master Card"
-msgstr "Master Card"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Částka:"
 
-#: Expense/expense.c:1687
+#. Category Menu
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: Expense/expense.c:1700
+#. Type Menu
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Typ:"
 
-#: Expense/expense.c:1713
+#. Payment Menu
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Platba:"
 
-#: Expense/expense.c:1726
+#. Currency Menu
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Měna:"
 
-#: Expense/expense.c:1739
-msgid "Date:"
-msgstr "Datum:"
-
-#: Expense/expense.c:1756
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Měsíc:"
 
-#: Expense/expense.c:1770
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Den:"
 
-#: Expense/expense.c:1784
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Rok:"
 
-#: Expense/expense.c:1797
+#. Amount Entry
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Částka:"
 
-#: Expense/expense.c:1811
+#. Vendor Entry
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Prodejce:"
 
-#: Expense/expense.c:1825
+#. City
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "Město:"
 
-#: Expense/expense.c:1839
+#. Attendees
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Účastníci"
 
-#: KeyRing/keyring.c:182
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "KeyRing: pack_KeyRing(): buf_size příliš malá\n"
 
-#: KeyRing/keyring.c:501 KeyRing/keyring.c:512
-msgid "KeyRing"
-msgstr "KeyRing"
-
-#: KeyRing/keyring.c:1297
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Neplatné, vložte znovu své heslo KeyRing"
 
-#: KeyRing/keyring.c:1299
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Zadejte NOVÉ heslo KeyRing"
 
-#: KeyRing/keyring.c:1301
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Zadejte své heslo KeyRing"
 
-#: KeyRing/keyring.c:1395
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "KeyRing: soubor %s nenalezen.\n"
 
-#: KeyRing/keyring.c:1396
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "KeyRing: Zkuste synchronizovat.\n"
 
-#: KeyRing/keyring.c:1485
-msgid "Account"
-msgstr "Účet"
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
+msgid "KeyRing"
+msgstr "KeyRing"
+
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
 
-#: KeyRing/keyring.c:1498
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Nemohu exportovat poznámku %d\n"
+
+#. Change Password button
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -2816,22 +3689,270 @@ msgstr ""
 "heslo\n"
 "KeyRing"
 
-#: KeyRing/keyring.c:1662
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "Provést změny"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "Účet"
+
+#. Name entry
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "jméno: "
 
-#: KeyRing/keyring.c:1669
+#. Account entry
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "účet: "
 
-#: KeyRing/keyring.c:1676
+#. Password entry
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "heslo: "
 
-#: KeyRing/keyring.c:1682
+#. Last Changed entry
+#: ../KeyRing/keyring.c:2683
+msgid "last changed: "
+msgstr ""
+
+#. Generate Password button (creates random password)
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Vygenerovat heslo"
 
+#: ../SyncTime/synctime.c:59
+#, fuzzy
+msgid "SyncTime"
+msgstr "Synchronizovat poznámky"
+
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
+msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
+msgstr ""
+
+#: ../SyncTime/synctime.c:105
+msgid "synctime: NOT setting the time on the pilot\n"
+msgstr ""
+
+#: ../SyncTime/synctime.c:110
+msgid "synctime: Setting the time on the pilot... "
+msgstr ""
+
+#: ../SyncTime/synctime.c:115
+#, fuzzy
+msgid "Done\n"
+msgstr "Hotovo"
+
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Přepsat soubor"
+
+#~ msgid "Directory"
+#~ msgstr "Adresář"
+
+#~ msgid "Filename"
+#~ msgstr "Název souboru"
+
+#~ msgid "Field"
+#~ msgstr "Pole"
+
+#~ msgid "kana("
+#~ msgstr "kana("
+
+#~ msgid "Quick View"
+#~ msgstr "Náhled"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Nemohu otevřít soubor %s%s\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Nemohu otevřít soubor %s.alarms\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "Nemůžete upravovat kategorii %s.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "Nemůžete odstranit kategorii %s.\n"
+
+#~ msgid "category name"
+#~ msgstr "název kategorie"
+
+#~ msgid "debug"
+#~ msgstr "ladění"
+
+#~ msgid "Answer: "
+#~ msgstr "Odpověď: "
+
+#~ msgid "none"
+#~ msgstr "nic"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "Neznámý repeatType nalezen v DatebookDB\n"
+
+#~ msgid "W"
+#~ msgstr "T"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Tato akce nemá přiřazen čas."
+
+#~ msgid "Start Time"
+#~ msgstr "Čas začátku"
+
+#~ msgid "End Time"
+#~ msgstr "Čas konce"
+
+#~ msgid "Dismiss"
+#~ msgstr "Zavřít"
+
+#~ msgid "Quit"
+#~ msgstr "Konec"
+
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Close"
+#~ msgstr "Zavřít"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = verze\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = nápověda\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = spustit v ladicím režimu\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = nenačítat zásuvné moduly.\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr " -b = Synchronizovat a zazálohovat, jinak jen synchronizovat.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Neplatné zadání geometrie: \"%s\"\n"
+
+#~ msgid "Help"
+#~ msgstr "Nápověda"
+
+#~ msgid "Sync"
+#~ msgstr "Synchronizovat"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Nápověda/Program PayBack"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "Dialog výběru písma"
+
+#~ msgid "Clear"
+#~ msgstr "Vymazat"
+
+#~ msgid "Show private records"
+#~ msgstr "Zobrazovat soukromé záznamy"
+
+#~ msgid "Hide private records"
+#~ msgstr "Skrýt soukromé záznamy"
+
+#~ msgid "Mask private records"
+#~ msgstr "Maskovat soukromé záznamy"
+
+#~ msgid "Font"
+#~ msgstr "Písmo"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "Jděte do menu \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" a změňte \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Nemohu otevřít soubor záznamů PC\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "První den týdne je "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Sériový port (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "Rychlost přenosu (nemá vliv na USB)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "Synchronizovat memo32 (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "Jeden záznam"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s: stiskněte tlačítko hotsync na kolébce nebo \"kill %d\"\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "Dokončeno\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Poslední jméno uživatele = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Poslední ID uživatele = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Jméno uživatele = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "ID uživatele = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: počet záznamů = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "disk: počet záznamů = %d\n"
+
+#~ msgid " -p do not load plugins.\n"
+#~ msgstr " -p nenačítat zásuvné moduly.\n"
+
+#~ msgid " -i makes jpilot iconify itself upon launch\n"
+#~ msgstr " -i způsobí, že se jpilot po spuštění ikonifikuje\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s zřejmě není adresář.\n"
+#~ "Potřebuji, aby byl.\n"
+
+#~ msgid "AmEx"
+#~ msgstr "AmEx"
+
+#~ msgid "CreditCard"
+#~ msgstr "KreditníKarta"
+
+#~ msgid "MasterCard"
+#~ msgstr "MasterCard"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "Výdaj: Neznámá kategorie\n"
+
 #~ msgid "Backup"
 #~ msgstr "Zálohovat"
 
diff --git a/po/da.po b/po/da.po
index 40ab969f..2be96c24 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,47 +12,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 1.8.0\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2010-04-02 10:31+0200\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2010-04-01 01:01I+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: address.c:276 address.c:448 alarms.c:332 calendar.c:292 calendar.c:533
-#: contact.c:324 contact.c:738 dat.c:189 dat.c:665 dat.c:869 dat.c:1003
-#: dat.c:1142 datebook.c:125 datebook.c:156 datebook.c:163 datebook.c:213
-#: jpilot.c:1207 libplugin.c:209 libplugin.c:456 libplugin.c:535
-#: libplugin.c:564 libplugin.c:812 memo.c:214 memo.c:287 otherconv.c:281
-#: plugins.c:114 prefs.c:345 prefs.c:370 prefs.c:901 sync.c:2124 sync.c:2141
-#: sync.c:2250 sync.c:2264 sync.c:2461 sync.c:2600 sync.c:3392 todo.c:236
-#: todo.c:498 utils.c:745
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Ikke nok hukommelse"
 
-#: address.c:332 calendar.c:230 contact.c:580 datebook.c:471 memo.c:87
-#: todo.c:90
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
 #, fuzzy, c-format
 msgid "%s:%d Error reading application info %s\n"
 msgstr "%s:%d Fejl ved læsning af kategoriinformation %s\n"
 
-#: address.c:344 address_gui.c:2245 address_gui.c:2284 calendar.c:246
-#: contact.c:596 datebook.c:491 datebook_gui.c:3550 libplugin.c:406
-#: libplugin.c:432 memo.c:99 memo_gui.c:844 todo_gui.c:1053
-#: Expense/expense.c:1105
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Fejl ved læsning af fil: %s\n"
 
-#: address.c:492 calendar.c:584 calendar.c:593 contact.c:780 libplugin.c:847
-#: memo.c:353 todo.c:302 utils.c:1108 utils.c:1115 utils.c:1122 utils.c:1129
-#: utils.c:1136 utils.c:1143
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
 msgid "error"
 msgstr "fejl"
 
-#: address_gui.c:333 datebook_gui.c:2712 memo_gui.c:177 todo_gui.c:295
-#: KeyRing/keyring.c:836
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -60,88 +65,100 @@ msgstr ""
 "Denne post er slettet.\n"
 "Gendan den eller kopier den for at foretage ændringer.\n"
 
-#: address_gui.c:460 address_gui.c:466 address_gui.c:477 address_gui.c:489
-#: address_gui.c:501 address_gui.c:514
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
 #, c-format
 msgid "%s%s: %s"
 msgstr "%s%s: %s"
 
-#: address_gui.c:552 category.c:118 category.c:176 category.c:330
-#: category.c:336 datebook_gui.c:432 memo_gui.c:282 sync.c:2083 sync.c:2089
-#: sync.c:2435 sync.c:2796 todo_gui.c:419 utils.c:2647 utils.c:2684
-#: utils.c:2690 utils.c:2749 utils.c:2755 utils.c:2809 utils.c:2863
-#: utils.c:2869 utils.c:2927 utils.c:2934
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Kan ikke åbne filen: %s\n"
 
-#: address_gui.c:723
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Kan ikke åbne filen: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Filen lader ikke til at være i formatet address.dat\n"
 
-#: address_gui.c:733 datebook_gui.c:649 memo_gui.c:326 memo_gui.c:419
-#: todo_gui.c:545 Expense/expense.c:1384
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Ikke gemt"
 
-#: address_gui.c:791 datebook_gui.c:701 memo_gui.c:472 todo_gui.c:598
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
 msgid "CSV (Comma Separated Values)"
 msgstr "CSV (kommaadskilte værdier)"
 
-#: address_gui.c:792
+#: ../address_gui.c:780
 msgid "DAT/ABA (Palm Archive Formats)"
 msgstr "DAT/ABA (Palm Archive-formater)"
 
-#: address_gui.c:881 category.c:408 datebook_gui.c:732 jpilot.c:230
-#: jpilot.c:274 jpilot.c:342 jpilot.c:386 jpilot.c:909 memo_gui.c:510
-#: todo_gui.c:638 utils.c:1289 KeyRing/keyring.c:2111
+#. current category name
+#. previous category name
+#. entry text, in Pilot character set
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "O.k."
 
-#: address_gui.c:882 address_gui.c:1020 datebook_gui.c:362 datebook_gui.c:390
-#: datebook_gui.c:733 memo_gui.c:511 memo_gui.c:614 todo_gui.c:639
-#: todo_gui.c:758 todo_gui.c:766 utils.c:1306 utils.c:1330
-#: KeyRing/keyring.c:2112
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Nej"
 
-#: address_gui.c:882 address_gui.c:1020 datebook_gui.c:362 datebook_gui.c:390
-#: datebook_gui.c:733 memo_gui.c:511 memo_gui.c:614 todo_gui.c:639
-#: todo_gui.c:758 todo_gui.c:766 utils.c:1306 utils.c:1330
-#: KeyRing/keyring.c:2112
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Ja"
 
-#: address_gui.c:901 datebook_gui.c:756 memo_gui.c:524 todo_gui.c:657
-#: KeyRing/keyring.c:2125
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s er en mappe"
 
-#: address_gui.c:903 address_gui.c:920 datebook_gui.c:758 datebook_gui.c:775
-#: memo_gui.c:526 memo_gui.c:543 todo_gui.c:659 todo_gui.c:676
-#: KeyRing/keyring.c:2127 KeyRing/keyring.c:2144
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Fejl ved åbning af fil"
 
-#: address_gui.c:907 datebook_gui.c:762 memo_gui.c:530 todo_gui.c:663
-#: KeyRing/keyring.c:2131
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Ønsker du at overskrive filen %s?"
 
-#: address_gui.c:909 datebook_gui.c:764 memo_gui.c:532 todo_gui.c:665
-#: KeyRing/keyring.c:2133
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Overskriv fil?"
 
-#: address_gui.c:918 datebook_gui.c:773 memo_gui.c:541 todo_gui.c:674
-#: KeyRing/keyring.c:2142
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Fejl ved åbning af fil: %s"
 
-#: address_gui.c:935
+#: ../address_gui.c:920
 #, c-format
 msgid ""
 "Address exported from %s %s on %s\n"
@@ -150,7 +167,7 @@ msgstr ""
 "Adresse eksporteret fra %s %s den %s\n"
 "\n"
 
-#: address_gui.c:938
+#: ../address_gui.c:923
 #, c-format
 msgid ""
 "Contact exported from %s %s on %s\n"
@@ -159,7 +176,7 @@ msgstr ""
 "Kontakt eksporteret fra %s %s den %s\n"
 "\n"
 
-#: address_gui.c:998
+#: ../address_gui.c:998
 msgid ""
 "Host character encoding is not UTF-8 based.\n"
 " Exported ldif file may not be standards-compliant\n"
@@ -167,100 +184,119 @@ msgstr ""
 "Værttegnskodning er ikke baseret på UTF-8.\n"
 " Eksporteret ldif-fil er måske ikke forenelig med standard\n"
 
-#: address_gui.c:1011
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Kan ikke eksportere adresse %d\n"
 
-#: address_gui.c:1017 memo_gui.c:611 todo_gui.c:754
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
 #, c-format
 msgid "Category: %s\n"
 msgstr "Kategori: %s\n"
 
-#: address_gui.c:1019 memo_gui.c:613 todo_gui.c:757
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
 #, c-format
 msgid "Private: %s\n"
 msgstr "Privat: %s\n"
 
-#: address_gui.c:1028 address_gui.c:1042 address_gui.c:1046 address_gui.c:1055
-#: address_gui.c:1058
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: address_gui.c:1032
+#: ../address_gui.c:1031
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: address_gui.c:1204 address_gui.c:2798 address_gui.c:4020
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
 msgid "E-mail"
 msgstr "E-post"
 
-#: address_gui.c:1446 datebook_gui.c:1141 memo_gui.c:621 todo_gui.c:827
-#: KeyRing/keyring.c:2200
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Ukendt eksporttype\n"
 
-#: address_gui.c:1472 datebook_gui.c:1220 memo_gui.c:471 memo_gui.c:647
-#: todo_gui.c:853 KeyRing/keyring.c:2215
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
 msgid "Text"
 msgstr "Tekst"
 
-#: address_gui.c:1473 datebook_gui.c:1221 memo_gui.c:648 todo_gui.c:854
-#: KeyRing/keyring.c:2215
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
 msgid "CSV"
 msgstr "CSV"
 
-#: address_gui.c:1474
+#: ../address_gui.c:1562
 msgid "vCard"
 msgstr "vCard"
 
-#: address_gui.c:1475
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
 msgid "ldif"
 msgstr "ldif"
 
-#: address_gui.c:1741 address_gui.c:3751
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
 msgid "Last Name/Company"
 msgstr "Efternavn/firma"
 
-#: address_gui.c:1744 address_gui.c:3754
+#: ../address_gui.c:1834 ../address_gui.c:3956
 msgid "First Name/Company"
 msgstr "Fornavn/firma"
 
-#: address_gui.c:1747 address_gui.c:3757
+#: ../address_gui.c:1837 ../address_gui.c:3959
 msgid "Company/Last Name"
 msgstr "Firma/efternavn"
 
-#: address_gui.c:1884 datebook_gui.c:2776 memo_gui.c:1017 todo_gui.c:1312
-#: KeyRing/keyring.c:1183
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Du kan ikke ændre en post som er slettet\n"
 
-#: address_gui.c:2082 address_gui.c:2330 address_gui.c:2761 address_gui.c:3456
-#: datebook_gui.c:1929 datebook_gui.c:3589 memo_gui.c:881 memo_gui.c:927
-#: memo_gui.c:1140 memo_gui.c:1430 todo_gui.c:1089 todo_gui.c:1183
-#: todo_gui.c:1566 todo_gui.c:2022 Expense/expense.c:689
-#: Expense/expense.c:1143 Expense/expense.c:1227 Expense/expense.c:1884
-#: KeyRing/keyring.c:1072 KeyRing/keyring.c:1515 KeyRing/keyring.c:1577
-#: KeyRing/keyring.c:2672
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Kategori er ikke lovlig\n"
 
-#: address_gui.c:2142 alarms.c:598 dialer.c:165
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "udfører kommando = [%s]\n"
 
-#: address_gui.c:2384
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: address_gui.c:2475
+#: ../address_gui.c:2575
 msgid "External program not found, or other error"
 msgstr "Eksternt program ikke fundet, eller en anden fejl"
 
-#: address_gui.c:2477
+#: ../address_gui.c:2577
 msgid ""
 "J-Pilot can not find the external program \"convert\"\n"
 "or an error occurred while executing convert.\n"
@@ -270,260 +306,316 @@ msgstr ""
 "eller en fejl opstod under kørsel af convert.\n"
 "Du skal måske installere pakken imageMagick"
 
-#: address_gui.c:2478
+#: ../address_gui.c:2578
 #, c-format
 msgid "Command executed was \"%s\"\n"
 msgstr "Kommando udført var »%s«\n"
 
-#: address_gui.c:2479
+#: ../address_gui.c:2579
 #, c-format
 msgid "return code was %d\n"
 msgstr "returkode var %d\n"
 
-#: address_gui.c:2558
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "låsning mislykkedes.\n"
+
+#: ../address_gui.c:2660
 msgid "Add Photo"
 msgstr "Tilføj billede"
 
-#: address_gui.c:2780 KeyRing/keyring.c:2569
+#. Category menu
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Kategori: "
 
-#: address_gui.c:2800 address_gui.c:4021
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Post"
 
-#: address_gui.c:2803 address_gui.c:4024 dialer.c:308 dialer.c:332
+#. Dial Phone Button
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Ring"
 
-#: address_gui.c:3123 address_gui.c:3154
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Navnløs-"
 
-#: address_gui.c:3229 memo_gui.c:1336 todo_gui.c:1900
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 poster"
 
-#: address_gui.c:3232 datebook_gui.c:2594 memo_gui.c:1339 todo_gui.c:1903
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d af %d poster"
 
-#: address_gui.c:3625 address_gui.c:3633 KeyRing/keyring.c:2482
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
 msgid "Name"
 msgstr "Navn"
 
-#: address_gui.c:3626 address_gui.c:3627 address_gui.c:3628 address_gui.c:3634
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
 msgid "Address"
 msgstr "Adresse"
 
-#: address_gui.c:3629 address_gui.c:3635 Expense/expense.c:584
-#: Expense/expense.c:1405
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
 msgid "Other"
 msgstr "Andre oplysninger"
 
-#: address_gui.c:3630 address_gui.c:3636 todo_gui.c:2355
-#: Expense/expense.c:1833 KeyRing/keyring.c:2616
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
 msgid "Note"
 msgstr "Notat"
 
-#: address_gui.c:3648
+#: ../address_gui.c:3844
 msgid "Reverting to Address database\n"
 msgstr "Forkaster til adressedatabase\n"
 
-#: address_gui.c:3763
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefon"
 
-#: address_gui.c:3795
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Hurtig søgning: "
 
-#: address_gui.c:3812 category.c:409 datebook_gui.c:1774 datebook_gui.c:4816
-#: memo_gui.c:1572 todo_gui.c:2219 utils.c:1330 KeyRing/keyring.c:2512
+#. Cancel button
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Annuller"
 
-#: address_gui.c:3812 datebook_gui.c:4816 memo_gui.c:1572 todo_gui.c:2219
-#: KeyRing/keyring.c:2512
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "Afbryd ændringerne"
 
-#: address_gui.c:3817 category.c:409 category.c:852 datebook_gui.c:4821
-#: memo_gui.c:1577 todo_gui.c:2224 Expense/expense.c:1660
-#: KeyRing/keyring.c:2517
+#. Delete Button
+#. Delete button
+#. Delete Button
+#. Delete button
+#. Delete, Copy, New, etc. buttons
+#. Delete button
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Slet"
 
-#: address_gui.c:3817 datebook_gui.c:4821 memo_gui.c:1577 todo_gui.c:2224
-#: Expense/expense.c:1660 KeyRing/keyring.c:2517
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Slet den valgte post"
 
-#: address_gui.c:3823 datebook_gui.c:4827 memo_gui.c:1583 todo_gui.c:2230
-#: KeyRing/keyring.c:2523
+#. Undelete Button
+#. Undelete button
+#. Undelete Button
+#. Undelete button
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Fortryd sletning"
 
-#: address_gui.c:3823 datebook_gui.c:4827 memo_gui.c:1583 todo_gui.c:2230
-#: KeyRing/keyring.c:2523
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Fortryd sletning af den valgte post"
 
-#: address_gui.c:3829 datebook_gui.c:4833 memo_gui.c:1589 todo_gui.c:2236
-#: Expense/expense.c:1665 KeyRing/keyring.c:2529
+#. Copy button
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Kopier"
 
-#: address_gui.c:3829 datebook_gui.c:4833 memo_gui.c:1589 todo_gui.c:2236
-#: Expense/expense.c:1665 KeyRing/keyring.c:2529
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Kopier den valgte post"
 
-#: address_gui.c:3835 datebook_gui.c:4839 memo_gui.c:1595 todo_gui.c:2242
-#: Expense/expense.c:1670 KeyRing/keyring.c:2535
+#. New button
+#. New Record button
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Ny post"
 
-#: address_gui.c:3835 datebook_gui.c:4839 memo_gui.c:1595 todo_gui.c:2242
-#: Expense/expense.c:1670 KeyRing/keyring.c:2535
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Tilføj en ny post"
 
-#: address_gui.c:3840 datebook_gui.c:4845 memo_gui.c:1601 todo_gui.c:2248
-#: Expense/expense.c:1675 KeyRing/keyring.c:2541
+#. "Add Record" button
+#. Add Record button
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Tilføj post"
 
-#: address_gui.c:3840 datebook_gui.c:4845 memo_gui.c:1601 todo_gui.c:2248
-#: Expense/expense.c:1675 KeyRing/keyring.c:2541
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Tilføj den nye post"
 
-#: address_gui.c:3850 datebook_gui.c:4855 memo_gui.c:1611 todo_gui.c:2258
-#: Expense/expense.c:1684 KeyRing/keyring.c:2550
+#. "Apply Changes" button
+#. Apply Changes button
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Udfør ændringer"
 
-#: address_gui.c:3850 datebook_gui.c:4855 memo_gui.c:1611 todo_gui.c:2258
-#: Expense/expense.c:1684 KeyRing/keyring.c:2550
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "Indsend ændringerne"
 
-#: address_gui.c:3867 datebook_gui.c:4879 datebook_gui.c:4921 memo_gui.c:1628
-#: todo_gui.c:2280
+#. Private check box
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privat"
 
-#: address_gui.c:3955
+#: ../address_gui.c:4169
 msgid "Change Photo"
 msgstr "Ændr billede"
 
-#: address_gui.c:3960
+#: ../address_gui.c:4174
 msgid "Remove Photo"
 msgstr "Fjern billede"
 
-#: address_gui.c:4030
+#: ../address_gui.c:4246
 msgid "Show In List"
 msgstr "Vis i liste"
 
-#: address_gui.c:4131
+#: ../address_gui.c:4347
 msgid "Reminder"
 msgstr "Påmindelse"
 
-#: address_gui.c:4147 datebook_gui.c:238 datebook_gui.c:4909
-#: datebook_gui.c:5066
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
 msgid "Days"
 msgstr "Dage"
 
-#: address_gui.c:4182 datebook_gui.c:1472 datebook_gui.c:1774 utils.c:2501
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
 msgid "All"
 msgstr "Alt"
 
-#: alarms.c:232 datebook_gui.c:236 datebook_gui.c:4903 datebook_gui.c:5060
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minutter"
 
-#: alarms.c:234 datebook_gui.c:237 datebook_gui.c:4907 datebook_gui.c:5064
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Timer"
 
-#: alarms.c:255
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Påmindelse"
 
-#: alarms.c:425 alarms.c:992 sync.c:1599 sync.c:1605 utils.c:3663
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
 msgid "Unable to open file: %s%s\n"
 msgstr "Kan ikke åbne filen: %s%s\n"
 
-#: alarms.c:512
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Påmindelse om aftale"
 
-#: alarms.c:515
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Tidligere aftale"
 
-#: alarms.c:518
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Udsat aftale"
 
-#: alarms.c:521 datebook_gui.c:4718
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Aftale"
 
-#: alarms.c:605
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "J-Pilot-alarm"
 
-#: category.c:131 category.c:188 sync.c:2112 sync.c:2449
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "Er pc-filen beskadiget?\n"
 
-#: category.c:138 category.c:148 category.c:196 category.c:206 category.c:216
-#: sync.c:2234 sync.c:2288 sync.c:2325 sync.c:2340 sync.c:2364 sync.c:2584
-#: sync.c:2629 sync.c:2666 sync.c:2679 sync.c:2704
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek mislykkedes - alvorlig fejl\n"
 
-#: category.c:364 utils.c:2711 utils.c:2785 utils.c:2889 utils.c:2954
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
 msgid "rename failed"
 msgstr "omdøbning mislykkedes"
 
-#: category.c:409
+#: ../category.c:407
 msgid "Move"
 msgstr "Flyt"
 
-#: category.c:438 category.c:500 category.c:580 category.c:769
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
 msgid "Edit Categories"
 msgstr "Rediger kategorier"
 
-#: category.c:439
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Det maksimale antal kategorier (16) er alleree brugt"
 
-#: category.c:442
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Indtast ny kategori"
 
-#: category.c:453 category.c:477
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr "Rediger kategorifejl"
 
-#: category.c:454
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Du skal vælge en kategori der skal omdøbes"
 
-#: category.c:463
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "Indtast nyt kategorinavn"
 
-#: category.c:478
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Du skal vælge en kategori til sletning"
 
-#: category.c:496
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
@@ -532,95 +624,96 @@ msgstr ""
 "Der er %d poster i %s.\n"
 "Ønsker du at flytte dem til %s, eller slette dem?"
 
-#: category.c:556
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "ugyldig state-fil %s linje %d\n"
 
-#: category.c:578
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "Kategorien %s kan ikke bruges mere end en gang"
 
-#: category.c:735
+#. Category names in host character set
+#: ../category.c:733
 msgid "Category"
 msgstr "Kategori"
 
-#: category.c:836
+#: ../category.c:834
 msgid "New"
 msgstr "Ny"
 
-#: category.c:843
+#: ../category.c:841
 msgid "Rename"
 msgstr "Omdøb"
 
-#: dat.c:466
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "ukendt type ="
 
-#: dat.c:547
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "felter per rækkeoptælling != %d, ukendt format\n"
 
-#: dat.c:561
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "feltoptælling != %d, ukendt format\n"
 
-#: dat.c:569
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Ukendt format, fil har forkert skema\n"
 
-#: dat.c:570
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Filskema er:"
 
-#: dat.c:574
+#: ../dat.c:640
 msgid "It should be:"
 msgstr "Det bør være:"
 
-#: dat.c:684 dat.c:702 dat.c:886 dat.c:899 dat.c:1022 dat.c:1035 dat.c:1159
-#: dat.c:1172
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr "%s:%d post %d, felt %d: ugyldig type. Forventede %d, fandt %d\n"
 
-#: dat.c:685 dat.c:703 dat.c:887 dat.c:900 dat.c:1004 dat.c:1023 dat.c:1036
-#: dat.c:1160 dat.c:1173
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "læsning af fil afsluttet\n"
 
-#: datebook.c:682 datebook_gui.c:3460
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "Ukendt gentagelsestype (%d) fundet i DatebookDB\n"
 
-#: datebook_gui.c:241
+#: ../datebook_gui.c:239
 msgid "Repeat Never"
 msgstr "Gentag aldrig"
 
-#: datebook_gui.c:242
+#: ../datebook_gui.c:240
 msgid "Repeat Daily"
 msgstr "Gentag dagligt"
 
-#: datebook_gui.c:243
+#: ../datebook_gui.c:241
 msgid "Repeat Weekly"
 msgstr "Gentag ugeligt"
 
-#: datebook_gui.c:244
+#: ../datebook_gui.c:242
 msgid "Repeat MonthlyByDay"
 msgstr "Gentag månedligt per dag"
 
-#: datebook_gui.c:245
+#: ../datebook_gui.c:243
 msgid "Repeat MonthlyByDate"
 msgstr "Gentag månedligt per dato"
 
-#: datebook_gui.c:246
+#: ../datebook_gui.c:244
 msgid "Repeat YearlyDate"
 msgstr "Gentag årligt per dato"
 
-#: datebook_gui.c:247
+#: ../datebook_gui.c:245
 msgid "Repeat YearlyDay"
 msgstr "Gentag årligt per dag"
 
@@ -628,36 +721,36 @@ msgstr "Gentag årligt per dag"
 # the little buttons in the repeat weekly window.
 # They should be one letter if possible.  The English ones get truncated to
 # one letter.
-#: datebook_gui.c:250 datebook_gui.c:257 datebook_gui.c:4522
-#: datebook_gui.c:4529
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "sø"
 
-#: datebook_gui.c:251 datebook_gui.c:4523
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "ma"
 
-#: datebook_gui.c:252 datebook_gui.c:4524
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "ti"
 
-#: datebook_gui.c:253 datebook_gui.c:4525
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "on"
 
-#: datebook_gui.c:254 datebook_gui.c:4526
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "to"
 
-#: datebook_gui.c:255 datebook_gui.c:4527
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "fr"
 
-#: datebook_gui.c:256 datebook_gui.c:4528
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "lø"
 
-#: datebook_gui.c:269
+#: ../datebook_gui.c:267
 #, c-format
 msgid ""
 "Start Date: %s\n"
@@ -666,7 +759,7 @@ msgstr ""
 "Startdato: %s\n"
 "Tidspunkt: Begivenhed"
 
-#: datebook_gui.c:277
+#: ../datebook_gui.c:275
 #, c-format
 msgid ""
 "Start Date: %s\n"
@@ -675,38 +768,39 @@ msgstr ""
 "Startdato: %s\n"
 "Tidspunkt: %s til %s"
 
-#: datebook_gui.c:287 datebook_gui.c:297
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: datebook_gui.c:300
+#. End Date
+#: ../datebook_gui.c:298
 msgid "End Date: "
 msgstr "Slutdato: "
 
-#: datebook_gui.c:302
+#: ../datebook_gui.c:300
 msgid "Never"
 msgstr "Aldrig"
 
-#: datebook_gui.c:308
+#: ../datebook_gui.c:306
 #, c-format
 msgid "Repeat Frequency: %d\n"
 msgstr "Gentag frekvens: %d\n"
 
-#: datebook_gui.c:316
+#: ../datebook_gui.c:314
 #, c-format
 msgid "Monthly Repeat Day %d\n"
 msgstr "Månedlig gentagelsesdag %d\n"
 
-#: datebook_gui.c:321 datebook_gui.c:5208
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
 msgid "Repeat on Days:"
 msgstr "Gentag på følgende dage:"
 
-#: datebook_gui.c:332
+#: ../datebook_gui.c:330
 #, c-format
 msgid "Number of exceptions: %d"
 msgstr "Antal undtagelser: %d"
 
-#: datebook_gui.c:338
+#: ../datebook_gui.c:336
 msgid ""
 "\n"
 "more..."
@@ -714,49 +808,49 @@ msgstr ""
 "\n"
 "flere..."
 
-#: datebook_gui.c:359 datebook_gui.c:386
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: datebook_gui.c:360 datebook_gui.c:387
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
 msgid "Note:"
 msgstr "Note:"
 
-#: datebook_gui.c:362 datebook_gui.c:390
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
 msgid "Alarm:"
 msgstr "Alarm:"
 
-#: datebook_gui.c:363 datebook_gui.c:391
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
 msgid "Repeat Type:"
 msgstr "Gentag type:"
 
-#: datebook_gui.c:366 datebook_gui.c:394
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
 msgid "Start of Week:"
 msgstr "Start på ugen:"
 
-#: datebook_gui.c:388 datebook_gui.c:5031
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
 msgid "Location:"
 msgstr "Sted:"
 
-#: datebook_gui.c:622 datebook_gui.c:2248
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Beskrivelsestekst for aftale > %d, forkorter til %d\n"
 
-#: datebook_gui.c:633 datebook_gui.c:1142 datebook_gui.c:2308
-#: datebook_gui.c:2315
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Fejl"
 
-#: datebook_gui.c:634
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Filen lader ikke til at være i formatet datebook.dat\n"
 
-#: datebook_gui.c:702
+#: ../datebook_gui.c:699
 msgid "DAT/DBA (Palm Archive Formats)"
 msgstr "DAT/DBA (Palmarkivformater)"
 
-#: datebook_gui.c:790
+#: ../datebook_gui.c:787
 #, c-format
 msgid ""
 "Datebook exported from %s %s on %s\n"
@@ -765,7 +859,7 @@ msgstr ""
 "Aftalebog eksporteret fra %s %s den %s\n"
 "\n"
 
-#: datebook_gui.c:793
+#: ../datebook_gui.c:790
 #, c-format
 msgid ""
 "Calendar exported from %s %s on %s\n"
@@ -774,7 +868,7 @@ msgstr ""
 "Kalender eksporteret fra %s %s den %s\n"
 "\n"
 
-#: datebook_gui.c:820
+#: ../datebook_gui.c:817 ../todo_gui.c:701
 msgid ""
 "Host character encoding is not UTF-8 based.\n"
 " Exported ical file may not be standards-compliant\n"
@@ -782,83 +876,87 @@ msgstr ""
 "Værtstegnsæt er ikke baseret på UTF-8.\n"
 " Eksporteret ical-fil er måske ikke forenelig med standard\n"
 
-#: datebook_gui.c:1142
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "Ukendt eksporttype"
 
-#: datebook_gui.c:1222 todo_gui.c:855
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
 msgid "iCalendar"
 msgstr "iKalender"
 
-#: datebook_gui.c:1234 export_gui.c:252 jpilot.c:419
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Eksporter"
 
-#: datebook_gui.c:1251
+#. Label for instructions
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Eksporter alle aftalebogsposter"
 
-#: datebook_gui.c:1270 export_gui.c:317
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Gem som"
 
-#: datebook_gui.c:1280 export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Gennemse"
 
-#: datebook_gui.c:1426
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Kategorier for aftalebog"
 
-#: datebook_gui.c:1478 datebook_gui.c:2015 datebook_gui.c:5137
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Ingen"
 
-#: datebook_gui.c:1627
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Startdato"
 
-#: datebook_gui.c:1633
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Slutdato"
 
-#: datebook_gui.c:1743 prefs.c:446
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "søndag"
 
-#: datebook_gui.c:1744 prefs.c:447
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "mandag"
 
-#: datebook_gui.c:1745
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "tirsdag"
 
-#: datebook_gui.c:1746
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: datebook_gui.c:1747
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "torsdag"
 
-#: datebook_gui.c:1748
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "fredag"
 
-#: datebook_gui.c:1749
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "lørdag"
 
-#: datebook_gui.c:1752
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "Fjerde"
 
-#: datebook_gui.c:1752
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Sidste"
 
-#: datebook_gui.c:1755
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -873,49 +971,54 @@ msgstr ""
 "%s af måneden.\n"
 "Hvilken ønsker du?"
 
-#: datebook_gui.c:1762 datebook_gui.c:1778
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "Spørgsmål?"
 
-#: datebook_gui.c:1769
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Denne hændelse gentages.\n"
 "Skal ændringerne kun gælde\n"
 "den aktuelle hændelse eller\n"
 "for alle gentagelserne?"
 
-#: datebook_gui.c:1774
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Aktuelle"
 
-#: datebook_gui.c:2016
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
+
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "dag"
 
-#: datebook_gui.c:2017
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "uge"
 
-#: datebook_gui.c:2018
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "måned"
 
-#: datebook_gui.c:2019
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "år"
 
-#: datebook_gui.c:2303 datebook_gui.c:2306
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Du kan ikke have en aftale som gentages hver %d %s\n"
 
-#: datebook_gui.c:2316
+#: ../datebook_gui.c:2339
 msgid ""
 "You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
@@ -923,15 +1026,20 @@ msgstr ""
 "Du kan ikke have en aftale med ugentlig gentagelse som ikke gentages på en "
 "bestemt ugedag."
 
-#: datebook_gui.c:2481 datebook_gui.c:4952
+#. This is a timeless event
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Intet tidspunkt"
 
-#: datebook_gui.c:2812
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Ugyldig aftale"
 
-#: datebook_gui.c:2813
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -939,90 +1047,93 @@ msgstr ""
 "Slutdato på denne aftale\n"
 "er før startdatoen."
 
-#: datebook_gui.c:3157 datebook_gui.c:5170 datebook_gui.c:5201
-#: datebook_gui.c:5254 datebook_gui.c:5302 todo_gui.c:145 todo_gui.c:2323
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Ingen dato"
 
-#: datebook_gui.c:3306
+#: ../datebook_gui.c:3491
 #, c-format
 msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "Fejl i DateBookDB eller kalenderens advanceUnits = %d\n"
 
-#: datebook_gui.c:3493
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a., %s"
 
-#: datebook_gui.c:3498
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (I DAG)"
 
-#: datebook_gui.c:4626 datebook_gui.c:5139
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Uge"
 
-#: datebook_gui.c:4633
-msgid "W"
-msgstr "U"
-
-#: datebook_gui.c:4635
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "Vis aftaler denne uge"
 
-#: datebook_gui.c:4638 datebook_gui.c:5140
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Måned"
 
-#: datebook_gui.c:4646
-msgid "M"
-msgstr "M"
-
-#: datebook_gui.c:4648
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "Vis aftaler per måned"
 
-#: datebook_gui.c:4653
+#. Make Category button
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "kat."
 
-#: datebook_gui.c:4717
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Tid"
 
-#: datebook_gui.c:4760
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Vis huskelister"
 
-#: datebook_gui.c:4774 todo_gui.c:2160
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Opgave"
 
-#: datebook_gui.c:4775 todo_gui.c:2161
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Forfald"
 
-#: datebook_gui.c:4889 datebook_gui.c:5046
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarm"
 
-#: datebook_gui.c:4929 Expense/expense.c:1733
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
 msgid "Date:"
 msgstr "Dato:"
 
-#: datebook_gui.c:4971
+#. Start date and time
+#: ../datebook_gui.c:5280
 msgid "Start"
 msgstr "Start"
 
-#: datebook_gui.c:4988
+#. End date and time
+#: ../datebook_gui.c:5297
 msgid "End"
 msgstr "Slut"
 
-#: datebook_gui.c:5121
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "DateBk-mærker"
 
-#: datebook_gui.c:5138
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "dag"
 
@@ -1030,152 +1141,160 @@ msgstr "dag"
 # msgstr "Pr. uge"
 # msgid "MonthView"
 # msgstr "Pr. mnd"
-#: datebook_gui.c:5141
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "år"
 
-#: datebook_gui.c:5144
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Denne aftale skal ikke gentages"
 
-#: datebook_gui.c:5153 datebook_gui.c:5186 datebook_gui.c:5239
-#: datebook_gui.c:5285
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Forekomst hver"
 
-#: datebook_gui.c:5159
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "dage"
 
-#: datebook_gui.c:5162 datebook_gui.c:5195 datebook_gui.c:5248
-#: datebook_gui.c:5294
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Slut-dato"
 
-#: datebook_gui.c:5192
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "uger"
 
-#: datebook_gui.c:5245
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "måneder"
 
-#: datebook_gui.c:5262
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Gentag på:"
 
-#: datebook_gui.c:5266
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "ugedag"
 
-#: datebook_gui.c:5275 Expense/expense.c:1615
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "dato"
 
-#: datebook_gui.c:5291
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "år"
 
-#: dialer.c:196
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Telefonopkaldsprogram"
 
-#: dialer.c:231
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Præfiks 1"
 
-#: dialer.c:253
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Præfiks 2"
 
-#: dialer.c:275
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Præfiks 3"
 
-#: dialer.c:290
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Telefonnummer:"
 
-#: dialer.c:320
+#: ../dialer.c:319
 msgid "Extension"
 msgstr "Lokal"
 
-#: dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "Opkaldskommando"
 
-#: export_gui.c:122
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Filbrowser"
 
-#: export_gui.c:274
+#. Label for instructions
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Vælg poster der skal eksporteres"
 
-#: export_gui.c:276
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Brug tasterne Ctrl og Shift"
 
-#: import_gui.c:300 import_gui.c:369 import_gui.c:426 import_gui.c:471
-#: jpilot.c:375
+#. Import button
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importer"
 
-#: import_gui.c:317
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "Indgangen er markeret som privat"
 
-#: import_gui.c:319
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "Indgangen er ikke markeret privat"
 
-#: import_gui.c:328
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "Kategori før import var: [%s]"
 
-#: import_gui.c:336
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Post vil blive placeret i kategori [%s]"
 
-#: import_gui.c:376
+#. Import All button
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Importer alle"
 
-#: import_gui.c:383
+#. Skip button
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Spring over"
 
-#: import_gui.c:457 install_gui.c:303
+#: ../import_gui.c:457 ../install_gui.c:427
 msgid "To change to a hidden directory type it below and hit TAB"
 msgstr ""
 "For at ændre til en skjult mappe skal du angive det nedenunder og trykke TAB"
 
-#: import_gui.c:484
+#: ../import_gui.c:484
 msgid "Import File Type"
 msgstr "Importfil-type"
 
-#: install_gui.c:247
-msgid "Files to be installed"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
 msgstr "Filer som skal installeres"
 
-#: install_gui.c:255
+#: ../install_gui.c:372
 msgid "Install"
 msgstr "Installer"
 
-#: install_user.c:113 install_user.c:215
+#: ../install_user.c:116 ../install_user.c:218
 msgid "Install User"
 msgstr "Installer bruger"
 
-#: install_user.c:134
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 "En enhed af typen PalmOS(c) kræver et brugernavn og et bruger-id for at "
 "kunne synkronisere ordentligt."
 
-#: install_user.c:141
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
@@ -1184,43 +1303,51 @@ msgstr ""
 "have forskellige id og det foretrækkes også, at de har forskellige "
 "brugernavne."
 
-#: install_user.c:163
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr "De fleste folk vælger deres navn eller kælenavn som brugernavn."
 
-#: install_user.c:171 restore_gui.c:277
+#: ../install_user.c:174 ../restore_gui.c:276
 msgid "User Name"
 msgstr "Brugernavn"
 
-#: install_user.c:181
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr "Id'et bør være et tilfældigt nummer."
 
-#: install_user.c:189 restore_gui.c:290
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "Bruger-id"
 
-#: jpilot.c:315
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Udskriv"
 
-#: jpilot.c:316
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Der findes ikke skriverunderstøttelse for dette tillæg."
 
-#: jpilot.c:376
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Der findes ikke understøttelse af importering for dette tillæg."
 
-#: jpilot.c:420
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Der findes ikke understøttelse af eksportering for dette tillæg."
 
-#: jpilot.c:631
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Annuller synkronisering"
+
+#. -------------------------------------------
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
 "This handheld does not have the same user name or user ID\n"
 "as the one that was synced the last time.\n"
-"Syncing could have unwanted effects.\n"
+"Syncing could have unwanted effects including data loss.\n"
 "\n"
 "Read the user manual if you are uncertain."
 msgstr ""
@@ -1230,7 +1357,8 @@ msgstr ""
 "\n"
 "Læs brugermanualen hvis du er usikker."
 
-#: jpilot.c:638
+#. -------------------------------------------
+#: ../jpilot.c:680
 msgid ""
 "This handheld has a NULL user ID.\n"
 "Every handheld must have a unique user ID in order to sync properly.\n"
@@ -1250,215 +1378,225 @@ msgstr ""
 "\n"
 "Læs brugermanualen hvis du er usikker."
 
-#: jpilot.c:646
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Annuller synkronisering"
 
-#: jpilot.c:646
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Synkroniser alligevel"
 
-#: jpilot.c:655 jpilot.c:659
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Synkroniseringsproblem"
 
-#: jpilot.c:888 jpilot.c:1739
+#: ../jpilot.c:932 ../jpilot.c:1787
 msgid " User: "
 msgstr " Bruger: "
 
-#: jpilot.c:900
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "Ukendt kommando fra synkroniseringsproces\n"
 
-#: jpilot.c:919 Expense/expense.c:529 KeyRing/keyring.c:1892
-#: SyncTime/synctime.c:61
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: jpilot.c:1060
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Fil"
 
-#: jpilot.c:1061
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Filer/afriv"
 
-#: jpilot.c:1062
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Filer/_Find"
 
-#: jpilot.c:1063 jpilot.c:1069 jpilot.c:1072
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Filer/sep1"
 
-#: jpilot.c:1064
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Filer/_Installer"
 
-#: jpilot.c:1065
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Filer/Importer"
 
-#: jpilot.c:1066
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Filer/Eksporter"
 
-#: jpilot.c:1067 jpilot.c:2120
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Filer/Indstillinger"
 
-#: jpilot.c:1068
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Filer/_Udskriv"
 
-#: jpilot.c:1070
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Filer/Installer bruger"
 
-#: jpilot.c:1071
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Filer/Genskab håndholdt"
 
-#: jpilot.c:1073
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Filer/_Afslut"
 
-#: jpilot.c:1074
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Vis"
 
-#: jpilot.c:1075 jpilot.c:1076 jpilot.c:1077 jpilot.c:1322
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Vis/Skjul private poster"
 
-#: jpilot.c:1076 jpilot.c:1325
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Vis/Vis private poster"
 
-#: jpilot.c:1077 jpilot.c:1328
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Vis/Masker private poster"
 
-#: jpilot.c:1078
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Vis/sep1"
 
-#: jpilot.c:1079
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Vis/Aftalebog"
 
-#: jpilot.c:1080
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Vis/Adresser"
 
-#: jpilot.c:1081
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Vis/Huskelister"
 
-#: jpilot.c:1082
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Vis/Notater"
 
-#: jpilot.c:1083 jpilot.c:1212
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Udvidelsesmoduler"
 
-#: jpilot.c:1085
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Internet"
 
-#: jpilot.c:1086
+#. web
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Internet/Netscape"
 
-#: jpilot.c:1090
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Internet/Mozilla"
 
-#: jpilot.c:1095
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Internet/Galeon"
 
-#: jpilot.c:1100
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Internet/Opera"
 
-#: jpilot.c:1104
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Internet/GnomeUrl"
 
-#: jpilot.c:1106
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Internet/Lynx"
 
-#: jpilot.c:1108
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Internet/Henvisninger"
 
-#: jpilot.c:1110
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Internet/W3M"
 
-#: jpilot.c:1112
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Internet/Konqueror"
 
-#: jpilot.c:1115
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: jpilot.c:1116
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/Hjælp/Om J-Pilot"
 
-#: jpilot.c:1180
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Udvidelsesmoduler/%s"
 
-#: jpilot.c:1190
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Hjælp/%s"
 
-#: jpilot.c:1545
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "kalender:uge_start:0"
 
-#: jpilot.c:1588 jpilot-sync.c:170
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "Indlæser ikke udvidelsesmoduler.\n"
 
-#: jpilot.c:1592
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "Ignorerer alle alarmer.\n"
 
-#: jpilot.c:1596
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "Ignorerer tidligere alarmer.\n"
 
-#: jpilot.c:1684 jpilot.c:1692
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "Kan ikke åbne ledning (pipe)\n"
 
-#: jpilot.c:1895
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "Vis private poster     Ctrl-Z"
 
-#: jpilot.c:1900
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "Skjul private poster   Ctrl-Z"
 
-#: jpilot.c:1905
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "Masker private poster  Ctrl-Z"
 
-#: jpilot.c:1916
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Synkroniser din Palm med pc'en  Ctrl-Y"
 
-#: jpilot.c:1930
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Synk adresse"
+
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1466,35 +1604,35 @@ msgstr ""
 "Synkroniser din Palm med pc'en\n"
 "og tag derefter sikkerhedskopi"
 
-#: jpilot.c:2064
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Kalender/Gå til i dag"
 
-#: jpilot.c:2065
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: jpilot.c:2066
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Huskeliste"
 
-#: jpilot.c:2067
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Notater"
 
-#: jpilot.c:2102
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "Gør det nu"
 
-#: jpilot.c:2102
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Påmind mig senere"
 
-#: jpilot.c:2102
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "Sig det ikke igen!"
 
-#: jpilot.c:2115
+#: ../jpilot.c:2187
 #, c-format
 msgid ""
 "J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
@@ -1511,59 +1649,71 @@ msgstr ""
 "\n"
 "Gå til menuen »%s« og ændr »%s«."
 
-#: jpilot.c:2120 prefs_gui.c:505
+#. Character Set
+#: ../jpilot.c:2192 ../prefs_gui.c:509
 msgid "Character Set"
 msgstr "Tegnsæt"
 
-#: jpilot.c:2122
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Vælg en UTF-8-kodning"
 
-#: jpilot-dump.c:88
+#: ../jpilot-dump.c:92
+#, c-format
 msgid " +D +A +T +M format like date +format.\n"
 msgstr " +D +A +T +M format såsom dato +format.\n"
 
-#: jpilot-dump.c:89
-msgid " -v displays version and exits.\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
 msgstr " -v viser version og afslutter.\n"
 
-#: jpilot-dump.c:90 jpilot-sync.c:66 utils.c:1858
-msgid " -h displays help and exits.\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
 msgstr " -h viser hjælp og afslutter.\n"
 
-#: jpilot-dump.c:91
-msgid " -f displays help for format codes.\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
 msgstr " -f viser hjælp til formatkoder.\n"
 
-#: jpilot-dump.c:92
-msgid " -D dump DateBook.\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
 msgstr " - D smid adressebog.\n"
 
-#: jpilot-dump.c:93
-msgid " -i dump DateBook in iCalendar format.\n"
+#: ../jpilot-dump.c:97
+#, fuzzy, c-format
+msgid " -i dump DateBook in iCalendar format\n"
 msgstr " -i smid adressebog i iKalender-format.\n"
 
-#: jpilot-dump.c:94
-msgid " -N dump appts for today in DateBook.\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
 msgstr " -N drop appts for i dag i aftalebog.\n"
 
-#: jpilot-dump.c:95
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr " -NYYYY/MM/DD drop appts pån ÅÅÅÅ/MM/DD i datobog.\n"
 
-#: jpilot-dump.c:96
-msgid " -A dump Address book.\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
 msgstr " -A smid adressebog.\n"
 
-#: jpilot-dump.c:97
-msgid " -T dump ToDo list as CSV.\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
 msgstr " -T smid huskelister som csv.\n"
 
-#: jpilot-dump.c:98
-msgid " -M dump Memos.\n"
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
 msgstr " -M smid memoer.\n"
 
-#: jpilot-dump.c:166
+#: ../jpilot-dump.c:163
 #, c-format
 msgid ""
 "Warning: Host character encoding is not UTF-8 based.\n"
@@ -1572,38 +1722,239 @@ msgstr ""
 "Advarsel: Værttegnskodning er ikke baseret på UTF-8.\n"
 "Eksporteret ical-fil er måske ikke forenelig med standard\n"
 
-#: jpilot-sync.c:64
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "Kan ikke åbne filen: %s\n"
+
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:270
+#, c-format
+msgid "Records added         = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
+
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
+
+#: ../jpilot-merge.c:293
+#, c-format
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
+
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
+
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:296
+#, c-format
 msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
+msgstr ""
+
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
+
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
 msgstr ""
 " J-Pilot-indstillinger er læst for port, hastighed, antal sikkerhedskopier, "
 "etc.\n"
 
-#: jpilot-sync.c:65 utils.c:1857
-msgid " -v displays version and compile options and exits.\n"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
 msgstr " -v viser version og kompileringsindstillinger og afslutter.\n"
 
-#: jpilot-sync.c:67 utils.c:1859
-msgid " -d displays debug info to stdout.\n"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
 msgstr " -d viser fejlsøgningsinfo til stdout.\n"
 
-#: jpilot-sync.c:68
-msgid " -P skips loading plugins.\n"
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
 msgstr " -P springer indlæsning af udvidelsesmoduler over.\n"
 
-#: jpilot-sync.c:69
-msgid " -b sync and then do a backup\n"
+#: ../jpilot-sync.c:69
+#, fuzzy, c-format
+msgid " -b sync, and then do a backup\n"
 msgstr " -b synkroniser og så en sikkerhedskopi\n"
 
-#: jpilot-sync.c:70
-msgid " -l loop, otherwise sync once and exit.\n"
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
 msgstr " -l loop, ellers synkroniser en gang og afslut.\n"
 
-#: jpilot-sync.c:71
-msgid " -p {port} use this port to sync with instead of default.\n"
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
 msgstr " -p {port} brug denne port til synkronisering frem for standard.\n"
 
-#: libplugin.c:65 utils.c:1038
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Fejl ved åbning af fil: %s\n"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr ""
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Fejl"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "HJEMME-miljøvariabel er for lang til at kunne behandles\n"
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, fuzzy, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+"En enhed af typen PalmOS(c) kræver et brugernavn og et bruger-id for at "
+"kunne synkronisere ordentligt."
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
 msgid ""
 "This record is already deleted.\n"
 "It is scheduled to be deleted from the Palm on the next sync.\n"
@@ -1611,80 +1962,80 @@ msgstr ""
 "Denne post er allerede slettet.\n"
 "Den er planlagt til at blive slettet fra Palm'en ved næste synkronisering.\n"
 
-#: libplugin.c:74 libplugin.c:111 utils.c:1048 utils.c:1090
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
 msgid "Unable to open PC records file\n"
 msgstr "Kan ikke åbne pc-postfiler\n"
 
-#: libplugin.c:80 utils.c:1055
+#: ../libplugin.c:77 ../utils.c:1069
 msgid "Couldn't find record to delete\n"
 msgstr "Kunne ikke finde post til sletning\n"
 
-#: libplugin.c:98 utils.c:1075
+#: ../libplugin.c:95 ../utils.c:1089
 #, c-format
 msgid "Unknown header version %d\n"
 msgstr "Ukendt teksthovedversion %d\n"
 
-#: libplugin.c:183
+#: ../libplugin.c:180
 #, c-format
 msgid "%s:%d Error opening file: %s\n"
 msgstr "%s:%d Fejl ved åbning af fil: %s\n"
 
-#: libplugin.c:189 libplugin.c:218 sync.c:1675 todo.c:102
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
 #, c-format
 msgid "%s:%d Error reading file: %s\n"
 msgstr "%s:%d Fejl ved læsning af fil: %s\n"
 
-#: libplugin.c:341 libplugin.c:399 utils.c:2102 utils.c:2115
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
 #, c-format
 msgid "Error opening file: %s\n"
 msgstr "Fejl ved åbning af fil: %s\n"
 
-#: libplugin.c:527
+#: ../libplugin.c:524
 #, c-format
 msgid "Error reading %s 5\n"
 msgstr "Fejl ved læsning af %s 5\n"
 
-#: libplugin.c:802
+#: ../libplugin.c:799
 msgid "Error reading PC file 1\n"
 msgstr "Fejl ved læsning af pc-fil 1\n"
 
-#: libplugin.c:818
+#: ../libplugin.c:815
 msgid "Error reading PC file 2\n"
 msgstr "Fejl ved læsning af pc-fil 2\n"
 
-#: libplugin.c:924
+#: ../libplugin.c:921
 #, c-format
 msgid "Unknown PC header version = %d\n"
 msgstr "Ukendt pc-teksthovedversion = %d\n"
 
-#: log.c:98
+#: ../log.c:98
 #, c-format
 msgid "Unable to open log file, giving up.\n"
 msgstr "Kan ikke åbne logfil, giver op.\n"
 
-#: log.c:108
+#: ../log.c:108
 #, c-format
 msgid "Unable to open log file\n"
 msgstr "Kan ikke åbne logfil\n"
 
-#: memo_gui.c:304
+#: ../memo_gui.c:302
 msgid "Memo text > 65535, truncating\n"
 msgstr "Memotekst > 65535, forkorter\n"
 
-#: memo_gui.c:332
+#: ../memo_gui.c:330
 #, c-format
 msgid "Imported Memo %s\n"
 msgstr "Importeret memo %s\n"
 
-#: memo_gui.c:402
+#: ../memo_gui.c:402
 msgid "File doesn't appear to be memopad.dat format\n"
 msgstr "Filen lader ikke til at være i formatet memopad.dat\n"
 
-#: memo_gui.c:473
+#: ../memo_gui.c:473
 msgid "DAT/MPA (Palm Archive Formats)"
 msgstr "DAT/MPA (Palmarkivformater)"
 
-#: memo_gui.c:558
+#: ../memo_gui.c:558
 #, c-format
 msgid ""
 "Memo exported from %s %s on %s\n"
@@ -1693,7 +2044,7 @@ msgstr ""
 "Notat eksporteret fra %s %s den %s\n"
 "\n"
 
-#: memo_gui.c:561
+#: ../memo_gui.c:561
 #, c-format
 msgid ""
 "Memos exported from %s %s on %s\n"
@@ -1702,22 +2053,22 @@ msgstr ""
 "Notater eksporteret fra %s %s den %s\n"
 "\n"
 
-#: memo_gui.c:582
+#: ../memo_gui.c:597 ../memo_gui.c:679
 #, c-format
 msgid "Can't export memo %d\n"
 msgstr "Kan ikke eksportere memo %d\n"
 
-#: memo_gui.c:609
+#: ../memo_gui.c:641
 #, c-format
 msgid "Memo: %ld\n"
 msgstr "Memo: %ld\n"
 
-#: memo_gui.c:615
+#: ../memo_gui.c:647
 #, c-format
 msgid "----- Start of Memo -----\n"
 msgstr "----- Start på memo -----\n"
 
-#: memo_gui.c:617
+#: ../memo_gui.c:649
 #, c-format
 msgid ""
 "\n"
@@ -1728,92 +2079,104 @@ msgstr ""
 "----- Slut på memo -----\n"
 "\n"
 
-#: monthview_gui.c:435
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
 msgid "Monthly View"
 msgstr "Månedlig visning"
 
-#: otherconv.c:77
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
 #, c-format
 msgid "%s: error exit from g_iconv_close(%s)\n"
 msgstr "%s: Fejlafslutning fra g_iconv_close(%s)\n"
 
-#: otherconv.c:202
+#: ../otherconv.c:199
 #, c-format
 msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
 msgstr "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
 
-#: otherconv.c:204
+#: ../otherconv.c:201
 msgid "last char truncated"
 msgstr "sidste tegn afkortet"
 
-#: otherconv.c:281
+#: ../otherconv.c:278
 #, c-format
 msgid "UTF_to_other: %s\n"
 msgstr "UTF_til_andet: %s\n"
 
-#: otherconv.c:295
+#: ../otherconv.c:292
 #, c-format
 msgid "iconv: unconvertible sequence at place %d in '%s'\n"
 msgstr "iconv: Inkonvertibel sekvens på sted %d i '%s'\n"
 
-#: otherconv.c:299
+#: ../otherconv.c:296
 #, c-format
 msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
 msgstr "iconv: Ufuldstændig UTF-8-sekvens på sted %d i '%s'\n"
 
-#: otherconv.c:302
+#: ../otherconv.c:299
 #, c-format
 msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
 msgstr "iconv: Mellemlager fyldt. Stoppede på sted %d i '%s'\n"
 
-#: otherconv.c:305
+#: ../otherconv.c:302
 #, c-format
 msgid "iconv: unexpected error at place %d in '%s'\n"
 msgstr "iconv: Uventet fejl på sted %d i '%s'\n"
 
-#: password.c:283
+#: ../password.c:281
 msgid "Palm Password"
 msgstr "Adgangskode til Palm"
 
-#: password.c:308
+#: ../password.c:306
 msgid "Incorrect, Reenter PalmOS Password"
 msgstr "Forkert, genindtast adgangskode til PalmOS"
 
-#: password.c:310
+#: ../password.c:308
 msgid "Enter PalmOS Password"
 msgstr "Indtast adgangskode til PalmOS"
 
-#: pidfile.c:67
+#: ../pidfile.c:69
 msgid "removing stale pidfile\n"
 msgstr "fjerner stale pidfile\n"
 
-#: pidfile.c:91
+#: ../pidfile.c:95
 #, c-format
 msgid "create pidfile failed: %s\n"
 msgstr "oprettelse af pidfile mislykkedes: %s\n"
 
-#: pidfile.c:92
+#: ../pidfile.c:96
 msgid "Warning: hotplug syncing disabled.\n"
 msgstr "Advarsel: hotplug synkronisering deaktiveret.\n"
 
-#: plugins.c:92 plugins.c:206 restore_gui.c:133
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
 msgid "infinite loop"
 msgstr "uendeligt loop"
 
-#: plugins.c:219
+#: ../plugins.c:214
 #, c-format
 msgid "While reading %s%s line 1:[%s]\n"
 msgstr "Under læsning af %s%s linje 1:[%s]\n"
 
-#: plugins.c:220
+#: ../plugins.c:215
 msgid "Wrong Version\n"
 msgstr "Forkert version\n"
 
-#: plugins.c:221
+#: ../plugins.c:216
 msgid "Check preferences->conduits\n"
 msgstr "Tjek indstillinger->tillæg\n"
 
-#: plugins.c:277
+#: ../plugins.c:272
 #, c-format
 msgid ""
 "Open failed on plugin [%s]\n"
@@ -1822,22 +2185,22 @@ msgstr ""
 "Åbn mislykkedes på udvidelsesmodul [%s]\n"
 " fejl [%s]\n"
 
-#: plugins.c:294 plugins.c:319
+#: ../plugins.c:289 ../plugins.c:314
 #, c-format
 msgid " plugin is invalid: [%s]\n"
 msgstr " udvidelsesmodul er ugyldigt: [%s]\n"
 
-#: plugins.c:302
+#: ../plugins.c:297
 #, c-format
 msgid "Plugin:[%s]\n"
 msgstr "Udvidelsesmodul:[%s]\n"
 
-#: plugins.c:303
+#: ../plugins.c:298
 #, c-format
 msgid "This plugin is version (%d.%d).\n"
 msgstr "Dette udvidelsesmodul er version (%d.%d).\n"
 
-#: plugins.c:305
+#: ../plugins.c:300
 msgid "It is too old to work with this version of J-Pilot.\n"
 msgstr ""
 "Det er for gammelt til at kunne arbejde med denne version af J-Pilot.\n"
@@ -1846,452 +2209,505 @@ msgstr ""
 # kan ikke lige gennemskue hvorfor alle de her ens er her.
 # ser ud som om at der er taget højde for forskellige sprogs 
 # måde at gøre det på.
-#: prefs.c:415
+#: ../prefs.c:418
 msgid "%B %d, %Y"
 msgstr "%B %d, %Y"
 
 # 24 March 2010
-#: prefs.c:416
+#: ../prefs.c:419
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: prefs.c:417
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr "%d. %B %Y"
 
-#: prefs.c:418
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr "%d %B, %Y"
 
-#: prefs.c:419
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr "%Y. %B. %d"
 
-#: prefs.c:420
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr "%Y %B %d"
 
-#: prefs_gui.c:448
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: prefs_gui.c:479
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Lokale"
 
-#: prefs_gui.c:481
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Opsætning"
 
-#: prefs_gui.c:483
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr "Aftalebog"
 
-#: prefs_gui.c:487
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "Huskeliste"
 
-#: prefs_gui.c:489
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "Notat"
 
-#: prefs_gui.c:491
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Alarm"
 
-#: prefs_gui.c:493
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Tillæg"
 
-#: prefs_gui.c:518
+#. Shortdate
+#: ../prefs_gui.c:522
 msgid "Short date format"
 msgstr "Kort datoformat"
 
-#: prefs_gui.c:531
+#. Longdate
+#: ../prefs_gui.c:535
 msgid "Long date format"
 msgstr "Langt datoformat"
 
-#: prefs_gui.c:544
+#. Time
+#: ../prefs_gui.c:548
 msgid "Time format"
 msgstr "Tidsformat"
 
-#: prefs_gui.c:564
+#. GTK colors file
+#: ../prefs_gui.c:568
 msgid "GTK color theme file"
 msgstr "GTK-farvetemafil"
 
-#: prefs_gui.c:577
-msgid "Serial Port"
-msgstr "Serielport"
+#. Port
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Synkroniseringsproblem"
 
-#: prefs_gui.c:601
+#. Serial Rate
+#: ../prefs_gui.c:605
 msgid "Serial Rate"
 msgstr "Seriel overføringshastighed"
 
-#: prefs_gui.c:614
+#. Number of backups
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Antal kopier som skal arkiveres"
 
-#: prefs_gui.c:632
+#. Show deleted files check box
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Vis slettede poster? (standard: nej)"
 
-#: prefs_gui.c:636
+#. Show modified files check box
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Vis ændrede slettede poster? (standard: nej)"
 
-#: prefs_gui.c:641
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "Spørg om bekræftelse af filinstallation (J-Pilot -> PDA (standard JA)"
 
-#: prefs_gui.c:645
-msgid "Show popup tooltips (default YES)"
+#. Show tooltips check box
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Vis pop op-værktøjsfif (standard JA)"
 
-#: prefs_gui.c:655
+#: ../prefs_gui.c:666
 msgid "Use Datebook database (Palm OS < 5.2.1)"
 msgstr "Brug aftalebogdatabase (Palm OS < 5.2.1)"
 
-#: prefs_gui.c:658
+#: ../prefs_gui.c:669
 msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr "Brug kalenderdatabase (Palm OS > 5.2)"
 
-#: prefs_gui.c:684
+#. Show highlight days check box
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Marker dage med aftaler"
 
-#: prefs_gui.c:689
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
 msgid "Annotate today in day, week, and month views"
 msgstr "Kommenter i dag i dag-, uge- og månedsvisninger"
 
-#: prefs_gui.c:693
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
 msgid "Append years on anniversaries in day, week, and month views"
 msgstr "Tilføj år på årsdage i dag-, uge- og månedsvisninger"
 
-#: prefs_gui.c:699
+#. Show use DateBk check box
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "Brug DateBk-notatmærker"
 
-#: prefs_gui.c:702
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "Understøttelsen af DateBk er deaktiveret i denne udgave"
 
-#: prefs_gui.c:714
+#: ../prefs_gui.c:725
 msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr "Brug adressedatabase (Palm OS < 5.2.1)"
 
-#: prefs_gui.c:717
+#: ../prefs_gui.c:728
 msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr "Brug kontaktdatabase (Palm OS > 5.2)"
 
-#: prefs_gui.c:746
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Postkommando"
 
-#: prefs_gui.c:760
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s bliver erstattet med e-post-adressen"
 
-#: prefs_gui.c:772
+#: ../prefs_gui.c:783
 msgid "Use ToDo database (Palm OS < 5.2.1)"
 msgstr "Brug huskelistedatabase (Palm OS < 5.2.1)"
 
-#: prefs_gui.c:775
+#: ../prefs_gui.c:786
 msgid "Use Task database (Palm OS > 5.2)"
 msgstr "Brug opgavedatabase (Palm OS > 5.2)"
 
-#: prefs_gui.c:802
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Skjul afsluttede huskelister"
 
-#: prefs_gui.c:806
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Skjul huskelister der endnu ikke er forfalden"
 
-#: prefs_gui.c:810
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Færdiggørelsesdato for post"
 
-#: prefs_gui.c:815
+#. Use Manana check box
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Brug Manana-database"
 
-#: prefs_gui.c:823
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "Brug standardantal af dage forfalden"
 
-#: prefs_gui.c:845
+#: ../prefs_gui.c:856
 msgid "Use Memo database (Palm OS < 5.2.1)"
 msgstr "Brug notatdatabase (Palm OS < 5.2.1)"
 
-#: prefs_gui.c:848
+#: ../prefs_gui.c:859
 msgid "Use Memos database (Palm OS > 5.2)"
 msgstr "Brug notatdatabase (Palm OS > 5.2)"
 
-#: prefs_gui.c:851
+#: ../prefs_gui.c:862
 msgid "Use Memo32 database (pedit32)"
 msgstr "Brug notat32-database (pedit32)"
 
-#: prefs_gui.c:888
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
+#. ********************************************************************
+#. Alarms preference tab
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Åbn alarmvinduer for påmindelser om aftaler"
 
-#: prefs_gui.c:892
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Udfør denne kommando"
 
-#: prefs_gui.c:896
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "ADVARSEL: udførelse af vilkårlige skal-kommandoer kan være farligt!!!"
 
-#: prefs_gui.c:904
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Alarm-kommando"
 
-#: prefs_gui.c:917
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t bliver erstattet med alarmtiden"
 
-#: prefs_gui.c:921
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d bliver erstattet med alarmdatoen"
 
-#: prefs_gui.c:926
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D bliver erstattet med alarmbeskrivelsen"
 
-#: prefs_gui.c:930
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%d bliver erstattet med alarmnotatet"
 
-#: prefs_gui.c:934
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (beskrivelseserstatning) er deaktiveret i denne udgave"
 
-#: prefs_gui.c:939
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (noteerstatning) er deaktiveret i denne udgave"
 
-#: prefs_gui.c:949
+#. ********************************************************************
+#. Conduits preference tab
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Synk aftalebog"
 
-#: prefs_gui.c:953
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Synk adresse"
 
-#: prefs_gui.c:957
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Synk huskeliste"
 
-#: prefs_gui.c:961
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Synk notat"
 
-#: prefs_gui.c:966
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Synkroniser Manana"
 
-#: prefs_gui.c:972
+#. Show use Japanese Kana extention check box
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Brug J-OS (ikke japansk PalmOS:WorkPad/CLIE)"
 
-#: prefs_gui.c:985
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "Synkroniserer %s (%s)"
 
-#: print_gui.c:185
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Udskrivningsindstilinger"
 
-#: print_gui.c:198
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Papirstørrelse"
 
-#: print_gui.c:214
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Udskriv dagsplan"
 
-#: print_gui.c:220
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Udskriv ugeplan"
 
-#: print_gui.c:226
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Udskriv månedsplan"
 
-#: print_gui.c:266
+#: ../print_gui.c:264
 msgid "Selected record"
 msgstr "Valgt post"
 
-#: print_gui.c:270
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Alle poster i denne kategori"
 
-#: print_gui.c:274
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Udskriv alle poster"
 
-#: print_gui.c:296
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "En post per side"
 
-#: print_gui.c:312
+#: ../print_gui.c:310
 msgid "Blank lines between each record"
 msgstr "Tomme linjer mellem hver post"
 
-#: print_gui.c:321
+#. Print Command
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Udskriftskommando (f.eks. lpr, eller cat > fil.ps)"
 
-#: restore_gui.c:71 restore_gui.c:228
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Genskab håndholdt"
 
-#: restore_gui.c:176 restore_gui.c:178
+#: ../restore_gui.c:174 ../restore_gui.c:176
 msgid "Unable to convert filename for GTK display\n"
 msgstr "Kunne ikke konvertere filnavn til GTK-visning\n"
 
-#: restore_gui.c:177
-msgid "See console log to find which file will not be restored"
+#: ../restore_gui.c:175
+#, fuzzy
+msgid "See console log to find which file will not be restored\n"
 msgstr "Se konsollog for at se hvilke filer der ikke bliver gendannet"
 
-#: restore_gui.c:179
+#: ../restore_gui.c:177
 #, c-format
 msgid "File %s will not be restored\n"
 msgstr "Fil %s vil ikke blive gendannet\n"
 
-#: restore_gui.c:245
+#. Label for instructions
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Genskab indhold på håndholdt ved:"
 
-#: restore_gui.c:248
+#: ../restore_gui.c:247
 msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1. Vælg de programmer du vil genskabe. Standarden er alle."
 
-#: restore_gui.c:251
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Indtast brugernavn og bruger-id."
 
-#: restore_gui.c:254
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Tryk på knappen O.k."
 
-#: restore_gui.c:257
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Dette vil overskive alle data, som der aktuelt er på den håndholdte."
 
-#: search_gui.c:144
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "aftalebog"
 
-#: search_gui.c:146
+#: ../search_gui.c:144
 msgid "calendar"
 msgstr "kalender"
 
-#: search_gui.c:233
+#: ../search_gui.c:231
 msgid "address"
 msgstr "adresse"
 
-#: search_gui.c:235
+#: ../search_gui.c:233
 msgid "contact"
 msgstr "kontakt"
 
-#: search_gui.c:304
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "huskeliste"
 
-#: search_gui.c:357
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "notat"
 
-#: search_gui.c:414
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "notat"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "modul ?"
 
-#: search_gui.c:494
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Ingen poster fundet"
 
-#: search_gui.c:593
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Søg"
 
-#: search_gui.c:610
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Søg efter: "
 
-#: search_gui.c:619
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Skeln mellem store/små bogstaver"
 
-#: sync.c:110
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "kunne ikke åbne låsningsfil\n"
 
-#: sync.c:123
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "låsning mislykkedes.\n"
 
-#: sync.c:126
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "synkroniseringsfil er låst af pid %d\n"
 
-#: sync.c:161
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "fjernelse af lås mislykkedes\n"
 
-#: sync.c:164
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "synkronisering er låst af pid %d\n"
 
-#: sync.c:400
-msgid "Check your serial port and settings\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
 msgstr "Kontroller serielporten og indstillingerne\n"
 
-#: sync.c:659
+#: ../sync.c:677
 msgid "Unable to read home dir\n"
 msgstr "Kunne ikke læse hjemmemappe\n"
 
-#: sync.c:1065 sync.c:1403
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
 msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
 msgstr "%s (oprettet af '%s') er opdateret, dropper overføring.\n"
 
-#: sync.c:1069 sync.c:1407
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
 msgid "Fetching '%s' (Creator ID '%s')... "
 msgstr "Henter '%s' (oprettet af '%s')... "
 
-#: sync.c:1076 sync.c:1413
+#: ../sync.c:1096 ../sync.c:1433
 #, c-format
 msgid "Failed, unable to create file %s\n"
 msgstr "Fejlede, kunne ikke oprette filen %s\n"
 
-#: sync.c:1080 sync.c:1418
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
 msgid "Failed, unable to back up database %s\n"
 msgstr "Fejlede, kunne ikke sikkerhedskopiere databasen %s\n"
 
-#: sync.c:1084 sync.c:1422 sync.c:1580
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
 msgid "OK\n"
 msgstr "O.k.\n"
 
-#: sync.c:1284
+#: ../sync.c:1304
 #, c-format
 msgid "Skipping %s (Creator ID '%s')\n"
 msgstr "Springer %s over (oprettet af '%s')\n"
 
-#: sync.c:1475
+#: ../sync.c:1498
 #, c-format
 msgid "Installing %s "
 msgstr "Installerer %s "
 
-#: sync.c:1481
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
 msgid ""
 "\n"
@@ -2300,7 +2716,7 @@ msgstr ""
 "\n"
 "Kunne ikke åbne fil: '%s': %s!\n"
 
-#: sync.c:1485
+#: ../sync.c:1508
 #, c-format
 msgid ""
 "\n"
@@ -2309,12 +2725,22 @@ msgstr ""
 "\n"
 "Kunne ikke synkronisere fil: '%s': Fil ødelagt?\n"
 
-#: sync.c:1497
+#: ../sync.c:1524
 #, c-format
 msgid "(Creator ID '%s')... "
 msgstr "(Oprettet af '%s')..."
 
-#: sync.c:1513 sync.c:1526 sync.c:1541 sync.c:1554
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(Oprettet af '%s')..."
+
+#: ../sync.c:1530
+#, fuzzy, c-format
+msgid "(SDcard dir %s)... "
+msgstr "(Oprettet af '%s')..."
+
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
 msgid ""
 "\n"
@@ -2323,110 +2749,112 @@ msgstr ""
 "\n"
 "Kunne ikke åbne fil: %s\n"
 
-#: sync.c:1566
+#: ../sync.c:1615
 #, c-format
 msgid "Install %s failed"
 msgstr "Installering af %s mislykkedes"
 
-#: sync.c:1570
+#: ../sync.c:1619
 msgid "Failed.\n"
 msgstr "Mislykkedes.\n"
 
-#: sync.c:1576
+#: ../sync.c:1625
 #, c-format
 msgid "Installed %s"
 msgstr "%s installeret"
 
-#: sync.c:1680
+#: ../sync.c:1736
 #, c-format
 msgid "%s:%d Error getting app info %s\n"
 msgstr "%s:%d Fejl ved indhentning af appinfo %s\n"
 
-#: sync.c:1686 sync.c:1716
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
 msgid "%s:%d Error unpacking app info %s\n"
 msgstr "%s:%d Fejl ved udpakning af appinfo %s\n"
 
-#: sync.c:1707
+#: ../sync.c:1763
 #, c-format
 msgid "Error reading appinfo block for %s\n"
 msgstr "Fejl ved læsning af appinfo-blok for %s\n"
 
-#: sync.c:1945 sync.c:1949
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
 #, c-format
 msgid "Could not add category %s to remote.\n"
 msgstr "Kunne ikke tilføje kategori %s på ekstern.\n"
 
-#: sync.c:1946 sync.c:1952
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
 msgid "Too many categories on remote.\n"
 msgstr "For mange kategorier på ekstern.\n"
 
-#: sync.c:1947 sync.c:1955
+#: ../sync.c:2003 ../sync.c:2011
 #, c-format
 msgid "All records on desktop in %s will be moved to %s.\n"
 msgstr "Alle poster på skrivebordet i %s vil blive flyttet til %s.\n"
 
-#: sync.c:2050 sync.c:2768
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Synkroniserer %s\n"
 
-#: sync.c:2058 sync.c:2411 sync.c:2776
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Udskrev en %s-post."
 
-#: sync.c:2060 sync.c:2413 sync.c:2778
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Udskrivning af en %s-post mislykkedes."
 
-#: sync.c:2062 sync.c:2415 sync.c:2780
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Sletning af en %s-post mislykkedes."
 
-#: sync.c:2064 sync.c:2417 sync.c:2782
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Slettede en %s-post."
 
-#: sync.c:2066 sync.c:2419
+#: ../sync.c:2122 ../sync.c:2475
 #, c-format
 msgid "Sync Conflict: duplicated an %s record."
 msgstr "Synkroniseringskonflikt: Duplikerede en %s-post."
 
-#: sync.c:2069 sync.c:2422 sync.c:2785
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Udskrev en %s-post."
 
-#: sync.c:2071 sync.c:2424 sync.c:2787
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Udskrivning af en %s-post mislykkedes."
 
-#: sync.c:2073 sync.c:2426 sync.c:2789
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Sletning af en %s-post mislykkedes."
 
-#: sync.c:2075 sync.c:2428 sync.c:2791
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Slettede en %s-post."
 
-#: sync.c:2077 sync.c:2430
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
 msgid "Sync Conflict: duplicated a %s record."
 msgstr "Synkroniseringskonflikt: Duplikerede en %s-post."
 
-#: sync.c:2181 sync.c:2511
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
 msgid "Sync Conflict: a %s record must be manually merged\n"
 msgstr "Synkroniseringskonflikt: En %s-post skal manuelt sammenføjes\n"
 
-#: sync.c:2312 sync.c:2652
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2434,133 +2862,132 @@ msgstr ""
 "dlp_DeleteRecord mislykkedes\n"
 "Det kan være fordi posten allerede var slettet på Palm'en\n"
 
-#: sync.c:2881
+#: ../sync.c:2937
 msgid "Finished installing user information.\n"
 msgstr "Afsluttede installation af brugerinformation.\n"
 
-#: sync.c:3038
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr " Synkroniserer på enhed %s\n"
 
-#: sync.c:3039
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr " Tryk på HotSync-knappen nu\n"
 
-#: sync.c:3081 sync.c:3103 sync.c:3124
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr "Seneste synket brugernavn -->\"%s\"\n"
 
-#: sync.c:3082 sync.c:3104 sync.c:3125
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr "Seneste synket bruger-id -->\"%d\"\n"
 
-#: sync.c:3083 sync.c:3105 sync.c:3126
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr " Dette brugernavn -->\"%s\"\n"
 
-#: sync.c:3084 sync.c:3106 sync.c:3127
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
 msgid " This User ID-->%d\n"
 msgstr " Denne bruger-id-->%d\n"
 
-#: sync.c:3148
+#: ../sync.c:3204
 #, c-format
 msgid "Username is \"%s\"\n"
 msgstr "Brugernavn er \"%s\"\n"
 
-#: sync.c:3149
+#: ../sync.c:3205
 #, c-format
 msgid "User ID is %d\n"
 msgstr "Bruger-id er %d\n"
 
-#: sync.c:3151
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr "Seneste SyncPC = %d\n"
 
-#: sync.c:3152
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr "Denne pc = %lu\n"
 
-#: sync.c:3176
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr "Synkronisering annulleret\n"
 
-#: sync.c:3199
+#: ../sync.c:3255
 msgid "Finished restoring handheld.\n"
 msgstr "Afsluttede genskabelse af håndholdt.\n"
 
-#: sync.c:3200
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr "Du skal måske synkronisere for at opdatere J-Pilot.\n"
 
-#: sync.c:3222
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr "Udfører hurtig synkronisering\n"
 
-#: sync.c:3235
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr "Udfører en langsom synkronisering\n"
 
-#: sync.c:3310
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr "Tak for at du bruger J-Pilot."
 
-#: sync.c:3355 sync.c:3420
+#: ../sync.c:3411 ../sync.c:3479
 msgid "Finished.\n"
 msgstr "Færdig.\n"
 
-#: sync.c:3383
-#, c-format
-msgid ""
-"%s: sync process already in progress (process ID = %d\n"
-")"
+#: ../sync.c:3446
+#, fuzzy, c-format
+msgid "%s: sync process already in progress (process ID = %d)\n"
 msgstr ""
 "%s: Synkroniseringsproces er allerede i gang (proces-id = %d\n"
 ")"
 
-#: sync.c:3384
-#, c-format
+#: ../sync.c:3447
+#, fuzzy, c-format
 msgid ""
-"%s: press the hotsync button on the cradle\n"
-"      or stop the sync by typing \"kill %d\" at the command line\n"
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
 msgstr ""
 "%s: Tryk på hotsync-knappen på stilladset\n"
 "      eller stop synkroniseringen ved at taste »kill %d« på kommandolinjen\n"
 
-#: sync.c:3419
+#: ../sync.c:3478
 #, c-format
 msgid "Exiting with status %s\n"
 msgstr "Afsluttede med status %s\n"
 
-#: todo.c:266
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "Beskrivelsestekst for huskeliste > %d, forkorter til %d\n"
 
-#: todo.c:272
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "Notetekst for huskeliste > %d, forkorter til %d\n"
 
-#: todo_gui.c:164
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Forfaldsdato"
 
-#: todo_gui.c:535
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Filen lader ikke til at være i todo.dat-format\n"
 
-#: todo_gui.c:599
+#: ../todo_gui.c:596
 msgid "DAT/TDA (Palm Archive Formats)"
 msgstr "DAT/TDA (Arkivformater til Palm)"
 
-#: todo_gui.c:690
+#: ../todo_gui.c:688
 #, c-format
 msgid ""
 "ToDo exported from %s %s on %s\n"
@@ -2569,37 +2996,37 @@ msgstr ""
 "Huskeliste eksporteret fra %s %s den %s\n"
 "\n"
 
-#: todo_gui.c:720
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "Kan ikke eksportere huskeliste %d\n"
 
-#: todo_gui.c:760
+#: ../todo_gui.c:766
 #, c-format
 msgid "Due Date: None\n"
 msgstr "Forfaldsdato: Ingen\n"
 
-#: todo_gui.c:763
+#: ../todo_gui.c:769
 #, c-format
 msgid "Due Date: %s\n"
 msgstr "Forfaldsdato: %s\n"
 
-#: todo_gui.c:765
+#: ../todo_gui.c:771
 #, c-format
 msgid "Priority: %d\n"
 msgstr "Prioritet: %d\n"
 
-#: todo_gui.c:766
+#: ../todo_gui.c:772
 #, c-format
 msgid "Completed: %s\n"
 msgstr "Udført: %s\n"
 
-#: todo_gui.c:768
+#: ../todo_gui.c:774
 #, c-format
 msgid "Description: %s\n"
 msgstr "Beskrivelse: %s\n"
 
-#: todo_gui.c:771
+#: ../todo_gui.c:777
 #, c-format
 msgid ""
 "Note: %s\n"
@@ -2608,201 +3035,226 @@ msgstr ""
 "Note: %s\n"
 "\n"
 
-#: todo_gui.c:1587
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "Prioritet uden for interval\n"
 
-#: todo_gui.c:1820 KeyRing/keyring.c:1312
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Ingen dato"
 
-#: todo_gui.c:2284
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Udført"
 
-#: todo_gui.c:2292
+#: ../todo_gui.c:2418
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: todo_gui.c:2313
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "Forfaldsdato:"
 
-#: utils.c:329
+#: ../utils.c:330
 msgid "Today"
 msgstr "I dag"
 
-#: utils.c:574
+#: ../utils.c:575
 #, c-format
 msgid "Couldn't find empty DB file %s: %s\n"
 msgstr "Kunne ikke finde top DB-fil %s: %s\n"
 
-#: utils.c:577
+#: ../utils.c:578
 msgid " may not be installed.\n"
 msgstr " er måske ikke installeret.\n"
 
-#: utils.c:612 utils.c:616
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
 #, c-format
 msgid "Can't create directory %s\n"
 msgstr "Kan ikke oprette mappe %s\n"
 
-#: utils.c:622
+#: ../utils.c:623
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s er ikke en mappe\n"
 
-#: utils.c:627
+#: ../utils.c:628
 #, c-format
 msgid "Unable to get write permission for directory %s\n"
 msgstr "Kunne ikke få skriveadgang til mappe %s\n"
 
-#: utils.c:1314 utils.c:1338
+#: ../utils.c:1328 ../utils.c:1352
 msgid "Save Changed Record?"
 msgstr "Gem ændret post?"
 
-#: utils.c:1315 utils.c:1339
+#: ../utils.c:1329 ../utils.c:1353
 msgid "Do you want to save the changes to this record?"
 msgstr "Vil du gemme ændringerne i denne post?"
 
-#: utils.c:1320 utils.c:1344
+#: ../utils.c:1334 ../utils.c:1358
 msgid "Save New Record?"
 msgstr "Gem ny post?"
 
-#: utils.c:1321 utils.c:1345
+#: ../utils.c:1335 ../utils.c:1359
 msgid "Do you want to save this new record?"
 msgstr "Ønsker du at gemme denne nye post?"
 
-#: utils.c:1636
+#: ../utils.c:1650
 msgid "infinite loop, breaking\n"
 msgstr "uendeligt loop, afbryder\n"
 
-#: utils.c:1860
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr " -p springer indlæsning af udvidelsesmoduler over.\n"
 
-#: utils.c:1861
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr ""
 " -a ignorerer oversete alarmer siden sidste gang programmet blev kørt.\n"
 
-#: utils.c:1862
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A ignorerer alle alarmer tidligere og fremover.\n"
 
-#: utils.c:1863
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i lader programmet ikonificere sig selv ved opstart.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
 
-#: utils.c:1864
-msgid " -geometry applies X geometry argument to main window\n"
+#: ../utils.c:1879
+#, fuzzy, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
 msgstr " -geometry bruger x-geometri argument på hovedvindue\n"
 
-#: utils.c:1865
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " De miljøvariabler som PILOTPORT og PILOTRATE bruges til at angive\n"
 
-#: utils.c:1866
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " hvilken port der skal synkroniseres på og med hvilken hastighed.\n"
 
-#: utils.c:1867
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " hvis PILOTPORT ikke er angivet er standarden /dev/pilot.\n"
 
-#: utils.c:1904
+#: ../utils.c:1921
 msgid "Error reading file"
 msgstr "Fejl ved læsning af fil"
 
-#: utils.c:1954
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Dato for kompilering"
 
-#: utils.c:1955
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Kompileret med disse tilvalg:"
 
-#: utils.c:1957
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Installeret sti"
 
-#: utils.c:1959
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link version"
 
-#: utils.c:1963
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "USB-understøttelse"
 
-#: utils.c:1964 utils.c:1967 utils.c:1973 utils.c:1979 utils.c:1985
-#: utils.c:1991 utils.c:1996
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "ja"
 
-#: utils.c:1965
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Understøttelse af private poster"
 
-#: utils.c:1969 utils.c:1975 utils.c:1981 utils.c:1987 utils.c:1993
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
 msgid "no"
 msgstr "nej"
 
-#: utils.c:1971
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Datebk-understøttelse"
 
-#: utils.c:1977
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Understøttelse af udvidelsesmodul"
 
-#: utils.c:1983
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Understøttelse af Manana"
 
-#: utils.c:1989
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "NLS-understøttelse (fremmed sprog)"
 
-#: utils.c:1995
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "GTK2-understøttelse"
 
-#: utils.c:2038 KeyRing/keyring.c:1779
+#. No HOME var
+#: ../utils.c:2057
+#, c-format
 msgid "Can't get HOME environment variable\n"
 msgstr "Kan ikke indhente HJEMME-miljøvariabel\n"
 
-#: utils.c:2045
+#: ../utils.c:2064
+#, c-format
 msgid "HOME environment variable is too long to process\n"
 msgstr "HJEMME-miljøvariabel er for lang til at kunne behandles\n"
 
-#: utils.c:2530
+#: ../utils.c:2567
 msgid "Edit Categories..."
 msgstr "Rediger kategorier..."
 
-#: utils.c:3197
+#: ../utils.c:3233
 msgid "PC ID is 0.\n"
 msgstr "Pc-id er 0.\n"
 
-#: utils.c:3198
+#: ../utils.c:3234
 #, c-format
 msgid "Generated a new PC ID.  It is %lu\n"
 msgstr "Oprettede en ny pc-id. Den er %lu\n"
 
-#: utils.c:3283
+#: ../utils.c:3376
 msgid "Invalid UTF-8 encoding in export string\n"
 msgstr "Ugyldig UTF-8-kodning i eksportstreng\n"
 
-#: utils.c:3417
+#: ../utils.c:3537
 #, c-format
 msgid "Today is %A, %x %X"
 msgstr "I dag er det %A %x %X"
 
-#: utils.c:3419
+#: ../utils.c:3539
 #, c-format
 msgid "Today is %%A, %s %s"
 msgstr "I dag er det %%A %s %s"
 
-#: utils.c:3647
+#: ../utils.c:3768
 #, c-format
 msgid ""
 "Incorrect header format for CSV import\n"
@@ -2813,333 +3265,345 @@ msgstr ""
 "Tjek linje 1 i filen %s\n"
 "Afbryder import\n"
 
-#: utils.c:3684
+#: ../utils.c:3805
 #, c-format
 msgid "Error writing version header to file: %s%s\n"
 msgstr "Fejl ved skrivning af versionteksthoved til filen: %s%s\n"
 
-#: utils.c:3689
+#: ../utils.c:3810
 #, c-format
 msgid "Error writing next id to file: %s%s"
 msgstr "Fejl ved skrivning af næste id til filen: %s%s"
 
-#: weekview_gui.c:293
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Ugentlig visning"
 
-#: Expense/expense.c:97
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Australien"
 
-#: Expense/expense.c:98
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Østrig"
 
-#: Expense/expense.c:99
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Belgien"
 
-#: Expense/expense.c:100
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: Expense/expense.c:101
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Canada"
 
-#: Expense/expense.c:102
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Danmark"
 
-#: Expense/expense.c:103
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (euro)"
 
-#: Expense/expense.c:104
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finland"
 
-#: Expense/expense.c:105
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Frankrig"
 
-#: Expense/expense.c:106
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Tyskland"
 
-#: Expense/expense.c:107
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: Expense/expense.c:108
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Island"
 
-#: Expense/expense.c:109
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Indien"
 
-#: Expense/expense.c:110
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: Expense/expense.c:111
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Irland"
 
-#: Expense/expense.c:112
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Italien"
 
-#: Expense/expense.c:113
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Japan"
 
-#: Expense/expense.c:114
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Korea"
 
-#: Expense/expense.c:115
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: Expense/expense.c:116
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: Expense/expense.c:117
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Mexico"
 
-#: Expense/expense.c:118
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Holland"
 
-#: Expense/expense.c:119
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: Expense/expense.c:120
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Norge"
 
-#: Expense/expense.c:121
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "P.R.C."
 
-#: Expense/expense.c:122
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Filippinerne"
 
-#: Expense/expense.c:123
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Singapore"
 
-#: Expense/expense.c:124
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Spanien"
 
-#: Expense/expense.c:125
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Sverige"
 
-#: Expense/expense.c:126
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Schweitz"
 
-#: Expense/expense.c:127
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: Expense/expense.c:128
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Thailand"
 
-#: Expense/expense.c:129
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: Expense/expense.c:130
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "USA"
 
-#: Expense/expense.c:518 Expense/expense.c:529
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Udgift"
 
-#: Expense/expense.c:550 Expense/expense.c:1388
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Flyrejse"
 
-#: Expense/expense.c:552 Expense/expense.c:1389
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Morgenmad"
 
-#: Expense/expense.c:554 Expense/expense.c:1390
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Bus"
 
-#: Expense/expense.c:556 Expense/expense.c:1391
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Forretningsfrokoster"
 
-#: Expense/expense.c:558 Expense/expense.c:1392
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Billeje"
 
-#: Expense/expense.c:560 Expense/expense.c:1393
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Middag"
 
-#: Expense/expense.c:562 Expense/expense.c:1394
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Fornøjelse"
 
-#: Expense/expense.c:564 Expense/expense.c:1395
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fax"
 
-#: Expense/expense.c:566 Expense/expense.c:1396
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Benzin"
 
-#: Expense/expense.c:568 Expense/expense.c:1397
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Gaver"
 
-#: Expense/expense.c:570 Expense/expense.c:1398
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hotel"
 
-#: Expense/expense.c:572 Expense/expense.c:1399
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Uforudsete"
 
-#: Expense/expense.c:574 Expense/expense.c:1400
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Tøjvask"
 
-#: Expense/expense.c:576 Expense/expense.c:1401
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limousine"
 
-#: Expense/expense.c:578 Expense/expense.c:1402
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Overnatning"
 
-#: Expense/expense.c:580 Expense/expense.c:1403
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Frokost"
 
-#: Expense/expense.c:582 Expense/expense.c:1404
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Kørsel"
 
-#: Expense/expense.c:586 Expense/expense.c:1406
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Parkering"
 
-#: Expense/expense.c:588 Expense/expense.c:1407
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Porto"
 
-#: Expense/expense.c:590 Expense/expense.c:1408
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Snack"
 
-#: Expense/expense.c:592 Expense/expense.c:1409
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Metro"
 
-#: Expense/expense.c:594 Expense/expense.c:1410
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Leverencer"
 
-#: Expense/expense.c:596 Expense/expense.c:1411
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taxi"
 
-#: Expense/expense.c:598 Expense/expense.c:1412
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Telefon"
 
-#: Expense/expense.c:600 Expense/expense.c:1413
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Drikkepenge"
 
-#: Expense/expense.c:602 Expense/expense.c:1414
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Told"
 
-#: Expense/expense.c:604 Expense/expense.c:1415
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Tog"
 
-#: Expense/expense.c:1239
+#: ../Expense/expense.c:1237
 msgid "Expense: Unknown expense type\n"
 msgstr "Udgift: Ukendt udgiftstype\n"
 
-#: Expense/expense.c:1245
+#: ../Expense/expense.c:1243
 msgid "Expense: Unknown payment type\n"
 msgstr "Udgift: Ukendt betalingstype\n"
 
-#: Expense/expense.c:1377
+#: ../Expense/expense.c:1375
 msgid "American Express"
 msgstr "American Express"
 
-#: Expense/expense.c:1378
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Kontant"
 
-#: Expense/expense.c:1379
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Check"
 
-#: Expense/expense.c:1380
+#: ../Expense/expense.c:1378
 msgid "Credit Card"
 msgstr "Kreditkort"
 
-#: Expense/expense.c:1381
+#: ../Expense/expense.c:1379
 msgid "Master Card"
 msgstr "Master Card"
 
-#: Expense/expense.c:1382
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Forudbetalt"
 
-#: Expense/expense.c:1383
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: Expense/expense.c:1616
+#: ../Expense/expense.c:1617
 msgid "Type"
 msgstr "Type"
 
-#: Expense/expense.c:1617
+#: ../Expense/expense.c:1618
 msgid "Amount"
 msgstr "Beløb"
 
-#: Expense/expense.c:1701
+#. Category Menu
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Kategori:"
 
-#: Expense/expense.c:1709
+#. Type Menu
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Type:"
 
-#: Expense/expense.c:1717
+#. Payment Menu
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Betaling:"
 
-#: Expense/expense.c:1725
+#. Currency Menu
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Valuta:"
 
-#: Expense/expense.c:1745
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Måned:"
 
-#: Expense/expense.c:1759
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Dag:"
 
@@ -3147,35 +3611,39 @@ msgstr "Dag:"
 # msgstr "Pr. uge"
 # msgid "MonthView"
 # msgstr "Pr. mnd"
-#: Expense/expense.c:1773
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "År:"
 
-#: Expense/expense.c:1786
+#. Amount Entry
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Beløb:"
 
-#: Expense/expense.c:1796
+#. Vendor Entry
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Leverandør:"
 
-#: Expense/expense.c:1806
+#. City
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "By:"
 
-#: Expense/expense.c:1816
+#. Attendees
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Deltagere"
 
-#: Expense/expense.c:2099
-#, c-format
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "\n"
 "Expense plugin for J-Pilot was written by\n"
 "Judd Montgomery (c) 1999.\n"
-"judd@jpilot.org\n"
-"http://jpilot.org"
+"judd@jpilot.org, http://jpilot.org"
 msgstr ""
 "%s\n"
 "\n"
@@ -3184,48 +3652,44 @@ msgstr ""
 "judd@jpilot.org\n"
 "http://jpilot.org"
 
-#: KeyRing/keyring.c:293
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "KeyRing: pack_KeyRing(): buf_size for lille\n"
 
-#: KeyRing/keyring.c:1702
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Ugyldigt, indtast KeyRing-kode igen"
 
-#: KeyRing/keyring.c:1704
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Indtast en NY KeyRing-adgangskode"
 
-#: KeyRing/keyring.c:1706
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Indtast KeyRing-adgangskode"
 
-#: KeyRing/keyring.c:1784
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "Din HJEMME-miljøvariabel er for lang(>1024)\n"
-
-#: KeyRing/keyring.c:1789
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "KeyRing: Fil %s blev ikke fundet.\n"
 
-#: KeyRing/keyring.c:1790
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "KeyRing: Forsøg synkronisering.\n"
 
-#: KeyRing/keyring.c:1881 KeyRing/keyring.c:1892
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "KeyRing"
 
-#: KeyRing/keyring.c:1920
-#, c-format
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "\n"
 "KeyRing plugin for J-Pilot was written by\n"
 "Judd Montgomery (c) 2001.\n"
-"judd@jpilot.org\n"
-"http://jpilot.org\n"
+"judd@jpilot.org, http://jpilot.org\n"
 "\n"
 "KeyRing is a free PalmOS program for storing\n"
 "passwords and other information in encrypted form\n"
@@ -3242,7 +3706,7 @@ msgstr ""
 "adgangskoder og anden information i krypteret form\n"
 "http://gnukeyring.sourceforge.net"
 
-#: KeyRing/keyring.c:2158
+#: ../KeyRing/keyring.c:2136
 #, c-format
 msgid ""
 "Keys exported from %s %s on %s\n"
@@ -3251,12 +3715,13 @@ msgstr ""
 "Nøgler eksporteret fra %s %s den %s\n"
 "\n"
 
-#: KeyRing/keyring.c:2174
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
 #, c-format
 msgid "Can't export key %d\n"
 msgstr "Kan ikke eksportere nøgle %d\n"
 
-#: KeyRing/keyring.c:2369
+#. Change Password button
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3266,47 +3731,53 @@ msgstr ""
 "KeyRing-\n"
 "adgangskode"
 
-#: KeyRing/keyring.c:2481
+#. Clist
+#: ../KeyRing/keyring.c:2564
 msgid "Changed"
 msgstr "Ændret"
 
-#: KeyRing/keyring.c:2483
+#: ../KeyRing/keyring.c:2566
 msgid "Account"
 msgstr "Konto"
 
-#: KeyRing/keyring.c:2577
+#. Name entry
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "navn: "
 
-#: KeyRing/keyring.c:2585
+#. Account entry
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "konto: "
 
-#: KeyRing/keyring.c:2593
+#. Password entry
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "adgangskode: "
 
-#: KeyRing/keyring.c:2600
+#. Last Changed entry
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr "sidst ændret: "
 
-#: KeyRing/keyring.c:2610
+#. Generate Password button (creates random password)
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Opret adgangskode"
 
-#: SyncTime/synctime.c:61
+#: ../SyncTime/synctime.c:59
 msgid "SyncTime"
 msgstr "SyncTime"
 
-#: SyncTime/synctime.c:72
-#, c-format
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "\n"
 "SyncTime plugin for J-Pilot was written by\n"
 "Judd Montgomery (c) 1999.\n"
-"judd@jpilot.org\n"
-"http://jpilot.org\n"
+"judd@jpilot.org, http://jpilot.org\n"
 "\n"
 "SyncTime WILL NOT work with PalmOS 3.3!"
 msgstr ""
@@ -3319,22 +3790,41 @@ msgstr ""
 "\n"
 "SyncTime VIL IKKE virke med PalmOS 3.3!"
 
-#: SyncTime/synctime.c:107
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr "synctime: Palm OS version 3.25 og 3.30 understøtter ikke SyncTime\n"
 
-#: SyncTime/synctime.c:108
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr "synctime: Indstiller IKKE tiden på piloten\n"
 
-#: SyncTime/synctime.c:113
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr "synctime: Indstiller tiden på piloten... "
 
-#: SyncTime/synctime.c:118
+#: ../SyncTime/synctime.c:115
 msgid "Done\n"
 msgstr "Færdig\n"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Overskriv fil?"
+
+#~ msgid "W"
+#~ msgstr "U"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#~ msgid "Serial Port"
+#~ msgstr "Serielport"
+
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i lader programmet ikonificere sig selv ved opstart.\n"
+
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "Din HJEMME-miljøvariabel er for lang(>1024)\n"
+
 #, fuzzy
 #~ msgid ""
 #~ " [-v] || [-h] || [-d] || [-a] || [-A] || [-i]\n"
diff --git a/po/de.po b/po/de.po
index 4fbd7f5d..c5f0a13f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,464 +7,621 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.6\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2006-03-26 04:07+0100\n"
 "Last-Translator: Peter Mukunda Pasedach <mukunda@mukunda.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "Fehler"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Fehler beim Lesen der Kategorieinfo %s\n"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, fuzzy, c-format
 msgid "Error reading file: %s\n"
 msgstr "Fehler beim lesen von %s\n"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "Fehler"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
 msgstr ""
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, fuzzy, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Kann %s nicht �ffnen\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Kann %s nicht �ffnen\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Diese Datei scheint nicht im address.dat Format zu sein\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Nicht abgelegt"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "Ok"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Nein"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Ja"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s ist ein Verzeichnis"
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Fehler beim �ffnen der Datei"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Wollen Sie die Datei %s �berschreiben?"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Datei �berschreiben?"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, fuzzy, c-format
 msgid "Error opening file: %s"
 msgstr "Fehler beim �ffnen der Datei"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr ""
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-#, fuzzy
-msgid "Field"
-msgstr "Finnland"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Kategorie:"
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Privat"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr ""
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "Firma/Name"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Name/Firma"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Name/Firma"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Firma/Name"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr ""
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr ""
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, fuzzy, c-format
 msgid "executing command = [%s]\n"
 msgstr "Diesen Befehl ausf�hren"
 
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
+
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "Fehlgeschlagen.\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
 #. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Kategorie:"
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
-msgstr "kana("
-
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
-msgstr "E-Mail"
-
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2902 ../address_gui.c:4237
 #, fuzzy
 msgid "Mail"
 msgstr "Brasilien"
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "W�hlen"
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Unbenannt-"
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 Eintr�ge"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d von %d Eintr�gen"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
-msgstr "Kategorien editieren"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Name"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Adresse"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Sonstige"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Notiz"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Schnellsuche : "
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 #, fuzzy
 msgid "Cancel the modifications"
 msgstr "Kompiliert mit folgenden Optionen:"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "L�schen"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 #, fuzzy
 msgid "Delete the selected record"
 msgstr "Einen %s-Eintrag gel�scht."
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete"
 msgstr "L�schen"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete the selected record"
 msgstr "Einen %s-Eintrag gel�scht."
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 #, fuzzy
 msgid "Copy the selected record"
 msgstr "Eintrag hinzuf�gen"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Neuer Eintrag"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 #, fuzzy
 msgid "Add a new record"
 msgstr "Eintrag hinzuf�gen"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Eintrag hinzuf�gen"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 #, fuzzy
 msgid "Add the new record"
 msgstr "Eintrag hinzuf�gen"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "�nderungen �bernehmen"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 #, fuzzy
 msgid "Commit the modifications"
 msgstr "Kompiliert mit folgenden Optionen:"
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privat"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "Name"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "Adresse"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "Sonstige"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "Abbrechen"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "Alle"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Entfernen"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "Zeige\n"
 "In Liste"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "Kurzansicht"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "Erinnere mich in"
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "Tage"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Alle"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minuten"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Stunden"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Erinnere mich in"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, fuzzy, c-format
-msgid "Unable to open %s%s file\n"
+msgid "Unable to open file: %s%s\n"
 msgstr "Kann %s nicht �ffnen\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Terminerinnerung"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Verstrichener Termin"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Verschobener Termin"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr ""
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr ""
-
-#: ../alarms.c:1531
-#, fuzzy, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Kann %s nicht �ffnen\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-#, fuzzy
-msgid "rename failed"
-msgstr "Installation von %s fehlgeschlagen"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "PC-Datei besch�digt?\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek fehlgeschlagen - schwerer Fehler\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+#, fuzzy
+msgid "rename failed"
+msgstr "Installation von %s fehlgeschlagen"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Verschiebe"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Kategorien editieren"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Die maximal Katergorienzahl (16) wird schon verwendet"
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Neue Kategorie eingeben"
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 #, fuzzy
 msgid "Edit Categories Error"
 msgstr "Kategorien editieren"
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Zum Umbenennen muss eine Katergorie selektiert sein"
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "Kann Kategorie %s nicht editieren.\n"
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "Neuer Kategoriename"
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Zum L�schen muss eine Katergorie selektiert sein"
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr "Kann Kategorie %s nicht l�schen.\n"
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
@@ -472,205 +629,340 @@ msgstr ""
 "%d Eintr�ge in %s.\n"
 "M�chten sie die Eintr�ge nach %s verschieben oder l�schen?"
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr ""
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "Die Kategorie %s kann nur einmal verwendet werden"
 
-#. correctly translate title
-#: ../category.c:813
+#. Category names in host character set
+#: ../category.c:733
 #, fuzzy
-msgid "category name"
+msgid "Category"
 msgstr "Kategorie:"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "Neu"
 
-#: ../category.c:845
+#: ../category.c:841
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../category.c:960
-msgid "debug"
-msgstr "debug"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr ""
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr ""
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr ""
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+msgid "It should be:"
 msgstr ""
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr ""
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr ""
 
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Wiederholung an:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Wochentage f�r Wiederholung:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Wiederholung an:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Wochentage f�r Wiederholung:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Wochentage f�r Wiederholung:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Wochentage f�r Wiederholung:"
+
 # These days of the week are put in the buttons above the calendar and
 # the little buttons in the repeat weekly window.
 # They should be one letter if possible.  The English ones get truncated to
 # one letter.
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "So"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Mo"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Di"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Mi"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Do"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Fr"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Sa"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Enddatum"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Wochentage f�r Wiederholung:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "Anzahl der Eintr�ge: %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Notiz"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Alarm"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Wiederholung an:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Wochentag"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Termin-Beschreibung ist zu lang, %d wurde auf %d abgeschnitten.\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Fehler"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Diese Datei scheint nicht im datebook.dat Format zu sein.\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr ""
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Exportieren"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Alle Terminplanereintr�ge exportieren"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Speichern unter"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 #, fuzzy
 msgid "Datebook Categories"
 msgstr "Kategorien editieren"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "Schlie�en"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Keine"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Startdatum"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Enddatum"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Montag"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4."
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Letzter"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -680,69 +972,74 @@ msgid ""
 "Which do you want?"
 msgstr ""
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr ""
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Dies ist ein sich wiederholender\n"
 "Termin. Sollen sich die �nderungen\n"
 "nur auf den AKTUELLEN oder auf\n"
 "ALLE Terminsereignisse beziehen?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Aktueller"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "Keiner"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "Tag"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "Woche"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "Monat"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "Jahr"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Eine Wiederholung alle %d %s(e) ist nicht m�glich \n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
+#, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr "W�chentliche Wiederholung nicht m�glich, wenn kein Tag gew�hlt ist."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Keine Uhrzeit"
 
-#: ../datebook_gui.c:2631
-msgid "Invalid Appointment"
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
+msgid "Invalid Appointment"
 msgstr "Ung�ltiger Termin"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -750,112 +1047,94 @@ msgstr ""
 "Das Enddatum dieses Termins\n"
 "liegt vor den Startdatum."
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Kein F�lligkeitsdatum"
 
-#: ../datebook_gui.c:3021
+#: ../datebook_gui.c:3491
 #, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
-msgstr ""
-
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr ""
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Woche"
 
-#: ../datebook_gui.c:4206
-#, fuzzy
-msgid "W"
-msgstr "Mi"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+msgid "View appointments by week   Ctrl+W"
 msgstr ""
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Monat"
 
-#: ../datebook_gui.c:4218
-#, fuzzy
-msgid "M"
-msgstr "Mo"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+msgid "View appointments by month   Ctrl+M"
 msgstr ""
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Kategorien"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Zeit"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Zeige Aufgaben"
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "F�lligkeit"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarm"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "Tage"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "Keine Zeitangabe"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+#, fuzzy
+msgid "Date:"
+msgstr "Datum"
 
-#: ../datebook_gui.c:4493
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Beginn"
 
-#: ../datebook_gui.c:4507
-msgid "Start Time"
-msgstr "Startzeit"
-
-#: ../datebook_gui.c:4525
-msgid "End Time"
-msgstr "Endzeit"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "Endet am"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "DateBk Felder"
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Tag"
 
@@ -863,75 +1142,70 @@ msgstr "Tag"
 # msgstr "Woche"
 # msgid "MonthView"
 # msgstr "Monat"
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Jahr"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Keine Wiederholung des Termins"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Wiederholung alle/jeden"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "Tag(e)"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Endet am"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "Woche(n)"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "Wochentage f�r Wiederholung:"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "Monat(e)"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Wiederholung an:"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Wochentag"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Datum"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "Jahr(e)"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "W�hlprogramm"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Prefix 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Prefix 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Prefix 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Telefonnummer"
 
@@ -939,494 +1213,377 @@ msgstr "Telefonnummer"
 msgid "Extension"
 msgstr "Erweiterung"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "W�hl-Befehl"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "Verlassen"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Dateibrowser"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Zu exportierende Eintr�ge ausw�hlen"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Benutzen Sie die Strg- und Shift-Tasten"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importieren"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr ""
-"Um ein verstecktes Verzeichnis aufzurufen, Namen eintippen und Tabulator-"
-"Taste dr�cken."
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "Fertig"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "Import-Dateiformat"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "Dieser Eintrag ist als privater markiert"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "Dieser Eintrag ist nicht als privater markiert"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr ""
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, fuzzy, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Alle Eintr�ge in dieser Kategorie"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Alle importieren"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "�berspringen"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Installieren"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr ""
+"Um ein verstecktes Verzeichnis aufzurufen, Namen eintippen und Tabulator-"
+"Taste dr�cken."
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Zu installierende Dateien"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Import-Dateiformat"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Hinzuf�gen"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Zu installierende Dateien"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Entfernen"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Installieren"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/Datei/Benutzer Installieren"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "Benutzername"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "BenutzerID"
 
-#: ../jpilot-dump.c:95
-msgid " +D +A +T +M format like date +format.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:98
-msgid " -f displays help for format codes.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:99
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr "Adressbuch"
-
-#: ../jpilot-dump.c:100
-msgid " -N dump appts for today in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:101
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:102
-#, fuzzy
-msgid " -A dump Address book.\n"
-msgstr "Adressbuch"
-
-#: ../jpilot-dump.c:103
-msgid " -T dump ToDo list as CSV.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr ""
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr ""
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr ""
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr ""
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr ""
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Drucken"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Drucken aus diesem Conduit nicht m�glich."
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Importieren in dieses Conduit nicht m�glich."
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Exportieren aus diesem Conduit nicht m�glich."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Abgleich abbrechen"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Abgleich abbrechen"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Trotzdem synchronisieren"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 #, fuzzy
 msgid "Sync Problem"
 msgstr "Merkzettel synchronisieren"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+#, fuzzy
+msgid " User: "
+msgstr "BenutzerID"
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr ""
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "�ber %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Datei"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Datei/Abreissen"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Datei/_Suchen"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Datei/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Datei/_Installieren"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Datei/I_mportieren"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Datei/_Exportieren"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Datei/Ei_nstellungen"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Datei/_Drucken"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Datei/Benutzer Installieren"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Datei/Pilot _wiederherstellen"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Datei/_Beenden"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Ansicht"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Ansicht/Private Eintr�ge verbergen"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Ansicht/Private Eintr�ge anzeigen"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Ansicht/Private Eintr�ge maskieren"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Ansicht/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Ansicht/_Terminplaner"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Ansicht/A_dressen"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Ansicht/A_ufgaben"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Ansicht/_Merkzettel"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Plugins"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/_Netscape"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/_Mozilla"
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/_Galeon"
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/_Opera"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/Gnome_Url"
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/_Lynx"
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/L_inks"
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W_3M"
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/_Konqueror"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/Hilfe/PayBack program"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/Hilfe/�ber J-Pilot"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/Plugins/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Hilfe/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr ""
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr ""
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 #, fuzzy
 msgid "Unable to open pipe\n"
 msgstr "Kann %s nicht �ffnen\n"
 
-#: ../jpilot.c:2422
-#, fuzzy
-msgid " User: "
-msgstr "BenutzerID"
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "L�schen"
-
-#: ../jpilot.c:2649
-#, fuzzy
-msgid "Show private records   Ctrl-Z"
-msgstr "Private Eintr�ge anzeigen"
-
-#: ../jpilot.c:2654
+#: ../jpilot.c:1949
 #, fuzzy
-msgid "Show private records"
+msgid "Show private records   Ctrl+Z"
 msgstr "Private Eintr�ge anzeigen"
 
-#: ../jpilot.c:2659
-#, fuzzy
-msgid "Hide private records   Ctrl-Z"
-msgstr "Private Eintr�ge verbergen"
-
-#: ../jpilot.c:2664
+#: ../jpilot.c:1954
 #, fuzzy
-msgid "Hide private records"
+msgid "Hide private records   Ctrl+Z"
 msgstr "Private Eintr�ge verbergen"
 
-#: ../jpilot.c:2669
-#, fuzzy
-msgid "Mask private records   Ctrl-Z"
-msgstr "Private Eintr�ge maskieren (---)"
-
-#: ../jpilot.c:2674
+#: ../jpilot.c:1959
 #, fuzzy
-msgid "Mask private records"
+msgid "Mask private records   Ctrl+Z"
 msgstr "Private Eintr�ge maskieren (---)"
 
-#: ../jpilot.c:2684
+#: ../jpilot.c:1971
 #, fuzzy
-msgid "Sync your palm to the desktop   Ctrl-Y"
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Palm mit Desktop synchronisieren"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
-msgid "Font"
-msgstr "Schrift"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Adressen synchronisieren"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1434,1515 +1591,2002 @@ msgstr ""
 "Palm mit Desktop synchronisieren\n"
 "und dann Backup erstellen"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Terminplaner/Heute"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Aufgaben"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Merkzettel"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr ""
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 #, fuzzy
 msgid "Remind me later"
 msgstr "Erinnere mich in"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr ""
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
-msgstr ""
-
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr ""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Zeichensatz "
 
-#: ../jpilot.c:2898
-msgid "\"."
+#: ../jpilot.c:2194
+msgid "Select a UTF-8 encoding"
 msgstr ""
 
-#: ../jpilot.c:2900
-msgid "Select a UTF-8 encoding"
+#: ../jpilot-dump.c:92
+#, c-format
+msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:93
 #, c-format
-msgid "Unknown PC header version = %d\n"
+msgid " -v display version and exit\n"
 msgstr ""
 
-#: ../libplugin.c:416
-#, fuzzy, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d Fehler beim Lesen von %s\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, c-format
+msgid " -h display help text\n"
+msgstr ""
+
+#: ../jpilot-dump.c:95
+#, c-format
+msgid " -f display help for format codes\n"
+msgstr ""
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
+#: ../jpilot-dump.c:96
 #, fuzzy, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Fehler beim Lesen von %s\n"
+msgid " -D dump DateBook\n"
+msgstr "Adressbuch"
 
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+#: ../jpilot-dump.c:97
+#, c-format
+msgid " -i dump DateBook in iCalendar format\n"
 msgstr ""
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-#, fuzzy
-msgid "Unable to open PC records file\n"
-msgstr "Kann %s nicht �ffnen\n"
-
-#: ../libplugin.c:493 ../utils.c:1959
-#, fuzzy
-msgid "Couldn't find record to delete\n"
-msgstr "Kann Kategorie %s auf Ger�t nicht hinzuf�gen.\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr "Adressbuch"
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:99
 #, c-format
-msgid "Unknown header version %d\n"
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr ""
 
-#: ../libplugin.c:524
-#, fuzzy
-msgid "Couldn't open PC records file\n"
-msgstr "Kann Datei %s nicht �ffnen.\n"
-
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
+#: ../jpilot-dump.c:100
 #, fuzzy, c-format
-msgid "Error opening file: %s\n"
-msgstr "Fehler beim �ffnen der Datei"
-
-#: ../libplugin.c:714
-#, fuzzy
-msgid "Error reading PC file 1\n"
-msgstr "Fehler beim lesen von %s\n"
+msgid " -A dump Address book\n"
+msgstr "Adressbuch"
 
-#: ../libplugin.c:730
-#, fuzzy
-msgid "Error reading PC file 2\n"
-msgstr "Fehler beim lesen von %s\n"
+#: ../jpilot-dump.c:101
+#, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr ""
 
-#: ../libplugin.c:903
+#: ../jpilot-dump.c:102
 #, fuzzy, c-format
-msgid "Error reading %s 5\n"
-msgstr "Fehler beim lesen von %s\n"
+msgid " -M dump Memos\n"
+msgstr "Adressbuch"
 
-#: ../log.c:95
-#, fuzzy, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Kann Log-File nicht �ffnen, gebe auf.\n"
+#: ../jpilot-dump.c:163
+#, c-format
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../log.c:102
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
 #, fuzzy, c-format
-msgid "Unable to open log file\n"
+msgid "%s: Unable to open file:%s\n"
 msgstr "Kann %s nicht �ffnen\n"
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Imported Memo %s\n"
+msgid "Records added         = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Diese Datei scheint nicht im memopad.dat Format zu sein\n"
-
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:271
 #, c-format
-msgid "Can't export memo %d\n"
+msgid "Records deleted       = %d\n"
 msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "Monats�bersicht"
-
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Palm Passwort"
-
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Falsches PalmOS-Passwort. Bitte erneut eingeben"
-
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "PalmOS-Passwort eingeben"
-
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
 msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:273
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
+msgid "Records written       = %d\n"
 msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
 msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
 msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:293
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
 msgstr ""
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:294
 #, c-format
-msgid " plugin is invalid: [%s]\n"
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
 msgstr ""
 
-#: ../plugins.c:296
-#, fuzzy, c-format
-msgid "Plugin:[%s]\n"
-msgstr "/Plugins/%s"
-
-#: ../plugins.c:297
+#: ../jpilot-merge.c:295
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
+msgid "  The merge will leave your databases in an unsync-able state.\n"
 msgstr ""
 
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
+#: ../jpilot-merge.c:296
+#, c-format
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
 msgstr ""
 
-#: ../prefs.c:394
-msgid "%d %B %Y"
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
 msgstr ""
 
-#: ../prefs.c:395
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
+
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:64
+#, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, c-format
+msgid " -v display version and compile options\n"
+msgstr ""
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, c-format
+msgid " -d display debug info to stdout\n"
+msgstr ""
+
+#: ../jpilot-sync.c:68
+#, c-format
+msgid " -P skip loading plugins\n"
+msgstr ""
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr ""
+
+#: ../jpilot-sync.c:71
+#, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Fehler beim �ffnen der Datei"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Fehler beim �ffnen der Datei"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Fehler"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr ""
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+#, fuzzy
+msgid "Unable to open PC records file\n"
+msgstr "Kann %s nicht �ffnen\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+#, fuzzy
+msgid "Couldn't find record to delete\n"
+msgstr "Kann Kategorie %s auf Ger�t nicht hinzuf�gen.\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr ""
+
+#: ../libplugin.c:180
+#, fuzzy, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d Fehler beim Lesen von %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, fuzzy, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Fehler beim Lesen von %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, fuzzy, c-format
+msgid "Error opening file: %s\n"
+msgstr "Fehler beim �ffnen der Datei"
+
+#: ../libplugin.c:524
+#, fuzzy, c-format
+msgid "Error reading %s 5\n"
+msgstr "Fehler beim lesen von %s\n"
+
+#: ../libplugin.c:799
+#, fuzzy
+msgid "Error reading PC file 1\n"
+msgstr "Fehler beim lesen von %s\n"
+
+#: ../libplugin.c:815
+#, fuzzy
+msgid "Error reading PC file 2\n"
+msgstr "Fehler beim lesen von %s\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr ""
+
+#: ../log.c:98
+#, fuzzy, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Kann Log-File nicht �ffnen, gebe auf.\n"
+
+#: ../log.c:108
+#, fuzzy, c-format
+msgid "Unable to open log file\n"
+msgstr "Kann %s nicht �ffnen\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr ""
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr ""
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Diese Datei scheint nicht im memopad.dat Format zu sein\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr ""
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Merkzettel"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Monats�bersicht"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Palm Passwort"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Falsches PalmOS-Passwort. Bitte erneut eingeben"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "PalmOS-Passwort eingeben"
+
+#: ../pidfile.c:69
+#, fuzzy
+msgid "removing stale pidfile\n"
+msgstr "Kann jpilot_to_install Datei nicht �ffnen\n"
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Fehler beim lesen von %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr ""
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr ""
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr ""
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr ""
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr ""
+
+#: ../plugins.c:297
+#, fuzzy, c-format
+msgid "Plugin:[%s]\n"
+msgstr "/Plugins/%s"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr ""
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr ""
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr ""
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr ""
+
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr ""
 
-#: ../prefs.c:396
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr ""
 
-#: ../prefs.c:397
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr ""
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr ""
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Lokales"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 #, fuzzy
 msgid "Datebook"
 msgstr "Termin"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "Aufgabe"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 #, fuzzy
 msgid "Memo"
 msgstr "Merkzettel"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Alarm"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Conduits"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "Datumsformat (kurz) "
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "Datumsformat (lang) "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "Zeitformat "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "Erster Wochentag ist "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "GTK-Farbdatei"
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Serielle Schnittstelle (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Merkzettel synchronisieren"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr ""
+#. Serial Rate
+#: ../prefs_gui.c:605
+#, fuzzy
+msgid "Serial Rate"
+msgstr "Schnittstellengeschwindigkeit"
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Wieviele Backups sollen archiviert werden?"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Gel�schte Eintr�ge anzeigen? (Standard: Nein)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Ver�nderte gel�schte Eintr�ge anzeigen? (Standard: Nein)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr ""
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+msgid "Show popup tooltips (default YES) (requires restart)"
+msgstr ""
+
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr ""
 
-#. ********************************************************************
-#. Datebook preference tab
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Tage mit Terminen farblich kennzeichnen?"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr ""
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr ""
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "DateBk Felder unterst�tzen"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "DateBk Unterst�tzung wurde beim kompilieren deaktiviert"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 #, fuzzy
 msgid "Mail Command"
 msgstr "W�hl-Befehl"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, fuzzy, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%t wird durch die Alarmzeit ersetzt"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Erledigte Aufgaben ausblenden"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Verstecke Aufgaben die noch nicht f�llig sind"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Fertigstellungsdatum aufzeichnen"
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Verwende Manana Datenbank"
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr ""
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Memo32 (pedit32) nutzen"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Meldungsfenster f�r Terminerinnerungen anzeigen"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Diesen Befehl ausf�hren"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "ACHTUNG: Einen Shell-Befehl auszuf�hren kann GEF�HRLICH sein!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Alarm-Befehl"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t wird durch die Alarmzeit ersetzt"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d wird durch das Alarmdatum ersetzt"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D wird durch die Alarmbeschreibung ersetzt"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N wird durch die Alarmnotiz ersetzt"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (Ersetzen der Beschreibung) in diesem Build deaktiviert"
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%D (Ersetzen der Notiz) in diesem Build deaktiviert"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Terminkalender synchronisieren"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Adressen synchronisieren"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Aufgaben synchronisieren"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Merkzettel synchronisieren"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "Memo32 (pedit32) synchronisieren"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Manana synchronisieren"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Verwende J-OS (Nicht japanisches PalmOS:WorkPad/CLIE)"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, fuzzy, c-format
 msgid "Sync %s (%s)"
 msgstr "Synce %s\n"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Druckoptionen"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Papiergr��e"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Tagesplan drucken"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Wochenplan drucken"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Monatsplan drucken"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "Einen Eintrag"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Einen %s-Eintrag gel�scht."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Alle Eintr�ge in dieser Kategorie"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Alle Eintr�ge drucken"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Einen Eintrag pro Seite"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " Leerzeilen zwischen Eintr�gen"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Druckbefehl (z.B. lpr oder cat > file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Pilot wiederherstellen"
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Zu installierende Dateien"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Um den Pilot wiederherzustellen:"
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr ""
 "1. W�hlen Sie alle die Anwendungen/Dateien aus, die Sie wiederherstellen "
 "wollen. (Standard: Alle)"
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Benutzernamen und BenutzerID eingeben."
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. OK-Button dr�cken."
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Das �berschreibt alle Daten, die sich derzeit auf dem Pilot befinden."
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "Benutzername"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "Termin"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "Adresse"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 #, fuzzy
 msgid "todo"
 msgstr "Aufgaben synchronisieren"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "Merkzettel"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "Merkzettel"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "Plugin ?"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Keine Eintr�ge gefunden"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Suchen"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Suchen nach: "
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Gro�- u. Kleinschreibung beachten?"
 
-#: ../sync.c:139
+#: ../sync.c:118
 #, fuzzy
 msgid "open lock file failed\n"
 msgstr "Kann Log-File nicht �ffnen\n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 #, fuzzy
 msgid "lock failed\n"
 msgstr "Fehlgeschlagen.\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr ""
 
-#: ../sync.c:192
+#: ../sync.c:180
+#, c-format
+msgid "sync is locked by pid %d\n"
+msgstr ""
+
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "�berpr�fen Sie die serielle Schnittstelle und die Einstellungen\n"
+
+#: ../sync.c:677
+#, fuzzy
+msgid "Unable to read home dir\n"
+msgstr "Kann %s nicht �ffnen\n"
+
+#: ../sync.c:1085 ../sync.c:1423
+#, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (ErstellerID '%s') ist aktuell und wurde nicht abgeglichen.\n"
+
+#: ../sync.c:1089 ../sync.c:1427
+#, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Abgleich mit '%s' ... (ErstellerID '%s')... "
+
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "Kann Datei %s nicht erzeugen\n"
+
+#: ../sync.c:1100 ../sync.c:1438
+#, fuzzy, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr "Kann Backup der Datenbank nicht durchf�hren\n"
+
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "Ok\n"
+
+#: ../sync.c:1304
+#, c-format
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "�berspringe %s (ErstellerID '%s')\n"
+
+#: ../sync.c:1498
+#, c-format
+msgid "Installing %s "
+msgstr "Installiere %s"
+
+#: ../sync.c:1504 ../sync.c:1540
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Kann '%s' nicht �ffnen!\n"
+
+#: ../sync.c:1508
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Kann '%s' nicht �ffnen!\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(ErstellerID ist '%s')..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(ErstellerID ist '%s')..."
+
+#: ../sync.c:1530
+#, c-format
+msgid "(SDcard dir %s)... "
+msgstr ""
+
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr "Kann %s nicht �ffnen\n"
+
+#: ../sync.c:1615
+#, c-format
+msgid "Install %s failed"
+msgstr "Installation von %s fehlgeschlagen"
+
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Fehlgeschlagen.\n"
+
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s wurde installiert"
+
+#: ../sync.c:1736
+#, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d Fehler beim Holen der Applikationsinfo %s\n"
+
+#: ../sync.c:1742 ../sync.c:1772
+#, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d Fehler beim Entpacken der Applikationsinfo %s\n"
+
+#: ../sync.c:1763
+#, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Fehler beim Lesen des Applikationsinfoblocks f�r %s\n"
+
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "Kann Kategorie %s auf Ger�t nicht hinzuf�gen.\n"
+
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "Zu viele Kategorieen auf Ger�t.\n"
+
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Alle Datens�tze auf dem Desktop in %s werden nach %s verschoben.\n"
+
+#: ../sync.c:2106 ../sync.c:2824
+#, c-format
+msgid "Syncing %s\n"
+msgstr "Synce %s\n"
+
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
+#, c-format
+msgid "Wrote an %s record."
+msgstr "Habe einen %s-Eintrag geschrieben."
+
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
+#, c-format
+msgid "Writing an %s record failed."
+msgstr "Das Schreiben eines %s Eintrages ist fehlgeschlagen."
+
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
+#, c-format
+msgid "Deleting an %s record failed."
+msgstr "L�schen eines %s-Eintrages ist fehlgeschlagen."
+
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
+#, c-format
+msgid "Deleted an %s record."
+msgstr "Ein %s-Eintrag gel�scht."
+
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "Ein %s-Eintrag gel�scht."
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
+#, c-format
+msgid "Wrote a %s record."
+msgstr "Einen %s-Eintrag geschrieben."
+
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
+#, c-format
+msgid "Writing a %s record failed."
+msgstr "Das Schreiben eines %s-Eintrages ist fehlgeschlagen."
+
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
+#, c-format
+msgid "Deleting a %s record failed."
+msgstr "Das L�schen eines %s-Eintrages ist fehlgeschlagen."
+
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
+#, c-format
+msgid "Deleted a %s record."
+msgstr "Einen %s-Eintrag gel�scht."
+
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "sync is locked by pid %d\n"
+msgid "Sync Conflict: duplicated a %s record."
 msgstr ""
 
-#: ../sync.c:244
-#, fuzzy, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr " Hot-Sync Knopf jetzt dr�cken\n"
-
-#: ../sync.c:297
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
-msgid "Exiting with status %s\n"
-msgstr "Exit-Status: %s\n"
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:298
-msgid "Finished\n"
-msgstr "Fertig!\n"
+#: ../sync.c:2368 ../sync.c:2708
+msgid ""
+"dlp_DeleteRecord failed\n"
+"This could be because the record was already deleted on the Palm\n"
+msgstr ""
+"dlp_DeleteRecord schlug fehl\n"
+"Das kann daran liegen, da� der Eintrag bereits auf dem Palm gel�scht wurde\n"
 
-#: ../sync.c:432
+#: ../sync.c:2937
 msgid "Finished installing user information.\n"
 msgstr ""
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "�berpr�fen Sie die serielle Schnittstelle und die Einstellungen\n"
-
-#: ../sync.c:674
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr " Abgleich mit %s\n"
 
-#: ../sync.c:675
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr " Hot-Sync Knopf jetzt dr�cken\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr "Letzter synchronisierter Benutzername -->\"%s\"\n"
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr "Letzte synchronisierte BenutzerID -->\"%d\"\n"
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr "Lokaler Benutzername -->\"%s\"\n"
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
 msgid " This User ID-->%d\n"
 msgstr "Lokale BenutzerID-->%d\n"
 
-#: ../sync.c:795
+#: ../sync.c:3204
 #, c-format
 msgid "Username is \"%s\"\n"
 msgstr "Benutzername -->\"%s\"\n"
 
-#: ../sync.c:796
+#: ../sync.c:3205
 #, c-format
 msgid "User ID is %d\n"
 msgstr "BenutzerID -->%d\n"
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr "Letzter SyncPC = %d\n"
 
-#: ../sync.c:799
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr "Dieser PC = %lu\n"
 
-#: ../sync.c:800
-#, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Letzter Username = [%s]\n"
-
-#: ../sync.c:801
-#, c-format
-msgid "Last UserID = %d\n"
-msgstr "Letzte BenutzerID = %d\n"
-
-#: ../sync.c:802
-#, c-format
-msgid "Username = [%s]\n"
-msgstr "Benutzername = [%s]\n"
-
-#: ../sync.c:803
-#, c-format
-msgid "userID = %d\n"
-msgstr "BenutzerID = %d\n"
-
-#: ../sync.c:821
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr "Abgleich abgebrochen\n"
 
-#: ../sync.c:843
+#: ../sync.c:3255
 msgid "Finished restoring handheld.\n"
 msgstr "Pilot wurde wiederherstellen.\n"
 
-#: ../sync.c:844
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr ""
 "M�glicherweise m�ssen Sie einen Abgleich (Sync) vornehmen, wenn Sie JPilot "
 "auf den neuesten Stand bringen wollen.\n"
 
-#: ../sync.c:874
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr "Schneller Abgleich\n"
 
-#: ../sync.c:913
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr "Langsamer Abgleich\n"
 
-#: ../sync.c:1014
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr "Danke, da� Sie JPilot benutzt haben."
 
-#: ../sync.c:1056
+#: ../sync.c:3411 ../sync.c:3479
 msgid "Finished.\n"
 msgstr "Fertig.\n"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:3446
 #, c-format
-msgid "Syncing %s\n"
-msgstr "Synce %s\n"
-
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
-#, c-format
-msgid "Wrote an %s record."
-msgstr "Habe einen %s-Eintrag geschrieben."
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:3447
 #, c-format
-msgid "Writing an %s record failed."
-msgstr "Das Schreiben eines %s Eintrages ist fehlgeschlagen."
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:3478
 #, c-format
-msgid "Deleting an %s record failed."
-msgstr "L�schen eines %s-Eintrages ist fehlgeschlagen."
+msgid "Exiting with status %s\n"
+msgstr "Exit-Status: %s\n"
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
-#, c-format
-msgid "Deleted an %s record."
-msgstr "Ein %s-Eintrag gel�scht."
+#: ../todo.c:264
+#, fuzzy, c-format
+msgid "ToDo description text > %d, truncating to %d\n"
+msgstr "Termin-Beschreibung ist zu lang, %d wurde auf %d abgeschnitten.\n"
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
-#, c-format
-msgid "Wrote a %s record."
-msgstr "Einen %s-Eintrag geschrieben."
+#: ../todo.c:270
+#, fuzzy, c-format
+msgid "ToDo note text > %d, truncating to %d\n"
+msgstr "Warnung: Aufgaben-Notiz ist zu lang, wurde auf %d abgeschnitten.\n"
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
-#, c-format
-msgid "Writing a %s record failed."
-msgstr "Das Schreiben eines %s-Eintrages ist fehlgeschlagen."
+#: ../todo_gui.c:159
+msgid "Due Date"
+msgstr "F�lligkeitsdatum"
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
-#, c-format
-msgid "Deleting a %s record failed."
-msgstr "Das L�schen eines %s-Eintrages ist fehlgeschlagen."
+#: ../todo_gui.c:532
+msgid "File doesn't appear to be todo.dat format\n"
+msgstr "Diese Datei scheint nicht im todo.dat Format zu sein.\n"
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
-#, c-format
-msgid "Deleted a %s record."
-msgstr "Einen %s-Eintrag gel�scht."
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
 
-#: ../sync.c:1133
+#: ../todo_gui.c:688
 #, c-format
-msgid "number of records = %d\n"
-msgstr "Anzahl der Eintr�ge: %d\n"
-
-#: ../sync.c:1260 ../sync.c:2435
 msgid ""
-"dlp_DeleteRecord failed\n"
-"This could be because the record was already deleted on the Palm\n"
+"ToDo exported from %s %s on %s\n"
+"\n"
 msgstr ""
-"dlp_DeleteRecord schlug fehl\n"
-"Das kann daran liegen, da� der Eintrag bereits auf dem Palm gel�scht wurde\n"
 
-#: ../sync.c:1358 ../sync.c:1770
+#: ../todo_gui.c:726
 #, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (ErstellerID '%s') ist aktuell und wurde nicht abgeglichen.\n"
+msgid "Can't export todo %d\n"
+msgstr ""
 
-#: ../sync.c:1362 ../sync.c:1774
-#, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Abgleich mit '%s' ... (ErstellerID '%s')... "
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "F�lligkeitsdatum"
 
-#: ../sync.c:1369 ../sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Kann Datei %s nicht erzeugen\n"
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "F�lligkeitsdatum"
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../todo_gui.c:771
 #, fuzzy, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Kann Backup der Datenbank nicht durchf�hren\n"
+msgid "Priority: %d\n"
+msgstr "Priorit�t: "
 
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "Ok\n"
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Erledigt"
 
-#: ../sync.c:1687
+#: ../todo_gui.c:774
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "�berspringe %s (ErstellerID '%s')\n"
+msgid "Description: %s\n"
+msgstr ""
 
-#: ../sync.c:1861
+#: ../todo_gui.c:777
 #, c-format
-msgid "Installing %s "
-msgstr "Installiere %s"
-
-#: ../sync.c:1867
-#, fuzzy, c-format
 msgid ""
+"Note: %s\n"
 "\n"
-"Unable to open file: '%s': %s!\n"
 msgstr ""
-"\n"
-"Kann '%s' nicht �ffnen!\n"
 
-#: ../sync.c:1871
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
+#: ../todo_gui.c:1610
+msgid "Priority out of range\n"
 msgstr ""
-"\n"
-"Kann '%s' nicht �ffnen!\n"
-
-#: ../sync.c:1883
-#, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(ErstellerID ist '%s')..."
-
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr "Kann %s nicht �ffnen\n"
-
-#: ../sync.c:1960
-#, c-format
-msgid "Install %s failed"
-msgstr "Installation von %s fehlgeschlagen"
-
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "Fehlgeschlagen.\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
-msgid "Installed %s "
-msgstr "%s wurde installiert"
+msgid "No date"
+msgstr "Kein F�lligkeitsdatum"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, fuzzy, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Kann %s nicht �ffnen\n"
+#. Completed checkbox
+#: ../todo_gui.c:2411
+msgid "Completed"
+msgstr "Erledigt"
 
-#: ../sync.c:2180
+#: ../todo_gui.c:2418
 #, fuzzy
-msgid "Unable to read home dir\n"
-msgstr "Kann %s nicht �ffnen\n"
-
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "Palm: Anzahl der Eintr�ge: %d\n"
-
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "Disk: Anzahl der Eintr�ge: %d\n"
+msgid "Priority:"
+msgstr "Priorit�t: "
 
-#: ../sync.c:2888
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d Fehler beim Holen der Applikationsinfo %s\n"
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
 
-#: ../sync.c:2894 ../sync.c:2936
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d Fehler beim Entpacken der Applikationsinfo %s\n"
+#: ../todo_gui.c:2441
+msgid "Date Due:"
+msgstr "F�lligkeitsdatum:"
 
-#: ../sync.c:2916 ../sync.c:2928
-#, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Fehler beim Lesen des Applikationsinfoblocks f�r %s\n"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Heute"
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
-#, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "Kann Kategorie %s auf Ger�t nicht hinzuf�gen.\n"
+#: ../utils.c:575
+#, fuzzy, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Kann keine leere DB-Datei finden.\n"
 
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
-msgstr "Zu viele Kategorieen auf Ger�t.\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " ist evtl. nicht installiert.\n"
 
-#: ../sync.c:3074 ../sync.c:3082
-#, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Alle Datens�tze auf dem Desktop in %s werden nach %s verschoben.\n"
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, fuzzy, c-format
+msgid "Can't create directory %s\n"
+msgstr "Kann Kategorie %s nicht l�schen.\n"
 
-#: ../todo.c:248
+#: ../utils.c:623
 #, fuzzy, c-format
-msgid "ToDo description text > %d, truncating to %d\n"
-msgstr "Termin-Beschreibung ist zu lang, %d wurde auf %d abgeschnitten.\n"
+msgid "%s is not a directory\n"
+msgstr "%s ist ein Verzeichnis"
 
-#: ../todo.c:255
+#: ../utils.c:628
 #, fuzzy, c-format
-msgid "ToDo note text > %d, truncating to %d\n"
-msgstr "Warnung: Aufgaben-Notiz ist zu lang, wurde auf %d abgeschnitten.\n"
+msgid "Unable to get write permission for directory %s\n"
+msgstr "Kann Kategorie %s nicht l�schen.\n"
 
-#: ../todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Fehler beim Lesen der Kategorieinfo %s\n"
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Ge�nderten Eintrag speichern?"
 
-#: ../todo_gui.c:149
-msgid "Due Date"
-msgstr "F�lligkeitsdatum"
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Wollen Sie die �nderungen speichern?"
 
-#: ../todo_gui.c:535
-msgid "File doesn't appear to be todo.dat format\n"
-msgstr "Diese Datei scheint nicht im todo.dat Format zu sein.\n"
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Neuen Eintrag speichern?"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
-#, c-format
-msgid "Can't export todo %d\n"
-msgstr ""
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Wollen Sie den neuen Eintrag speichern?"
 
-#: ../todo_gui.c:1547
-msgid "Priority out of range\n"
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
 msgstr ""
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../utils.c:1874
 #, c-format
-msgid "No date"
-msgstr "Kein F�lligkeitsdatum"
-
-#. The completed check box
-#: ../todo_gui.c:2206
-msgid "Completed"
-msgstr "Erledigt"
-
-#: ../todo_gui.c:2214
-msgid "Priority: "
-msgstr "Priorit�t: "
-
-#: ../todo_gui.c:2234
-msgid "Date Due:"
-msgstr "F�lligkeitsdatum:"
-
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "Notiz"
-
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
+msgid " -p skip loading plugins\n"
 msgstr ""
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
+#: ../utils.c:1875
+#, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr ""
 
-#: ../utils.c:75
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1876
+#, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr ""
 
-#: ../utils.c:76
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
 msgstr ""
 
-#: ../utils.c:77
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
 msgstr ""
 
-#: ../utils.c:78
-msgid " -i makes program iconify itself upon launch.\n"
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
 msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr ""
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr ""
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr ""
 
-#: ../utils.c:107
+#: ../utils.c:1921
+#, fuzzy
+msgid "Error reading file"
+msgstr "Fehler beim lesen von %s\n"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Datum der Kompilierung"
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Kompiliert mit folgenden Optionen:"
 
-#: ../utils.c:110
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Installiert in Pfad"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link Version"
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "USB Unterst�tzung"
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "Ja"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-msgid "no"
-msgstr "Nein"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Unterst�tzung f�r private Eintr�ge"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "Nein"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Datebk Unterst�tzung"
 
-#: ../utils.c:134
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Plugin Unterst�tzung"
 
-#: ../utils.c:140
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Manana Unterst�tzung"
 
-#: ../utils.c:146
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "NLS Unterst�tzung (Fremdsprachen)"
 
-#: ../utils.c:152
-msgid "GTK2 support"
-msgstr "GTK2 Unterst�tzung"
-
-#: ../utils.c:207
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Heute ist %A, %x %X"
-
-#: ../utils.c:209
-#, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Heute ist %%A, %s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "Heute"
-
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "Ge�nderten Eintrag speichern?"
-
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "Wollen Sie die �nderungen speichern?"
-
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "Neuen Eintrag speichern?"
-
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "Wollen Sie den neuen Eintrag speichern?"
+#: ../utils.c:2014
+msgid "GTK2 support"
+msgstr "GTK2 Unterst�tzung"
 
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
+#. No HOME var
+#: ../utils.c:2057
+#, c-format
 msgid "Can't get HOME environment variable\n"
 msgstr ""
 
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
+#: ../utils.c:2064
+#, c-format
+msgid "HOME environment variable is too long to process\n"
 msgstr ""
 
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
-#, fuzzy, c-format
-msgid "Can't create directory %s\n"
-msgstr "Kann Kategorie %s nicht l�schen.\n"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Kategorien editieren"
 
-#: ../utils.c:1399
-#, fuzzy, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr "Diese Datei scheint nicht im address.dat Format zu sein\n"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC ID ist 0.\n"
 
-#: ../utils.c:1405
+#: ../utils.c:3234
 #, fuzzy, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "Kann Kategorie %s nicht l�schen.\n"
-
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
-msgstr ""
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Ich habe eine neue PC ID angelegt: %lu\n"
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
 msgstr ""
 
-#: ../utils.c:1483
-#, fuzzy
-msgid "Error opening file: next_id\n"
-msgstr "Fehler beim �ffnen der Datei"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "Heute ist %A, %x %X"
 
-#: ../utils.c:1657
-#, fuzzy, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Kann keine leere DB-Datei finden.\n"
+#: ../utils.c:3539
+#, c-format
+msgid "Today is %%A, %s %s"
+msgstr "Heute ist %%A, %s %s"
 
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-msgid " may not be installed.\n"
-msgstr " ist evtl. nicht installiert.\n"
+#: ../utils.c:3768
+#, c-format
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
+msgstr ""
 
-#: ../utils.c:1839
-#, fuzzy
-msgid "Error reading file"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "Fehler beim lesen von %s\n"
 
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC ID ist 0.\n"
-
-#: ../utils.c:2517
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Ich habe eine neue PC ID angelegt: %lu\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
+msgstr "Fehler beim lesen von %s\n"
 
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Wochenansicht"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Australien"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "�sterreich"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "D�nemark"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr ""
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finnland"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Frankreich"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Deutschland"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 #, fuzzy
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Island"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr ""
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 #, fuzzy
 msgid "Indonesia"
 msgstr "Keiner"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Italien"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Japan"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr ""
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr ""
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 #, fuzzy
 msgid "Netherlands"
 msgstr "Schweiz"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Neuseeland"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Norwegen"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr ""
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr ""
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr ""
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 #, fuzzy
 msgid "Taiwan"
 msgstr "Eisenbahn"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 #, fuzzy
 msgid "Thailand"
 msgstr "Finnland"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr ""
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr ""
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Kosten"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Flugkosten"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Fr�hst�ck"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Bus"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Gesch�ftsessen"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Autoverleih"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Abendessen"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Unterhaltung"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fax"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Benzin"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Geschenke"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hotel"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Nebenkosten"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "W�scherei"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limousine"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Unterkunft"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Mittagessen"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Kilometergeld"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Parken"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Porto"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Imbiss"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "U-Bahn"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Zubeh�r"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taxi"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Trinkgeld"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Maut"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Eisenbahn"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
-msgstr "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "American Express"
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Bar"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Scheck"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
 msgstr "Kreditkarte"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
-msgstr "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
+msgstr "Master Card"
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Vorausbezahlt"
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr ""
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr "American Express"
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "Kreditkarte"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Typ: "
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr "Master Card"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Betrag: "
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 #, fuzzy
 msgid "Category:"
 msgstr "Kategorie:"
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 #, fuzzy
 msgid "Payment:"
 msgstr "Bezahlung: "
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 #, fuzzy
 msgid "Currency:"
 msgstr "W�hrung: "
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-#, fuzzy
-msgid "Date:"
-msgstr "Datum"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Monat:"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Tag:"
 
@@ -2950,77 +3594,106 @@ msgstr "Tag:"
 # msgstr "Woche"
 # msgid "MonthView"
 # msgstr "Monat"
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Jahr:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 #, fuzzy
 msgid "Amount:"
 msgstr "Betrag: "
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 #, fuzzy
 msgid "Vendor:"
 msgstr "Verk�ufer: "
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 #, fuzzy
 msgid "City:"
 msgstr "Stadt:"
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+"%s wurde geschrieben von \n"
+"Judd Montgomery (c) 1999-2001.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Falsches KeyRing Passwort. Bitte erneut eingeben"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Bitte NEUES KeyRing Passwort eingeben"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Bitte KeyRing Passwort eingeben"
 
-#: ../KeyRing/keyring.c:1636
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr ""
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "Abbrechen"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "Konto"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Kann Kategorie %s nicht l�schen.\n"
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3030,53 +3703,228 @@ msgstr ""
 "KeyRing}\n"
 "Passwort"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "Abbrechen"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "Konto"
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "Name: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "Konto: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "Passwort: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Passwort erzeugen"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "Merkzettel synchronisieren"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+"%s wurde geschrieben von \n"
+"Judd Montgomery (c) 1999-2001.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "Fertig"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Datei �berschreiben"
+
+#, fuzzy
+#~ msgid "Field"
+#~ msgstr "Finnland"
+
+#~ msgid "kana("
+#~ msgstr "kana("
+
+#~ msgid "Quick View"
+#~ msgstr "Kurzansicht"
+
+#, fuzzy
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Kann %s nicht �ffnen\n"
+
+#, fuzzy
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Kann %s nicht �ffnen\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "Kann Kategorie %s nicht editieren.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "Kann Kategorie %s nicht l�schen.\n"
+
+#, fuzzy
+#~ msgid "category name"
+#~ msgstr "Kategorie:"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#~ msgid "Close"
+#~ msgstr "Schlie�en"
+
+#~ msgid "none"
+#~ msgstr "Keiner"
+
+#, fuzzy
+#~ msgid "W"
+#~ msgstr "Mi"
+
+#, fuzzy
+#~ msgid "M"
+#~ msgstr "Mo"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Keine Zeitangabe"
+
+#~ msgid "Start Time"
+#~ msgstr "Startzeit"
+
+#~ msgid "End Time"
+#~ msgstr "Endzeit"
+
+#~ msgid "Dismiss"
+#~ msgstr "Verlassen"
+
+#~ msgid "Done"
+#~ msgstr "Fertig"
+
+#~ msgid "Add"
+#~ msgstr "Hinzuf�gen"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Benutzername"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Hilfe/PayBack program"
+
+#~ msgid "Clear"
+#~ msgstr "L�schen"
+
+#, fuzzy
+#~ msgid "Show private records"
+#~ msgstr "Private Eintr�ge anzeigen"
+
+#, fuzzy
+#~ msgid "Hide private records"
+#~ msgstr "Private Eintr�ge verbergen"
+
+#, fuzzy
+#~ msgid "Mask private records"
+#~ msgstr "Private Eintr�ge maskieren (---)"
+
+#~ msgid "Font"
+#~ msgstr "Schrift"
+
+#, fuzzy
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Kann Datei %s nicht �ffnen.\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "Erster Wochentag ist "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Serielle Schnittstelle (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "Memo32 (pedit32) synchronisieren"
+
+#~ msgid "One record"
+#~ msgstr "Einen Eintrag"
+
+#, fuzzy
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr " Hot-Sync Knopf jetzt dr�cken\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "Fertig!\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Letzter Username = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Letzte BenutzerID = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Benutzername = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "BenutzerID = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "Palm: Anzahl der Eintr�ge: %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "Disk: Anzahl der Eintr�ge: %d\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr "Diese Datei scheint nicht im address.dat Format zu sein\n"
+
+#~ msgid "AmEx"
+#~ msgstr "AmEx"
+
+#~ msgid "CreditCard"
+#~ msgstr "Kreditkarte"
+
+#~ msgid "MasterCard"
+#~ msgstr "MasterCard"
+
 #~ msgid "Quit"
 #~ msgstr "Beenden"
 
@@ -3087,9 +3935,6 @@ msgstr "Fertig"
 #~ msgid "Directory"
 #~ msgstr "%s ist ein Verzeichnis"
 
-#~ msgid "Overwrite File"
-#~ msgstr "Datei �berschreiben"
-
 #, fuzzy
 #~ msgid "Filename"
 #~ msgstr "Umbenennen"
@@ -3209,9 +4054,6 @@ msgstr "Fertig"
 #~ msgid "/Web/Konqueror/%s"
 #~ msgstr "/Web/Konqueror/%s"
 
-#~ msgid "Serial Rate "
-#~ msgstr "Schnittstellengeschwindigkeit"
-
 #~ msgid "Holland"
 #~ msgstr "Holland"
 
@@ -3225,28 +4067,12 @@ msgstr "Fertig"
 #~ msgid "Cannot open "
 #~ msgstr "Kann Log-File nicht �ffnen\n"
 
-#, fuzzy
-#~ msgid "_to_install file\n"
-#~ msgstr "Kann jpilot_to_install Datei nicht �ffnen\n"
-
 #~ msgid "Time:"
 #~ msgstr "Zeit:"
 
 #~ msgid "RTh"
 #~ msgstr "Do"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s %s was written by\n"
-#~ "Judd Montgomery (Copyright) 1999-2002.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-#~ msgstr ""
-#~ "%s wurde geschrieben von \n"
-#~ "Judd Montgomery (c) 1999-2001.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-
 #, fuzzy
 #~ msgid "Last Syned UserID-->\"%d\"\n"
 #~ msgstr "Letzte BenutzerID -->\"%d\"\n"
diff --git a/po/es.po b/po/es.po
index 78421b23..f6a11505 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,42 +8,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 1.6.0-pre2\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2007-11-23 20:00+0100\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2008-05-07 10:39-0500\n"
 "Last-Translator: Cristian Oth�n Mart�nez Vera <cfuga@itam.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../address.c:295 ../address.c:539 ../alarms.c:370 ../contact.c:277
-#: ../contact.c:582 ../dat.c:181 ../dat.c:655 ../dat.c:857 ../dat.c:991
-#: ../dat.c:1130 ../datebook.c:89 ../datebook.c:390 ../datebook.c:397
-#: ../datebook.c:427 ../datebook.c:1043 ../jpilot.c:1564 ../libplugin.c:437
-#: ../libplugin.c:719 ../libplugin.c:829 ../libplugin.c:908 ../libplugin.c:952
-#: ../memo.c:95 ../memo.c:384 ../plugins.c:112 ../prefs.c:323 ../prefs.c:348
-#: ../prefs.c:887 ../sync.c:294 ../sync.c:1256 ../sync.c:1311 ../sync.c:1325
-#: ../sync.c:2549 ../sync.c:2618 ../todo.c:206 ../todo.c:543 ../utils.c:2520
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Memoria agotada"
 
-#: ../address.c:352 ../address.c:359 ../contact.c:334 ../datebook.c:340
-#: ../libplugin.c:179 ../memo.c:166 ../memo.c:173 ../todo.c:289 ../todo.c:296
-#: ../utils.c:2130 ../utils.c:2138 ../utils.c:2151 ../utils.c:2159
-#: ../utils.c:2167 ../utils.c:2183 ../utils.c:2192 ../utils.c:2201
-#: ../utils.c:2210 ../utils.c:2220
-msgid "error"
-msgstr "error"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Error al leer la informaci�n de la categor�a %s\n"
 
-#: ../address.c:418 ../address_gui.c:1999 ../contact.c:403 ../datebook.c:686
-#: ../libplugin.c:779 ../libplugin.c:805 ../memo.c:258 ../memo_gui.c:986
-#: ../todo_gui.c:1290 ../Expense/expense.c:1088 ../Expense/expense.c:2088
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Error al leer del fichero: %s\n"
 
-#: ../address_gui.c:391 ../datebook_gui.c:2538 ../memo_gui.c:166
-#: ../todo_gui.c:281 ../KeyRing/keyring.c:634
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "error"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -51,138 +61,238 @@ msgstr ""
 "Este registro fue borrado.\n"
 "Recup�relo o c�pielo para hacer cambios.\n"
 
-#: ../address_gui.c:526 ../address_gui.c:531 ../address_gui.c:541
-#: ../address_gui.c:551 ../address_gui.c:561 ../address_gui.c:572
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
 #, c-format
 msgid "%s%s: %s"
 msgstr "%s%s: %s"
 
-#: ../address_gui.c:650 ../category.c:155 ../category.c:161 ../category.c:209
-#: ../category.c:266 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1212
-#: ../sync.c:1218 ../sync.c:2520 ../sync.c:2823 ../sync.c:2829 ../sync.c:2951
-#: ../sync.c:3273 ../todo_gui.c:421 ../utils.c:2925 ../utils.c:2966
-#: ../utils.c:2972 ../utils.c:3035 ../utils.c:3041 ../utils.c:3102
-#: ../utils.c:3157 ../utils.c:3163 ../utils.c:3224 ../utils.c:3231
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "No se puede abrir el fichero: %s\n"
 
-#: ../address_gui.c:729
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "No se puede abrir el fichero: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "El fichero parece que no est� en el formato de address.dat\n"
 
-#: ../address_gui.c:739 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:546 ../Expense/expense.c:1363
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Sin llenar"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:876 ../alarms.c:289 ../category.c:412 ../category.c:891
-#: ../category.c:944 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:359 ../jpilot.c:404 ../jpilot.c:472
-#: ../jpilot.c:516 ../jpilot.c:1000 ../jpilot.c:1898 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:331 ../todo_gui.c:634 ../utils.c:1188
-#: ../utils.c:1369 ../KeyRing/keyring.c:1597
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "OK"
 
-#: ../address_gui.c:877 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:635 ../utils.c:1387
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "No"
 
-#: ../address_gui.c:877 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:635 ../utils.c:1387
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "S�"
 
-#: ../address_gui.c:900 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:660
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s es un directorio"
 
-#: ../address_gui.c:902 ../address_gui.c:919 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:662
-#: ../todo_gui.c:679
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Error al Abrir el Fichero"
 
-#: ../address_gui.c:906 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:666
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "�Desea sobreescribir el fichero %s?"
 
-#: ../address_gui.c:908 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:668
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "�Sobreescribir el Fichero?"
 
-#: ../address_gui.c:917 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:677
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Error al abrir el Fichero: %s"
 
-#: ../address_gui.c:928
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "No se puede exportar la direcci�n %d\n"
 
-#: ../address_gui.c:996 ../address_gui.c:1004 ../address_gui.c:1024
-msgid "Field"
-msgstr "Campo"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Categor�a: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Privado"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, fuzzy, c-format
+msgid "%s: "
+msgstr "%s%s: %s"
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "Correo electr�nico"
 
-#: ../address_gui.c:1225 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:816
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Tipo de exportaci�n desconocido\n"
 
-#: ../address_gui.c:1473 ../address_gui.c:3385
-msgid "Company/Name"
-msgstr "Compa��a/Nombre"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
 
-#: ../address_gui.c:1475 ../address_gui.c:3387
-msgid "Name/Company"
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Nombre/Compa��a"
+
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Nombre/Compa��a"
 
-#: ../address_gui.c:1602 ../datebook_gui.c:2616 ../memo_gui.c:894
-#: ../todo_gui.c:1218 ../KeyRing/keyring.c:974
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Compa��a/Nombre"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "No se puede modificar un registro que fue borrado\n"
 
-#. Illegal category
-#: ../address_gui.c:1789 ../address_gui.c:2416 ../address_gui.c:3086
-#: ../memo_gui.c:800 ../memo_gui.c:1078 ../memo_gui.c:1368 ../todo_gui.c:1084
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "La categor�a no es legal\n"
 
-#: ../address_gui.c:1841
-msgid "email command empty\n"
-msgstr "comando de correo vac�o\n"
-
-#: ../address_gui.c:1849 ../alarms.c:629 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "ejecutando el comando comando = [%s]\n"
 
-#: ../address_gui.c:2055
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
 msgid "Birthday"
 msgstr "Cumplea�os"
 
-#: ../address_gui.c:2137
+#: ../address_gui.c:2575
 msgid "External program not found, or other error"
 msgstr "No se encuentra el programa externo, u otro error"
 
-#: ../address_gui.c:2138
+#: ../address_gui.c:2577
+#, fuzzy
 msgid ""
-"J-Pilot can not find an external program \"convert\"\n"
+"J-Pilot can not find the external program \"convert\"\n"
 "or an error occurred while executing convert.\n"
 "You may need to install package ImageMagick"
 msgstr ""
@@ -190,324 +300,316 @@ msgstr ""
 "o sucedi� un error al ejecutar convert.\n"
 "Tal vez necesite instalar el paquete ImageMagick"
 
-#: ../address_gui.c:2139
+#: ../address_gui.c:2578
 #, c-format
 msgid "Command executed was \"%s\"\n"
 msgstr "La orden ejecutada fue \"%s\"\n"
 
-#: ../address_gui.c:2140
+#: ../address_gui.c:2579
 #, c-format
 msgid "return code was %d\n"
 msgstr "el c�digo de devoluci�n fue %d\n"
 
-#: ../address_gui.c:2219
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "fall� el bloqueo\n"
+
+#: ../address_gui.c:2660
 msgid "Add Photo"
 msgstr "Agregar Foto"
 
-#. NEW CODE
-#. Fill out the "All" text buffer
 #. Category menu
-#: ../address_gui.c:2441 ../Expense/expense.c:1560 ../KeyRing/keyring.c:2112
-#: ../KeyRing/keyring.c:2213
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Categor�a: "
 
-#. Set dial/email button text and callback data
-#: ../address_gui.c:2460 ../address_gui.c:3644
-msgid "E-mail"
-msgstr "Correo electr�nico"
-
-#: ../address_gui.c:2463 ../address_gui.c:2465 ../address_gui.c:3645
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Correo"
 
 #. Dial Phone Button
-#: ../address_gui.c:2470 ../address_gui.c:2472 ../address_gui.c:3648
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Marcar"
 
-#: ../address_gui.c:2767 ../address_gui.c:2791
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Sin nombre-"
 
-#: ../address_gui.c:2864 ../memo_gui.c:1278 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 registros"
 
-#: ../address_gui.c:2867 ../datebook_gui.c:2414 ../memo_gui.c:1281
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d de %d registros"
 
-#: ../address_gui.c:3258 ../address_gui.c:3265 ../KeyRing/keyring.c:2125
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
 msgid "Name"
 msgstr "Nombre"
 
-#: ../address_gui.c:3259 ../address_gui.c:3260 ../address_gui.c:3261
-#: ../address_gui.c:3266 ../prefs_gui.c:423
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
 msgid "Address"
 msgstr "Direcci�n"
 
-#: ../address_gui.c:3262 ../address_gui.c:3267 ../Expense/expense.c:555
-#: ../Expense/expense.c:1384
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
 msgid "Other"
 msgstr "Otro"
 
-#: ../address_gui.c:3281
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Nota"
+
+#: ../address_gui.c:3844
 msgid "Reverting to Address database\n"
 msgstr "Se regresa a la base de datos Address\n"
 
-#. Edit category button
-#: ../address_gui.c:3360 ../category.c:442 ../category.c:488 ../category.c:506
-#: ../category.c:585 ../category.c:778 ../memo_gui.c:1496 ../todo_gui.c:2101
-#: ../Expense/expense.c:1566
-msgid "Edit Categories"
-msgstr "Editar Categor�as"
-
-#: ../address_gui.c:3391
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Tel�fono"
 
-#: ../address_gui.c:3414
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "B�squeda R�pida: "
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:3430 ../category.c:413 ../category.c:881 ../category.c:934
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4385
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1530
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:322
-#: ../todo_gui.c:2172 ../utils.c:1174 ../KeyRing/keyring.c:1587
-#: ../KeyRing/keyring.c:2154
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../address_gui.c:3430 ../datebook_gui.c:4385 ../memo_gui.c:1530
-#: ../todo_gui.c:2172 ../KeyRing/keyring.c:2154
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "Cancelar las modificaciones"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:3435 ../category.c:413 ../category.c:846
-#: ../datebook_gui.c:4390 ../memo_gui.c:1535 ../todo_gui.c:2177
-#: ../Expense/expense.c:1603 ../KeyRing/keyring.c:2159
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../address_gui.c:3435 ../datebook_gui.c:4390 ../memo_gui.c:1535
-#: ../todo_gui.c:2177 ../Expense/expense.c:1603 ../KeyRing/keyring.c:2159
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Borrar el registro seleccionado"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:3441 ../datebook_gui.c:4396 ../memo_gui.c:1541
-#: ../todo_gui.c:2183 ../KeyRing/keyring.c:2165
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Recuperar"
 
-#: ../address_gui.c:3441 ../datebook_gui.c:4396 ../memo_gui.c:1541
-#: ../todo_gui.c:2183 ../KeyRing/keyring.c:2165
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Recuperar el registro seleccionado"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:3447 ../datebook_gui.c:4402 ../memo_gui.c:1547
-#: ../todo_gui.c:2189 ../Expense/expense.c:1608 ../KeyRing/keyring.c:2171
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../address_gui.c:3447 ../datebook_gui.c:4402 ../memo_gui.c:1547
-#: ../todo_gui.c:2189 ../Expense/expense.c:1608 ../KeyRing/keyring.c:2171
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Copiar el registro seleccionado"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:3453 ../datebook_gui.c:4408 ../memo_gui.c:1553
-#: ../todo_gui.c:2195 ../Expense/expense.c:1613 ../KeyRing/keyring.c:2177
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Nuevo Registro"
 
-#: ../address_gui.c:3453 ../datebook_gui.c:4408 ../memo_gui.c:1553
-#: ../todo_gui.c:2195 ../Expense/expense.c:1613 ../KeyRing/keyring.c:2177
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Agregar un registro nuevo"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:3458 ../datebook_gui.c:4414 ../memo_gui.c:1559
-#: ../todo_gui.c:2201 ../Expense/expense.c:1618 ../KeyRing/keyring.c:2183
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Agregar Registro"
 
-#: ../address_gui.c:3458 ../datebook_gui.c:4414 ../memo_gui.c:1559
-#: ../todo_gui.c:2201 ../Expense/expense.c:1618 ../KeyRing/keyring.c:2183
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Agregar el registro nuevo"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:3468 ../datebook_gui.c:4424 ../memo_gui.c:1569
-#: ../todo_gui.c:2211 ../Expense/expense.c:1627 ../KeyRing/keyring.c:2193
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Aplicar Cambios"
 
-#: ../address_gui.c:3468 ../datebook_gui.c:4424 ../memo_gui.c:1569
-#: ../todo_gui.c:2211 ../Expense/expense.c:1627 ../KeyRing/keyring.c:2193
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "Confirmar las modificaciones"
 
 #. Private check box
-#: ../address_gui.c:3485 ../datebook_gui.c:4475 ../memo_gui.c:1587
-#: ../todo_gui.c:2274
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privado"
 
-#: ../address_gui.c:3582
+#: ../address_gui.c:4169
 msgid "Change Photo"
 msgstr "Cambiar Foto"
 
-#: ../address_gui.c:3587
+#: ../address_gui.c:4174
 msgid "Remove Photo"
 msgstr "Borrar Foto"
 
-#: ../address_gui.c:3654
+#: ../address_gui.c:4246
 msgid "Show In List"
 msgstr "Mostrar Como Lista"
 
-#: ../address_gui.c:3797
+#: ../address_gui.c:4347
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: ../address_gui.c:3813 ../datebook_gui.c:4463
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
 msgid "Days"
 msgstr "D�as"
 
-#. All page
-#. Create a "All" button
-#: ../address_gui.c:3848 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2881
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
 msgid "All"
 msgstr "Todos"
 
-#: ../alarms.c:257 ../datebook_gui.c:4457
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minutos"
 
-#: ../alarms.c:259 ../datebook_gui.c:4461
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Horas"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Recordarme"
 
-#: ../alarms.c:457
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "No se puede abrir el fichero %s%s\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "No se puede abrir el fichero: %s%s\n"
 
-#: ../alarms.c:544
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Recordatorio de Cita"
 
-#: ../alarms.c:547
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Cita Pasada"
 
-#: ../alarms.c:550
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Cita Pospuesta"
 
-#: ../alarms.c:553 ../datebook_gui.c:4293
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../alarms.c:636
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "Alarma de J-Pilot"
 
-#: ../alarms.c:1103
-msgid "infinite loop, breaking\n"
-msgstr "ciclo infinito, interrumpiendo\n"
-
-#: ../alarms.c:1472
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "No se puede abrir el fichero de alarmas %s.alarms\n"
-
-#: ../category.c:188 ../sync.c:2860 ../utils.c:2993 ../utils.c:3071
-#: ../utils.c:3183 ../utils.c:3251
-msgid "rename failed"
-msgstr "fall� el renombrado"
-
-#: ../category.c:225 ../category.c:282 ../sync.c:1245 ../sync.c:2538
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "�Fichero PC corrupto?\n"
 
-#: ../category.c:232 ../category.c:242 ../category.c:289 ../category.c:300
-#: ../category.c:310 ../sync.c:1295 ../sync.c:1359 ../sync.c:1389
-#: ../sync.c:1432 ../sync.c:1449 ../sync.c:1478 ../sync.c:2602 ../sync.c:2654
-#: ../sync.c:2682 ../sync.c:2727 ../sync.c:2741 ../sync.c:2768
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fall� fseek - error fatal\n"
 
-#: ../category.c:413
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "fall� el renombrado"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Mover"
 
-#: ../category.c:443
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Editar Categor�as"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Ya se utiliz� el n�mero m�ximo de categor�as (16)"
 
-#: ../category.c:446
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Editar Nuevas Categor�as"
 
-#: ../category.c:456 ../category.c:463 ../category.c:481
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr "Error de Editar Categor�as"
 
-#: ../category.c:457
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Se debe seleccionar una categor�a para renombrar"
 
 #: ../category.c:461
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "No se puede editar la categor�a %s.\n"
-
-#: ../category.c:468
 msgid "Enter New Category Name"
 msgstr "Introducir Nuevo Nombre de Categor�a"
 
-#: ../category.c:482
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Se debe seleccionar una categor�a para borrar"
 
-#: ../category.c:486
-#, c-format
-msgid "You can't delete category %s.\n"
-msgstr "No se puede borrar la categor�a %s.\n"
-
-#: ../category.c:502
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
@@ -516,199 +618,337 @@ msgstr ""
 "Hay %d registros en %s.\n"
 "�Quiere moverlos a %s, o borrarlos?"
 
-#: ../category.c:561
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "estado inv�lido fichero %s l�nea %d\n"
 
-#: ../category.c:583
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "La categor�a %s no se puede usar m�s de una vez"
 
-#. correctly translate title
-#: ../category.c:805
-msgid "category name"
-msgstr "nombre de categor�a"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "Categor�a:"
 
-#: ../category.c:830
+#: ../category.c:834
 msgid "New"
 msgstr "Nueva"
 
-#: ../category.c:837
+#: ../category.c:841
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../category.c:952
-msgid "debug"
-msgstr "depurar"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "tipo desconocido ="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "cuenta de campos por fila != %d, formato desconocido\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "cuenta de campos != %d, formato desconocido\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Formato desconocido, el fichero tiene un esquema err�neo\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "El esquema del fichero es:"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "Deber�a ser:              "
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
-msgstr "%s:%d Registro %d, campo %d: Tipo inv�lido. Se esperaba %d, se encontr� %d\n"
+msgstr ""
+"%s:%d Registro %d, campo %d: Tipo inv�lido. Se esperaba %d, se encontr� %d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "se termin� la lectura del fichero\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "Se encontr� un repeatType (%d) desconocido en DatebookDB\n"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4118
-#: ../datebook_gui.c:4125
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Repetici�n por:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "se Repite en los D�as:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Repetici�n por:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "se Repite en los D�as:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "se Repite en los D�as:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "se Repite en los D�as:"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Do"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4119
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Lu"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4120
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Ma"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4121
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Mi"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4122
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Ju"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4123
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Vi"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4124
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Sa"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Termina En La Fecha"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "se Repite en los D�as:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "n�mero de registros = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Nota"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Alarma"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Repetici�n por:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "D�a de la semana"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Texto de la descripci�n de la cita > %d, truncando a %d\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Error"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "El fichero parece que no est� en el formato de datebook.dat\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "Tipo de exportaci�n desconocido"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:549
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Exportar"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Exportar Todos los Registros de la Agenda"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Guardar como"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Explorar"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Categor�as de Agenda"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:566 ../search_gui.c:636 ../weekview_gui.c:371
-msgid "Close"
-msgstr "Cerrar"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4640
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Ninguno"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Comienza En La Fecha"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Termina En La Fecha"
 
-#: ../datebook_gui.c:1567 ../prefs.c:431
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../datebook_gui.c:1568 ../prefs.c:432
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "lunes"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "mi�rcoles"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "viernes"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "s�bado"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "Cuarto"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "�ltimo"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -723,18 +963,18 @@ msgstr ""
 "%s del mes.\n"
 "�C�al prefiere?"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "�Pregunta?"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Este es un evento peri�dico.\n"
 "�Desea aplicar estos cambios\n"
@@ -742,49 +982,58 @@ msgstr ""
 "las ocurrencias de este\n"
 "evento?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Actual"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "ninguno"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "d�a"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "semana"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "mes"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "a�o"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "No puede tener una cita que se repite cada %d %s(s)\n"
 
-#: ../datebook_gui.c:2139
-msgid "You can not have a weekly repeating appointment that doesn't repeat on any day of the week."
-msgstr "No puede tener una cita con repetici�n semanal que no se repita en cualquier d�a de la semana."
+#: ../datebook_gui.c:2339
+#, fuzzy
+msgid ""
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
+"day of the week."
+msgstr ""
+"No puede tener una cita con repetici�n semanal que no se repita en cualquier "
+"d�a de la semana."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Sin Hora"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Cita Inv�lida"
 
-#: ../datebook_gui.c:2633
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -792,178 +1041,162 @@ msgstr ""
 "La Fecha de T�rmino de esta cita\n"
 "es anterior a la fecha de inicio."
 
-#. The No due date check box
-#: ../datebook_gui.c:2902 ../datebook_gui.c:4674 ../datebook_gui.c:4704
-#: ../datebook_gui.c:4759 ../datebook_gui.c:4808 ../todo_gui.c:130
-#: ../todo_gui.c:2265
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Sin Fecha"
 
-#: ../datebook_gui.c:3022
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "Error en advanceUnits de DateBookDB = %d\n"
 
-#: ../datebook_gui.c:3193
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "Se encontr� un repeatType desconocido en DatebookDB\n"
-
-#: ../datebook_gui.c:3226
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a., %s"
 
-#: ../datebook_gui.c:3231 ../monthview_gui.c:236 ../weekview_gui.c:221
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (HOY)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4201 ../datebook_gui.c:4642
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Semana"
 
-#: ../datebook_gui.c:4207
-msgid "W"
-msgstr "S"
-
-#: ../datebook_gui.c:4209
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "Ver citas por semana"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4212 ../datebook_gui.c:4643
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Mes"
 
-#: ../datebook_gui.c:4219
-msgid "M"
-msgstr "M"
-
-#: ../datebook_gui.c:4221
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "Ver citas por mes"
 
 #. Make Category button
-#: ../datebook_gui.c:4226
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Categor�as"
 
-#: ../datebook_gui.c:4292
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Hora"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4329
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Mostrar Lista de Pendientes"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2116
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Tarea"
 
-#: ../datebook_gui.c:4345 ../todo_gui.c:2117
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "L�mite"
 
-#: ../datebook_gui.c:4442
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarma"
 
-#: ../datebook_gui.c:4486
-msgid "This Event has no particular time"
-msgstr "Este Evento no tiene una hora en particular"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "Fecha:"
 
-#: ../datebook_gui.c:4494
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Inicia en"
 
-#: ../datebook_gui.c:4508
-msgid "Start Time"
-msgstr "Tiempo de Inicio"
-
-#: ../datebook_gui.c:4526
-msgid "End Time"
-msgstr "Tiempo de Fin"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "Termina en"
 
-#: ../datebook_gui.c:4624
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "Etiquetas DateBk"
 
-#: ../datebook_gui.c:4641
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "D�a"
 
-#: ../datebook_gui.c:4644
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "A�o"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4648
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Este evento no se repetir�"
 
-#: ../datebook_gui.c:4658 ../datebook_gui.c:4690 ../datebook_gui.c:4745
-#: ../datebook_gui.c:4792
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "la Frecuencia es Cada"
 
-#: ../datebook_gui.c:4663
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "D�a(s)"
 
-#. checkbutton
-#: ../datebook_gui.c:4666 ../datebook_gui.c:4698 ../datebook_gui.c:4753
-#: ../datebook_gui.c:4800
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Termina en"
 
-#: ../datebook_gui.c:4695
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "Semana(s)"
 
-#: ../datebook_gui.c:4711
-msgid "Repeat on Days:"
-msgstr "se Repite en los D�as:"
-
-#: ../datebook_gui.c:4750
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "Mes(es)"
 
-#: ../datebook_gui.c:4767
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Repetici�n por:"
 
-#: ../datebook_gui.c:4771
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "D�a de la semana"
 
-#: ../datebook_gui.c:4780
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Fecha"
 
-#: ../datebook_gui.c:4797
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "A�o(s)"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Marcador de Tel�fono"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Prefijo 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Prefijo 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Prefijo 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "N�mero de tel�fono:"
 
@@ -971,491 +1204,392 @@ msgstr "N
 msgid "Extension"
 msgstr "Extensi�n"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "Comando de Marcado"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "Descartar"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Explorador de Ficheros"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Seleccionar registros a exportar"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Utilizar las Teclas Ctrl y May�sculas"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:505
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importar"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Para cambiarlo a un directorio oculto escr�balo a continuaci�n y presione TAB"
-
-#: ../import_gui.c:307 ../prefs_gui.c:973
-msgid "Done"
-msgstr "Hecho"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "Importar Tipo de Fichero"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
 #, c-format
 msgid "Record was marked as private"
 msgstr "El Registro fue marcado como privado"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
 #, c-format
 msgid "Record was not marked as private"
 msgstr "El Registro no fue marcado como privado"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "La categor�a antes de la importaci�n era: [%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "El registro se colocar� en la categor�a [%s]"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Importar Todo"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Saltar"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Instalar"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr ""
+"Para cambiarlo a un directorio oculto escr�balo a continuaci�n y presione TAB"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Ficheros para instalar"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Importar Tipo de Fichero"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Agregar"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Ficheros para instalar"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Remover"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Instalar"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 msgid "Install User"
 msgstr "Instalar Usuario"
 
-#: ../install_user.c:138
-msgid "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
-msgstr "Un dispositivo PalmOS(c) necesita un nombre y un ID de usuario para sincronizar adecuadamente."
+#: ../install_user.c:137
+msgid ""
+"A PalmOS(c) device needs a user name and a user ID in order to sync properly."
+msgstr ""
+"Un dispositivo PalmOS(c) necesita un nombre y un ID de usuario para "
+"sincronizar adecuadamente."
 
-#: ../install_user.c:145
-msgid "If you want to sync more than 1 PalmOS(c) device each one should have a different ID and preferably a different user name."
-msgstr "Si desea sincronizar m�s de un dispositivo PalmOS(c), cada uno debe tener un ID diferente y de preferencia un nombre de usuario diferente."
+#: ../install_user.c:144
+msgid ""
+"If you want to sync more than 1 PalmOS(c) device each one should have a "
+"different ID and preferably a different user name."
+msgstr ""
+"Si desea sincronizar m�s de un dispositivo PalmOS(c), cada uno debe tener un "
+"ID diferente y de preferencia un nombre de usuario diferente."
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr "La mayor�a utiliza su nombre o apodo para el nombre de usuario."
 
-#: ../install_user.c:182
-msgid "User name"
-msgstr "Nombre de usuario"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
+msgstr "Nombre de Usuario"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr "El ID debe ser un n�mero aleatorio."
 
-#: ../install_user.c:194 ../restore_gui.c:304
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "ID de Usuario"
 
-#: ../jpilot-dump.c:97
-msgid " +D +A +T +M format like date +format.\n"
-msgstr " +D +A +T +M formato como date +format.\n"
-
-#: ../jpilot-dump.c:98
-msgid " -v displays version and exits.\n"
-msgstr " -v muestra la versi�n y termina.\n"
-
-#: ../jpilot-dump.c:99 ../utils.c:80
-msgid " -h displays help and exits.\n"
-msgstr " -h muestra la ayuda y termina.\n"
+#: ../jpilot.c:317
+msgid "Print"
+msgstr "Imprimir"
 
-#: ../jpilot-dump.c:100
-msgid " -f displays help for format codes.\n"
-msgstr " -f muestra la ayuda para c�digos de formato.\n"
+#: ../jpilot.c:318
+msgid "There is no print support for this conduit."
+msgstr "No hay soporte de impresora para este conducto."
 
-#: ../jpilot-dump.c:101
-msgid " -D dump DateBook.\n"
-msgstr " -D vuelca DateBook.\n"
+#: ../jpilot.c:384
+msgid "There is no import support for this conduit."
+msgstr "No hay soporte de importaci�n para este conducto."
 
-#: ../jpilot-dump.c:102
-msgid " -i dump DateBook in iCalendar format.\n"
-msgstr " -i vuelca DateBook en formato iCalendar.\n"
+#: ../jpilot.c:428
+msgid "There is no export support for this conduit."
+msgstr "No hay soporte de exportaci�n para este conducto."
 
-#: ../jpilot-dump.c:103
-msgid " -N dump appts for today in DateBook.\n"
-msgstr " -N vuelta las aplicaciones de hoy en DateBook.\n"
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Cancelar la Sincronizaci�n"
 
-#: ../jpilot-dump.c:104
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr " -NAAAA/MM/DD vuelca las aplicaciones de AAAA/MM/DD en DateBook.\n"
-
-#: ../jpilot-dump.c:105
-msgid " -A dump Address book.\n"
-msgstr "-A vuelca Libreta de Direcciones.\n"
-
-#: ../jpilot-dump.c:106
-msgid " -T dump ToDo list as CSV.\n"
-msgstr " -T vuelca la lista de Pendientes como CSV.\n"
-
-#: ../jpilot-dump.c:107
-msgid " -M dump Memos.\n"
-msgstr " -M vuelca Memos.\n"
-
-#: ../jpilot-sync.c:66
-msgid " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr " Se leen las opciones de J-Pilot para obtener el puerto, tasa, n�mero de respaldos, etc.\n"
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr " -v = versi�n\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr " -h = ayuda\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = ejecuci�n en modo de depuraci�n\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = no carga plugins.\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = Hace una sincronizaci�n y despu�s un respaldo, de otra forma s�lo sincroniza.\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l = ciclo, de otra forma sincroniza una vez y termina.\n"
-
-#: ../jpilot-sync.c:73
-msgid " -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr " -p {puerto} = Usa este puerto para sincronizar en lugar del especificado en las opciones.\n"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:138
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Especificaci�n de geometr�a inv�lida: \"%s\"\n"
-
-#: ../jpilot.c:445 ../monthview_gui.c:579 ../print_gui.c:338
-#: ../weekview_gui.c:385
-msgid "Print"
-msgstr "Imprimir"
-
-#: ../jpilot.c:446
-msgid "There is no print support for this conduit."
-msgstr "No hay soporte de impresora para este conducto."
-
-#: ../jpilot.c:506
-msgid "There is no import support for this conduit."
-msgstr "No hay soporte de importaci�n para este conducto."
-
-#: ../jpilot.c:550
-msgid "There is no export support for this conduit."
-msgstr "No hay soporte de exportaci�n para este conducto."
+#. -------------------------------------------
+#: ../jpilot.c:673
+#, fuzzy
+msgid ""
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
+"Read the user manual if you are uncertain."
+msgstr ""
+"Esta palm no tiene el mismo nombre de usuario\n"
+"o ID de usuario con el cual se sincroniz� la\n"
+"�ltima vez.  La sincronizaci�n puede tener\n"
+"efectos indeseados.  Lea el manual de usuario\n"
+"si no est� seguro."
 
 #. -------------------------------------------
-#: ../jpilot.c:726
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
-"Read the user manual if you are uncertain."
-msgstr ""
-"Esta palm no tiene el mismo nombre de usuario\n"
-"o ID de usuario con el cual se sincroniz� la\n"
-"�ltima vez.  La sincronizaci�n puede tener\n"
-"efectos indeseados.  Lea el manual de usuario\n"
-"si no est� seguro."
-
-#. -------------------------------------------
-#: ../jpilot.c:733
-msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Esta palm tiene un id de usuario NULO.\n"
-"Cada palm debe tener un id de usuario �nico para poder sincronizar adecuadamente\n"
+"Cada palm debe tener un id de usuario �nico para poder sincronizar "
+"adecuadamente\n"
 "Si ha sido borrado, use la opci�n \"restaurar\" del men� para restaurarla,\n"
 "o utilice pilot-xfer.\n"
-"Para agregar un nombre de usuario y ID utilice la herramienta de l�nea de comandos install-user,\n"
+"Para agregar un nombre de usuario y ID utilice la herramienta de l�nea de "
+"comandos install-user,\n"
 "o utilice instalar usuario del men�\n"
 "Lea el manual de usuario si tiene dudas."
 
-#: ../jpilot.c:740
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Cancelar la Sincronizaci�n"
 
-#: ../jpilot.c:740
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Sincronizar de Cualquier Manera"
 
-#: ../jpilot.c:749 ../jpilot.c:753
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Problema de Sincronizaci�n"
 
-#: ../jpilot.c:991
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr "Usuario: "
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "Comando desconocido en el proceso de sincronizaci�n\n"
 
-#: ../jpilot.c:1012 ../Expense/expense.c:500 ../KeyRing/keyring.c:1752
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../jpilot.c:1415
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Fichero/arrancar"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Fichero/_Buscar"
 
-#: ../jpilot.c:1418 ../jpilot.c:1424 ../jpilot.c:1427
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Fichero/sep1"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Fichero/_Instalar"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Fichero/Importar"
 
-#: ../jpilot.c:1421
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Fichero/Exportar"
 
-#: ../jpilot.c:1422 ../jpilot.c:2901
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Fichero/Preferencias"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Fichero/Im_primir"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Fichero/Instalar _Usuario"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Fichero/Restaurar Dispositivo Port�til"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Fichero/_Salir"
 
-#: ../jpilot.c:1429
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Ver"
 
-#: ../jpilot.c:1430 ../jpilot.c:1431 ../jpilot.c:1432 ../jpilot.c:1683
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Ver/Ocultar los Registros Privados"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Ver/Mostrar los Registros Privados"
 
-#: ../jpilot.c:1432
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Ver/Enmascarar los Registros Privados"
 
-#: ../jpilot.c:1433
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Ver/sep1"
 
-#: ../jpilot.c:1434
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Ver/Agenda"
 
-#: ../jpilot.c:1435
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Ver/Direcciones"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Ver/Pendientes"
 
-#: ../jpilot.c:1437
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Ver/Memor�ndums"
 
-#: ../jpilot.c:1438 ../jpilot.c:1569
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Plugins"
 
-#: ../jpilot.c:1440
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1441
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/Netscape"
 
-#: ../jpilot.c:1445
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/Mozilla"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/Galeon"
 
-#: ../jpilot.c:1455
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/Opera"
 
-#: ../jpilot.c:1459
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/GnomeUrl"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/Lynx"
 
-#: ../jpilot.c:1463
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/Links"
 
-#: ../jpilot.c:1465
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W3M"
 
-#: ../jpilot.c:1467
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/Konqueror"
 
-#: ../jpilot.c:1470
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../jpilot.c:1471
-msgid "/Help/PayBack program"
-msgstr "/Ayuda/programa PayBack"
-
-#: ../jpilot.c:1472
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/Ayuda/Acerca de J-Pilot"
 
-#: ../jpilot.c:1536
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Plugins/%s"
 
-#: ../jpilot.c:1547
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Ayuda/%s"
 
-#: ../jpilot.c:1846
-msgid "Font Selection Dialog"
-msgstr "Di�logo de Selecci�n de Tipo de Letra"
-
-#: ../jpilot.c:2220
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "calendario:inicio_semana:0"
 
-#: ../jpilot.c:2269
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "No se cargaron los plugins.\n"
 
-#: ../jpilot.c:2273
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "Se ignoran todas las alarmas.\n"
 
-#: ../jpilot.c:2277
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "Se ignoran las alarmas pasadas.\n"
 
-#: ../jpilot.c:2372 ../jpilot.c:2380
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "No se puede abrir la tuber�a\n"
 
-#: ../jpilot.c:2431
-msgid " User: "
-msgstr "Usuario: "
-
-#: ../jpilot.c:2572
-msgid "Clear"
-msgstr "Borrar"
-
-#: ../jpilot.c:2657
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "Mostrar los registros privados   Ctrl-Z"
 
-#: ../jpilot.c:2662
-msgid "Show private records"
-msgstr "Mostrar los registros privados"
-
-#: ../jpilot.c:2667
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "Ocultar los registros privados   Ctrl-Z"
 
-#: ../jpilot.c:2672
-msgid "Hide private records"
-msgstr "Ocultar los registros privados"
-
-#: ../jpilot.c:2677
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "Enmascarar los registros privados   Ctrl-Z"
 
-#: ../jpilot.c:2682
-msgid "Mask private records"
-msgstr "Enmascarar los registros privados"
-
-#: ../jpilot.c:2692
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Sincronizar su palm con el escritorio  Ctrl-Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2698
-msgid "Font"
-msgstr "Tipo de letra"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Sincronizr direcciones"
 
-#: ../jpilot.c:2713
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1463,831 +1597,1273 @@ msgstr ""
 "Sincronizar su palm con el escritorio\n"
 "y entonces hacer un respaldo"
 
-#: ../jpilot.c:2827
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Agenda/Ir al D�a de Hoy"
 
-#: ../jpilot.c:2829
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Libreta de Direcciones"
 
-#: ../jpilot.c:2831
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Lista de Pendientes"
 
-#: ../jpilot.c:2833
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Bloc de Notas"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "Hazlo ahora"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Recordar m�s tarde"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "�No lo repita!"
 
-#: ../jpilot.c:2897
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters (accents for example).\n"
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
+"(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
-"J-Pilot est� utilizando las herramientas gr�ficas GTK2. Esta versi�n de usa UTF-8 para codificar los caracteres.\n"
-"Debe escoger un conjunto de caracteres UTF-8 para que pueda ver los caracteres que no sean ASCII (por ejemplo, acentos)\n"
+"J-Pilot est� utilizando las herramientas gr�ficas GTK2. Esta versi�n de usa "
+"UTF-8 para codificar los caracteres.\n"
+"Debe escoger un conjunto de caracteres UTF-8 para que pueda ver los "
+"caracteres que no sean ASCII (por ejemplo, acentos)\n"
 "\n"
 
-#: ../jpilot.c:2900
-msgid "Go to the menu \""
-msgstr "Vaya al men� \""
-
-#: ../jpilot.c:2902
-msgid "\" and change the \""
-msgstr "\" y cambie el \""
-
 #. Character Set
-#: ../jpilot.c:2903 ../prefs_gui.c:443
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Conjunto de Caracteres "
 
-#: ../jpilot.c:2904
-msgid "\"."
-msgstr "\"."
-
-#: ../jpilot.c:2906
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Escoja una codificaci�n UTF-8"
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:92
 #, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "Versi�n desconocida de encabezado PC = %d\n"
+msgid " +D +A +T +M format like date +format.\n"
+msgstr " +D +A +T +M formato como date +format.\n"
 
-#: ../libplugin.c:411
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d Error al leer el fichero: %s\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v muestra la versi�n y termina.\n"
 
-#: ../libplugin.c:417 ../libplugin.c:446 ../sync.c:3249 ../todo.c:389
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Error al leer el fichero: %s\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h muestra la ayuda y termina.\n"
 
-#: ../libplugin.c:473 ../utils.c:2052
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
-msgstr ""
-"Este registro ya fue borrado.\n"
-"Est� destinado a ser borrado de la Palm en la pr�xima sincronizaci�n.\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -f muestra la ayuda para c�digos de formato.\n"
 
-#: ../libplugin.c:482 ../utils.c:2064 ../utils.c:2111
-msgid "Unable to open PC records file\n"
-msgstr "No se puede abrir el fichero de registros PC\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -D vuelca DateBook.\n"
 
-#: ../libplugin.c:488 ../utils.c:2073
-msgid "Couldn't find record to delete\n"
-msgstr "No se puede encontrar el registro a borrar.\n"
+#: ../jpilot-dump.c:97
+#, fuzzy, c-format
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr " -i vuelca DateBook en formato iCalendar.\n"
 
-#: ../libplugin.c:506 ../utils.c:2094
-#, c-format
-msgid "Unknown header version %d\n"
-msgstr "Versi�n de encabezado %d desconocida\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N vuelta las aplicaciones de hoy en DateBook.\n"
 
-#: ../libplugin.c:519
-msgid "Couldn't open PC records file\n"
-msgstr "No se puede abrir el fichero de registros PC\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr " -NAAAA/MM/DD vuelca las aplicaciones de AAAA/MM/DD en DateBook.\n"
 
-#: ../libplugin.c:680 ../libplugin.c:772 ../utils.c:1570 ../utils.c:1583
-#, c-format
-msgid "Error opening file: %s\n"
-msgstr "Error al abrir el fichero: %s\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr "-A vuelca Libreta de Direcciones.\n"
 
-#: ../libplugin.c:709
-msgid "Error reading PC file 1\n"
-msgstr "Error al leer el fichero PC 1\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -T vuelca la lista de Pendientes como CSV.\n"
 
-#: ../libplugin.c:725
-msgid "Error reading PC file 2\n"
-msgstr "Error al leer el fichero PC 2\n"
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M vuelca Memos.\n"
 
-#: ../libplugin.c:900
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Error reading %s 5\n"
-msgstr "Error al leer %s 5\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "No se puede abrir el fichero de registro, cediendo.\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "No se puede abrir el fichero: %s\n"
 
-#: ../log.c:102
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "No se puede abrir el fichero de registro\n"
-
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "Texto de la nota > 65535, se trunca\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "Nota Importada %s\n"
-
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "El fichero parece que no est� en el formato de memopad.dat\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:271
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "No se puede exportar la nota %d\n"
-
-#: ../monthview_gui.c:521
-msgid "Monthly View"
-msgstr "Vista Mensual"
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Contrase�a de la Palm"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Incorrecta, Reintroducir la Contrase�a de PalmOS"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "Introducir la Contrase�a de PalmOS"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../plugins.c:90 ../plugins.c:204 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "ciclo infinito"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../plugins.c:217
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "Al leer %s%s l�nea 1:[%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../plugins.c:218
-msgid "Wrong Version\n"
-msgstr "Versi�n Err�nea\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../plugins.c:219
-msgid "Check preferences->conduits\n"
-msgstr "Revise preferencias->conduits\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../plugins.c:275
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
-"No se puede abrir el plugin [%s]\n"
-" error [%s]\n"
 
-#: ../plugins.c:292 ../plugins.c:318
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " el plugin es inv�lido: [%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: ../plugins.c:300
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "Plugin:[%s]\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../plugins.c:301
+#: ../jpilot-merge.c:299
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "Este plugin es versi�n (%d.%d).\n"
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: ../plugins.c:303
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "Es demasiado antiguo para funcionar con esta versi�n de J-Pilot.\n"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: ../prefs.c:400
-msgid "%B %d, %Y"
-msgstr "%B %d, %Y"
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+" Se leen las opciones de J-Pilot para obtener el puerto, tasa, n�mero de "
+"respaldos, etc.\n"
 
-#: ../prefs.c:401
-msgid "%d %B %Y"
-msgstr "%d de %B de %Y"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v  muestra la versi�n y opciones de compilaci�n y termina.\n"
 
-#: ../prefs.c:402
-msgid "%d. %B %Y"
-msgstr "%d. %B %Y"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d muestra la informaci�n de depuraci�n a la salida est�ndard.\n"
 
-#: ../prefs.c:403
-msgid "%d %B, %Y"
-msgstr "%B %d, %Y"
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr " -p evita la carga de los plugins.\n"
 
-#: ../prefs.c:404
-msgid "%Y. %B. %d"
-msgstr "%Y. %B. %d"
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
 
-#: ../prefs.c:405
-msgid "%Y %B %d"
-msgstr "%Y %B %d"
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l = ciclo, de otra forma sincroniza una vez y termina.\n"
 
-#: ../prefs_gui.c:387
-msgid "Preferences"
-msgstr "Preferencias"
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+" -p {puerto} = Usa este puerto para sincronizar en lugar del especificado en "
+"las opciones.\n"
 
-#: ../prefs_gui.c:417
-msgid "Locale"
-msgstr "Local"
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Error al abrir el fichero: %s\n"
 
-#: ../prefs_gui.c:419
-msgid "Settings"
-msgstr "Opciones"
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
 
-#: ../prefs_gui.c:421
-msgid "Datebook"
-msgstr "Agenda"
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Error al abrir el fichero: next_id\n"
 
-#: ../prefs_gui.c:425
-msgid "ToDo"
-msgstr "Lista de Pendientes"
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
 
-#: ../prefs_gui.c:427
-msgid "Memo"
-msgstr "Notas"
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Error"
 
-#: ../prefs_gui.c:429
-msgid "Alarms"
-msgstr "Alarmas"
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
 
-#: ../prefs_gui.c:431
-msgid "Conduits"
-msgstr "Conductos"
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
 
-#. Shortdate
-#: ../prefs_gui.c:456
-msgid "Short date format "
-msgstr "Formato de fecha corta "
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#. Longdate
-#: ../prefs_gui.c:469
-msgid "Long date format "
-msgstr "Formato de fecha larga "
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
 
-#. Time
-#: ../prefs_gui.c:482
-msgid "Time format "
-msgstr "Formato de hora "
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
 
-#: ../prefs_gui.c:496
-msgid "The first day of the week is "
-msgstr "El primer d�a de la semana es "
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "Su variable de ambiente HOME es demasiado larga para m�\n"
 
-#. GTK colors file
-#: ../prefs_gui.c:517
-msgid "My GTK colors file is "
-msgstr "Mi fichero de colores GTK es "
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
 
-#. Port
-#: ../prefs_gui.c:530
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Puerto Serial (/dev/ttyS0, /dev/pilot)"
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
 
-#. Rate
-#: ../prefs_gui.c:547
-msgid "Serial Rate"
-msgstr "Tasa Serial"
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, fuzzy, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+"Un dispositivo PalmOS(c) necesita un nombre y un ID de usuario para "
+"sincronizar adecuadamente."
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"Este registro ya fue borrado.\n"
+"Est� destinado a ser borrado de la Palm en la pr�xima sincronizaci�n.\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "No se puede abrir el fichero de registros PC\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "No se puede encontrar el registro a borrar.\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "Versi�n de encabezado %d desconocida\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d Error al leer el fichero: %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Error al leer el fichero: %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "Error al abrir el fichero: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "Error al leer %s 5\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "Error al leer el fichero PC 1\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "Error al leer el fichero PC 2\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "Versi�n desconocida de encabezado PC = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "No se puede abrir el fichero de registro, cediendo.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "No se puede abrir el fichero de registro\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "Texto de la nota > 65535, se trunca\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "Nota Importada %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "El fichero parece que no est� en el formato de memopad.dat\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "No se puede exportar la nota %d\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Bloc de Notas"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Vista Mensual"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+#, fuzzy
+msgid "last char truncated"
+msgstr "�ltimo cambio: "
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Contrase�a de la Palm"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Incorrecta, Reintroducir la Contrase�a de PalmOS"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Introducir la Contrase�a de PalmOS"
+
+#: ../pidfile.c:69
+#, fuzzy
+msgid "removing stale pidfile\n"
+msgstr "el fichero _to_install\n"
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Error al leer del fichero: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "ciclo infinito"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "Al leer %s%s l�nea 1:[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "Versi�n Err�nea\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "Revise preferencias->conduits\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"No se puede abrir el plugin [%s]\n"
+" error [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " el plugin es inv�lido: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "Plugin:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "Este plugin es versi�n (%d.%d).\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "Es demasiado antiguo para funcionar con esta versi�n de J-Pilot.\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr "%B %d, %Y"
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr "%d de %B de %Y"
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr "%d. %B %Y"
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr "%B %d, %Y"
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
+msgstr "%Y. %B. %d"
+
+#: ../prefs.c:423
+msgid "%Y %B %d"
+msgstr "%Y %B %d"
+
+#: ../prefs_gui.c:452
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../prefs_gui.c:483
+msgid "Locale"
+msgstr "Local"
+
+#: ../prefs_gui.c:485
+msgid "Settings"
+msgstr "Opciones"
+
+#: ../prefs_gui.c:487
+msgid "Datebook"
+msgstr "Agenda"
+
+#: ../prefs_gui.c:491
+msgid "ToDo"
+msgstr "Lista de Pendientes"
+
+#: ../prefs_gui.c:493
+msgid "Memo"
+msgstr "Notas"
+
+#: ../prefs_gui.c:495
+msgid "Alarms"
+msgstr "Alarmas"
+
+#: ../prefs_gui.c:497
+msgid "Conduits"
+msgstr "Conductos"
+
+#. Shortdate
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
+msgstr "Formato de fecha corta "
+
+#. Longdate
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
+msgstr "Formato de fecha larga "
+
+#. Time
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
+msgstr "Formato de hora "
+
+#. GTK colors file
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
+msgstr "Mi fichero de colores GTK es "
+
+#. Port
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Problema de Sincronizaci�n"
+
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr "Tasa Serial"
 
 #. Number of backups
-#: ../prefs_gui.c:560
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "N�mero de respaldos para archivar"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:577
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Mostrar los registros borrados (por omisi�n NO)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:581
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Mostrar los registros borrados modificados (por omisi�n NO)"
 
-#: ../prefs_gui.c:586
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
-msgstr "Pedir confirmaci�n para la instalaci�n de ficheros (J-Pilot -> PDA) (por omisi�n S�)"
+msgstr ""
+"Pedir confirmaci�n para la instalaci�n de ficheros (J-Pilot -> PDA) (por "
+"omisi�n S�)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:590
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Mostrar consejos de botones (por omisi�n S�)"
 
-#: ../prefs_gui.c:602
-msgid "Use Datebook database (Palm OS <= 3.5)"
+#: ../prefs_gui.c:666
+#, fuzzy
+msgid "Use Datebook database (Palm OS < 5.2.1)"
 msgstr "Usar la base de datos Datebook (Palm OS <= 3.5)"
 
-#: ../prefs_gui.c:605
-msgid "Use Calendar database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:669
+#, fuzzy
+msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr "Usar la base de datos Calendar (Palm OS >= 4.0)"
 
 #. Show highlight days check box
-#: ../prefs_gui.c:632
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Remarcar los d�as del calendario con citas"
 
-#. Show use DateBk check box
-#: ../prefs_gui.c:638
-msgid "Use DateBk note tags"
-msgstr "Usar las marcas de notas DateBk"
-
-#: ../prefs_gui.c:641
-msgid "DateBk support disabled in this build"
-msgstr "Soporte para DateBk desactivado en esta compilaci�n"
-
 #. Highlight today on month and week view
-#: ../prefs_gui.c:648
+#: ../prefs_gui.c:700
 msgid "Annotate today in day, week, and month views"
 msgstr "Anotar hoy en las vistas de d�a, semana y mes"
 
-#: ../prefs_gui.c:653
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
 msgid "Append years on anniversaries in day, week, and month views"
 msgstr "Agregar a�os en aniversarios en las vistas de d�a, semana y mes"
 
-#: ../prefs_gui.c:664
-msgid "Use Address database (Palm OS <= 3.5)"
+#. Show use DateBk check box
+#: ../prefs_gui.c:710
+msgid "Use DateBk note tags"
+msgstr "Usar las marcas de notas DateBk"
+
+#: ../prefs_gui.c:713
+msgid "DateBk support disabled in this build"
+msgstr "Soporte para DateBk desactivado en esta compilaci�n"
+
+#: ../prefs_gui.c:725
+#, fuzzy
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr "Usar la base de datos Address (Palm OS <= 3.5)"
 
-#: ../prefs_gui.c:667
-msgid "Use Contacts database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:728
+#, fuzzy
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr "Usar la base de datos Contacts (Palm OS >= 4.0)"
 
-#: ../prefs_gui.c:696
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Comando de Correo"
 
-#: ../prefs_gui.c:710
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s se reemplaza con la direcci�n de correo electr�nico"
 
-#: ../prefs_gui.c:722
-msgid "Use ToDo database (Palm OS <= 3.5) "
+#: ../prefs_gui.c:783
+#, fuzzy
+msgid "Use ToDo database (Palm OS < 5.2.1)"
 msgstr "Usar la base de datos ToDo (Palm OS <= 3.5)"
 
-#: ../prefs_gui.c:725
-msgid "Use Task database (Palm OS >= 4.0) "
+#: ../prefs_gui.c:786
+#, fuzzy
+msgid "Use Task database (Palm OS > 5.2)"
 msgstr "Usar la base de datos Task (Palm OS => 4.0)"
 
-#. The hide completed check box
-#: ../prefs_gui.c:752
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Ocultar los Pendientes Completados"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:756
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Ocultar los Pendientes sin completar"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:760
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Registrar Fecha de T�rmino"
 
 #. Use Manana check box
-#: ../prefs_gui.c:765
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Utilizar la base de datos Ma�ana"
 
-#: ../prefs_gui.c:773
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "Utilizar el n�mero de d�as l�mite por omisi�n"
 
-#: ../prefs_gui.c:794
-msgid "Use Memo database (Palm OS <= 3.5)"
+#: ../prefs_gui.c:856
+#, fuzzy
+msgid "Use Memo database (Palm OS < 5.2.1)"
 msgstr "Usar la base de datos Memo (Palm OS <= 3.5)"
 
-#: ../prefs_gui.c:797
-msgid "Use Memos database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:859
+#, fuzzy
+msgid "Use Memos database (Palm OS > 5.2)"
 msgstr "Usar la base de datos Memos (Palm OS => 4.0)"
 
-#: ../prefs_gui.c:800
+#: ../prefs_gui.c:862
 msgid "Use Memo32 database (pedit32)"
 msgstr "Usar la base de datos Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:847
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Abrir ventanas de alarma para recordatorios de citas"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:851
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Ejecutar este comando"
 
-#. Shell warning
-#: ../prefs_gui.c:855
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
-msgstr "AVISO: ���ejecutar comandos arbitrarios del shell puede ser peligroso!!!"
+msgstr ""
+"AVISO: ���ejecutar comandos arbitrarios del shell puede ser peligroso!!!"
 
-#: ../prefs_gui.c:863
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Comando de la Alarma"
 
-#: ../prefs_gui.c:876
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "se reemplaza %t con la hora de la alarma"
 
-#: ../prefs_gui.c:880
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "se reemplaza %d con la fecha de la alarma"
 
-#: ../prefs_gui.c:885
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "se reemplaza %D con la descripci�n de la alarma"
 
-#: ../prefs_gui.c:889
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "se reemplaza %N con la nota de la alarma"
 
-#: ../prefs_gui.c:893
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
-msgstr "%D (sustituci�n de la descripci�n) est� desactivado en esta compilaci�n"
+msgstr ""
+"%D (sustituci�n de la descripci�n) est� desactivado en esta compilaci�n"
 
-#: ../prefs_gui.c:897
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%n (sustituci�n de notas) est� desactivado en esta compilaci�n"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:906
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Sincronizar agenda"
 
-#. Show sync address check box
-#: ../prefs_gui.c:910
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Sincronizr direcciones"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:914
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Sincronizar pendientes"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:925
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Sincronizar memor�ndums"
 
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:930
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Sincronizar Ma�ana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:936
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Usar J-OS (PalmOS No Japon�s:WorkPad/CLIE)"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:949
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "Sincronizando %s (%s)"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Opciones de Impresi�n"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Tama�o del Papel"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Impresi�n Diaria"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Impresi�n Semanal"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Impresi�n Mensual"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "Un registro"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Se borr� un registro %s."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Todos los registros en esta categor�a"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Imprimir todos los registros"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Un registro por p�gina"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " L�neas en blanco alrededor de cada registro"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Comando de Impresi�n (p.e. lpr, � cat > fichero.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:238
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Restaurar Dispositivo Port�til"
 
-#: ../restore_gui.c:178
-msgid ""
-"Unable to convert filename for GTK display\n"
-"See console log to find which file will not be restored"
+#: ../restore_gui.c:174 ../restore_gui.c:176
+#, fuzzy
+msgid "Unable to convert filename for GTK display\n"
 msgstr ""
 "No se puede convertir el nombre de fichero para mostrar en GTK\n"
-"Vea el registro de la consola para encontrar cual fichero no se restaurar�"
+"El fichero %s no se restaurar�\n"
 
-#: ../restore_gui.c:180
-#, c-format
-msgid ""
-"Unable to convert filename for GTK display\n"
-"File %s will not be restored\n"
+#: ../restore_gui.c:175
+#, fuzzy
+msgid "See console log to find which file will not be restored\n"
 msgstr ""
 "No se puede convertir el nombre de fichero para mostrar en GTK\n"
-"El fichero %s no se restaurar�\n"
+"Vea el registro de la consola para encontrar cual fichero no se restaurar�"
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Ficheros para instalar"
 
 #. Label for instructions
-#: ../restore_gui.c:258
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Para restaurar su dispositivo port�til:"
 
-#: ../restore_gui.c:261
-msgid "1. Choose all the applications you wish to restore.  The default is all."
-msgstr "1. Escoja todas las aplicaciones que desee restaurar.  Por omisi�n son todas."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
+msgstr ""
+"1. Escoja todas las aplicaciones que desee restaurar.  Por omisi�n son todas."
 
-#: ../restore_gui.c:264
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Introduzca el Nombre de Usuario y el ID de Usuario."
 
-#: ../restore_gui.c:267
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Presione el bot�n OK."
 
-#: ../restore_gui.c:270
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
-msgstr "Esto sobreescribir� los datos que est�n actualmente en el dispositivo port�til."
-
-#: ../restore_gui.c:291
-msgid "User Name"
-msgstr "Nombre de Usuario"
+msgstr ""
+"Esto sobreescribir� los datos que est�n actualmente en el dispositivo "
+"port�til."
 
-#: ../search_gui.c:123
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "agenda"
 
-#: ../search_gui.c:204
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "direcci�n"
 
-#: ../search_gui.c:270
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "pendientes"
 
-#: ../search_gui.c:324
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "memor�ndums"
 
-#: ../search_gui.c:380
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "memor�ndums"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "� plugin ?"
 
-#: ../search_gui.c:458
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "No se encontraron registros"
 
-#: ../search_gui.c:559 ../search_gui.c:622
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Buscar"
 
-#: ../search_gui.c:575
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Buscar por: "
 
-#: ../search_gui.c:582
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Sensible a May�sculas/Min�sculas"
 
-#: ../sync.c:142
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "fall� al abrir el fichero de bloqueo\n"
 
-#: ../sync.c:155
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "fall� el bloqueo\n"
 
-#: ../sync.c:158
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "el fichero de sincronizaci�n est� bloqueado por el pid %d\n"
 
-#: ../sync.c:192
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "fall� el desbloqueo\n"
 
-#: ../sync.c:195
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "la sincronizaci�n est� bloqueada por el pid %d\n"
 
-#: ../sync.c:286
-#, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s: presione el bot�n hotsync en la base o ejecute \"kill %d\"\n"
-
-#: ../sync.c:339
-#, c-format
-msgid "Exiting with status %s\n"
-msgstr "Saliendo con estado %s\n"
-
-#: ../sync.c:340
-msgid "Finished\n"
-msgstr "Terminado\n"
-
-#: ../sync.c:474
-msgid "Finished installing user information.\n"
-msgstr "Se termin� de instalar la informaci�n del usuario.\n"
-
-#: ../sync.c:499 ../sync.c:617
-msgid "Check your serial port and settings\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
 msgstr "Revise su puerto serial y sus opciones\n"
 
-#: ../sync.c:802
-#, c-format
-msgid " Syncing on device %s\n"
-msgstr " Sincronizando en el dispositivo %s\n"
-
-#: ../sync.c:803
-msgid " Press the HotSync button now\n"
-msgstr " Presione el bot�n HotSync ahora\n"
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "No se leer el directorio inicial\n"
 
-#: ../sync.c:855 ../sync.c:877 ../sync.c:899
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "�ltimo Nombre de Usuario Sincronizado-->\"%s\"\n"
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (ID de Creador '%s') est� actualizado, se salt� la obtenci�n.\n"
 
-#: ../sync.c:856 ../sync.c:878 ../sync.c:900
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "�ltimo ID de Usuario Sincronizado-->\"%d\"\n"
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Obteniendo '%s' (ID de Creador '%s')... "
 
-#: ../sync.c:857 ../sync.c:879 ../sync.c:901
+#: ../sync.c:1096 ../sync.c:1433
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr "Este Nombre de Usuario-->\"%s\"\n"
+msgid "Failed, unable to create file %s\n"
+msgstr "Fall�, no se puede crear el fichero %s\n"
 
-#: ../sync.c:858 ../sync.c:880 ../sync.c:902
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr "Este ID de Usuario-->\"%d\"\n"
+msgid "Failed, unable to back up database %s\n"
+msgstr "Fall�, no se puede respaldar la base de datos %s\n"
 
-#: ../sync.c:923
-#, c-format
-msgid "Username is \"%s\"\n"
-msgstr "El Nombre de Usuario es \"%s\"\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "OK\n"
 
-#: ../sync.c:924
+#: ../sync.c:1304
 #, c-format
-msgid "User ID is %d\n"
-msgstr "El ID de Usuario es %d\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "Saltando %s (ID de Creador '%s')\n"
 
-#: ../sync.c:926 ../sync.c:934
+#: ../sync.c:1498
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "�ltimoSyncPC = %d\n"
+msgid "Installing %s "
+msgstr "Instalando %s "
 
-#: ../sync.c:927
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
-msgid "This PC = %lu\n"
-msgstr "Este PC = %lu\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"�No se puede abrir el fichero: '%s': %s!\n"
 
-#: ../sync.c:930
+#: ../sync.c:1508
 #, c-format
-msgid "Last Username = [%s]\n"
-msgstr "�ltimo Nombre de Usuario = [%s]\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"No se puede sincronizar el fichero: '%s': �Fichero corrupto?\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(El ID de Creador es '%s')..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(El ID de Creador es '%s')..."
 
-#: ../sync.c:931
+#: ../sync.c:1530
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "�ltimo ID de Usuario = %d\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:932
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "Nombre de Usuario = [%s]\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"No se puede abrir el fichero: %s\n"
 
-#: ../sync.c:933
+#: ../sync.c:1615
 #, c-format
-msgid "userID = %d\n"
-msgstr "ID de Usuario = %d\n"
+msgid "Install %s failed"
+msgstr "Fall� la instalaci�n de %s"
 
-#: ../sync.c:951
-msgid "Sync canceled\n"
-msgstr "Sincronizaci�n cancelada\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Fall�.\n"
 
-#: ../sync.c:974
-msgid "Finished restoring handheld.\n"
-msgstr "Finished restoring handheld.\n"
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s instalado "
 
-#: ../sync.c:975
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "Tal vez necesite sincronizar para actualizar J-Pilot.\n"
+#: ../sync.c:1736
+#, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d Error al obtener la informaci�n de la apliciaci�n %s\n"
 
-#: ../sync.c:1006
-msgid "Doing a fast sync.\n"
-msgstr "Haciendo una sincronizaci�n r�pida.\n"
+#: ../sync.c:1742 ../sync.c:1772
+#, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d Error al desempaquetar la informaci�n de la aplicaci�n %s\n"
 
-#: ../sync.c:1019
-msgid "Doing a slow sync.\n"
-msgstr "Haciendo una sincronizaci�n lenta.\n"
+#: ../sync.c:1763
+#, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Error al leer el bloque de informaci�n de la aplicaci�n %s\n"
 
-#: ../sync.c:1094
-msgid "Thank you for using J-Pilot."
-msgstr "Gracias por usar J-Pilot."
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "No se puede agregar la categor�a %s al remoto.\n"
 
-#: ../sync.c:1139
-msgid "Finished.\n"
-msgstr "Finished.\n"
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "Demasiadas categor�as en el remoto.\n"
+
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Todos los registros del escritorio en %s se mover�n a %s.\n"
 
-#: ../sync.c:1179 ../sync.c:2923
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Sincronizando %s\n"
 
-#: ../sync.c:1187 ../sync.c:2496 ../sync.c:2931
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Se escribi� un registro %s."
 
-#: ../sync.c:1189 ../sync.c:2498 ../sync.c:2933
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Fall� la escritura de un registro %s."
 
-#: ../sync.c:1191 ../sync.c:2500 ../sync.c:2935
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Fall� el borrado de un registro %s."
 
-#: ../sync.c:1193 ../sync.c:2502 ../sync.c:2937
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Se borr� un registro %s."
 
-#: ../sync.c:1195 ../sync.c:2504
+#: ../sync.c:2122 ../sync.c:2475
 #, c-format
 msgid "Sync Conflict: duplicated an %s record."
 msgstr "Conflicto de Sincronizaci�n: se duplic� un registro %s."
 
-#: ../sync.c:1198 ../sync.c:2507 ../sync.c:2940
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Se escribi� un registro %s."
 
-#: ../sync.c:1200 ../sync.c:2509 ../sync.c:2942
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Fall� la escritura de un registro %s."
 
-#: ../sync.c:1202 ../sync.c:2511 ../sync.c:2944
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Fall� el borrado de un registro %s."
 
-#: ../sync.c:1204 ../sync.c:2513 ../sync.c:2946
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Se borr� un registro %s."
 
-#: ../sync.c:1206 ../sync.c:2515
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
 msgid "Sync Conflict: duplicated a %s record."
 msgstr "Conflicto de Sincronizaci�n: se duplic� un registro %s."
 
-#: ../sync.c:1228
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
-msgid "number of records = %d\n"
-msgstr "n�mero de registros = %d\n"
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:1376 ../sync.c:2668
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2295,761 +2871,845 @@ msgstr ""
 "Fall� dlp_DeleteRecord\n"
 "Esto puede ser porque el registro ya fue borrado en la Palm\n"
 
-#: ../sync.c:1551 ../sync.c:1994
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (ID de Creador '%s') est� actualizado, se salt� la obtenci�n.\n"
-
-#: ../sync.c:1555 ../sync.c:1998
-#, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Obteniendo '%s' (ID de Creador '%s')... "
-
-#: ../sync.c:1562 ../sync.c:2004
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Fall�, no se puede crear el fichero %s\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "Se termin� de instalar la informaci�n del usuario.\n"
 
-#: ../sync.c:1573 ../sync.c:2013
+#: ../sync.c:3094
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Fall�, no se puede respaldar la base de datos %s\n"
+msgid " Syncing on device %s\n"
+msgstr " Sincronizando en el dispositivo %s\n"
 
-#: ../sync.c:1577 ../sync.c:2017 ../sync.c:2199
-msgid "OK\n"
-msgstr "OK\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " Presione el bot�n HotSync ahora\n"
 
-#: ../sync.c:1870
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "Saltando %s (ID de Creador '%s')\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "�ltimo Nombre de Usuario Sincronizado-->\"%s\"\n"
 
-#: ../sync.c:2085
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Installing %s "
-msgstr "Instalando %s "
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "�ltimo ID de Usuario Sincronizado-->\"%d\"\n"
 
-#: ../sync.c:2091
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"�No se puede abrir el fichero: '%s': %s!\n"
+msgid " This Username-->\"%s\"\n"
+msgstr "Este Nombre de Usuario-->\"%s\"\n"
 
-#: ../sync.c:2095
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"No se puede sincronizar el fichero: '%s': �Fichero corrupto?\n"
+msgid " This User ID-->%d\n"
+msgstr "Este ID de Usuario-->\"%d\"\n"
 
-#: ../sync.c:2107
+#: ../sync.c:3204
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(El ID de Creador es '%s')..."
+msgid "Username is \"%s\"\n"
+msgstr "El Nombre de Usuario es \"%s\"\n"
 
-#: ../sync.c:2127 ../sync.c:2140 ../sync.c:2155 ../sync.c:2168
+#: ../sync.c:3205
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"No se puede abrir el fichero: %s\n"
+msgid "User ID is %d\n"
+msgstr "El ID de Usuario es %d\n"
 
-#: ../sync.c:2184
+#: ../sync.c:3207
 #, c-format
-msgid "Install %s failed"
-msgstr "Fall� la instalaci�n de %s"
-
-#: ../sync.c:2188
-msgid "Failed.\n"
-msgstr "Fall�.\n"
+msgid "lastSyncPC = %d\n"
+msgstr "�ltimoSyncPC = %d\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:2195
+#: ../sync.c:3208
 #, c-format
-msgid "Installed %s "
-msgstr "%s instalado "
+msgid "This PC = %lu\n"
+msgstr "Este PC = %lu\n"
 
-#: ../sync.c:2219 ../sync.c:2225
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "No se puede abrir el fichero: %s%s\n"
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "Sincronizaci�n cancelada\n"
 
-#: ../sync.c:2404
-msgid "Unable to read home dir\n"
-msgstr "No se leer el directorio inicial\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "Finished restoring handheld.\n"
 
-#: ../sync.c:3025
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: n�mero de registros = %d\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "Tal vez necesite sincronizar para actualizar J-Pilot.\n"
 
-#: ../sync.c:3026
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "disco: n�mero de registros = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "Haciendo una sincronizaci�n r�pida.\n"
 
-#: ../sync.c:3258
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d Error al obtener la informaci�n de la apliciaci�n %s\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "Haciendo una sincronizaci�n lenta.\n"
 
-#: ../sync.c:3264 ../sync.c:3305
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d Error al desempaquetar la informaci�n de la aplicaci�n %s\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "Gracias por usar J-Pilot."
 
-#: ../sync.c:3286 ../sync.c:3298
-#, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Error al leer el bloque de informaci�n de la aplicaci�n %s\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "Finished.\n"
 
-#. Fix - need a func for this logging
-#: ../sync.c:3442 ../sync.c:3446
+#: ../sync.c:3446
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "No se puede agregar la categor�a %s al remoto.\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#: ../sync.c:3443 ../sync.c:3449
+#: ../sync.c:3447
 #, c-format
-msgid "Too many categories on remote.\n"
-msgstr "Demasiadas categor�as en el remoto.\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:3444 ../sync.c:3452
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Todos los registros del escritorio en %s se mover�n a %s.\n"
+msgid "Exiting with status %s\n"
+msgstr "Saliendo con estado %s\n"
 
-#: ../todo.c:247
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "Texto de la descripci�n de Pendiente > %d, truncando a %d\n"
 
-#: ../todo.c:253
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "texto de la nota de Pendientes > %d, truncando a %d\n"
 
-#: ../todo.c:378
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Error al leer la informaci�n de la categor�a %s\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Fecha L�mite"
 
-#: ../todo_gui.c:536
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "El fichero parece no estar en el formato de todo.dat\n"
 
-#: ../todo_gui.c:692 ../todo_gui.c:707
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "No se puede exportar el pendiente %d\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Fecha L�mite"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Fecha L�mite"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "Prioridad: "
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Completada"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "Prioridad fuera de rango\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1092
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Sin Fecha"
 
-#. The completed check box
-#: ../todo_gui.c:2226
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Completada"
 
-#: ../todo_gui.c:2234
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "Prioridad: "
 
-#: ../todo_gui.c:2254
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "Fecha L�mite:"
 
-#. Note textbox
-#: ../todo_gui.c:2316 ../Expense/expense.c:1819 ../KeyRing/keyring.c:2256
-msgid "Note"
-msgstr "Nota"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Hoy"
+
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "No se puede encontrar el fichero DB %s vac�o: %s.\n"
+
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr "tal vez no est� instalado.\n"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "No se puede crear el directorio %s\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s es un directorio"
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "No se puede escribir ficheros en el directorio %s\n"
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "�Guardar el Registro Modificado?"
+
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "�Desea guardar los cambios hechos a este registro?"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "�Guardar el Registro Nuevo?"
 
-#: ../utils.c:79
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v  muestra la versi�n y opciones de compilaci�n y termina.\n"
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "�Desea guardar este registro nuevo?"
 
-#: ../utils.c:81
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d muestra la informaci�n de depuraci�n a la salida est�ndard.\n"
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "ciclo infinito, interrumpiendo\n"
 
-#: ../utils.c:82
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr " -p evita la carga de los plugins.\n"
 
-#: ../utils.c:83
-msgid " -a ignores missed alarms since the last time program was run.\n"
-msgstr " -a ignora las alarmas perdidas desde la �ltima vez que se ejecut� este programa.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
+msgstr ""
+" -a ignora las alarmas perdidas desde la �ltima vez que se ejecut� este "
+"programa.\n"
 
-#: ../utils.c:84
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A ignora todas las alarmas, pasadas y futuras.\n"
 
-#: ../utils.c:85
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i hace que este programa se iconifique al iniciar.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:86
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
-msgstr " Las variables de ambiente PILOTPORT, y PILOTRATE se utilizan para especificar\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
+msgstr ""
+" Las variables de ambiente PILOTPORT, y PILOTRATE se utilizan para "
+"especificar\n"
 
-#: ../utils.c:87
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " en c�al puerto sincronizar, y a qu� velocidad.\n"
 
-#: ../utils.c:88
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " Si no se establece PILOTPORT, entonces usa /dev/pilot por omisi�n.\n"
 
-#: ../utils.c:114
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Error al leer el fichero"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Fecha de compilaci�n"
 
-#: ../utils.c:115
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Compilado con las siguientes opciones:"
 
-#: ../utils.c:117
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Ruta de Instalaci�n"
 
-#: ../utils.c:119
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link versi�n"
 
-#: ../utils.c:123
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "soporte USB"
 
-#: ../utils.c:125 ../utils.c:131 ../utils.c:137 ../utils.c:143 ../utils.c:149
-#: ../utils.c:155 ../utils.c:161
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "s�"
 
-#: ../utils.c:127 ../utils.c:133 ../utils.c:139 ../utils.c:145 ../utils.c:151
-#: ../utils.c:157 ../utils.c:163
-msgid "no"
-msgstr "no"
-
-#: ../utils.c:129
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Soporte para registros privados"
 
-#: ../utils.c:135
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "no"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Soporte para Datebk"
 
-#: ../utils.c:141
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Soporte para plugins"
 
-#: ../utils.c:147
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Soporte para Ma�ana"
 
-#: ../utils.c:153
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "Soporte para NLS (idiomas extranjeros)"
 
-#: ../utils.c:159
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "Soporte para GTK2"
 
-#: ../utils.c:273
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Hoy es %A, %x %X"
-
-#: ../utils.c:275
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Hoy es %%A, %s %s"
-
-#: ../utils.c:1180
-msgid "Today"
-msgstr "Hoy"
+msgid "Can't get HOME environment variable\n"
+msgstr "No se puede la variable de ambiente HOME\n"
 
-#: ../utils.c:1396
-msgid "Save Changed Record?"
-msgstr "�Guardar el Registro Modificado?"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
+msgstr "Su variable de ambiente HOME es demasiado larga para m�\n"
 
-#: ../utils.c:1397
-msgid "Do you want to save the changes to this record?"
-msgstr "�Desea guardar los cambios hechos a este registro?"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Editar Categor�as"
 
-#: ../utils.c:1402
-msgid "Save New Record?"
-msgstr "�Guardar el Registro Nuevo?"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "el ID de PC es 0.\n"
 
-#: ../utils.c:1403
-msgid "Do you want to save this new record?"
-msgstr "�Desea guardar este registro nuevo?"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Se ha generado un ID nuevo de PC.  Es %lu\n"
 
-#. Not home;
-#: ../utils.c:1423 ../KeyRing/keyring.c:1646
-msgid "Can't get HOME environment variable\n"
-msgstr "No se puede la variable de ambiente HOME\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1430
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "Su variable de ambiente HOME es demasiado larga para m�\n"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "Hoy es %A, %x %X"
 
-#. Can't create directory
-#: ../utils.c:1455 ../utils.c:1459
+#: ../utils.c:3539
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr "No se puede crear el directorio %s\n"
+msgid "Today is %%A, %s %s"
+msgstr "Hoy es %%A, %s %s"
 
-#: ../utils.c:1465
+#: ../utils.c:3768
 #, c-format
 msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
-"Parece que %s no es un directorio.\n"
-"Necesita serlo.\n"
-
-#: ../utils.c:1471
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "No se puede escribir ficheros en el directorio %s\n"
 
-#: ../utils.c:1527 ../utils.c:1536
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "Error al escribir el encabezado PC al fichero: next_id\n"
 
-#: ../utils.c:1532
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
 msgstr "Error al escribir el siguiente id al fichero: next_id\n"
 
-#: ../utils.c:1549
-msgid "Error opening file: next_id\n"
-msgstr "Error al abrir el fichero: next_id\n"
-
-#: ../utils.c:1746
-#, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "No se puede encontrar el fichero DB %s vac�o: %s.\n"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1749
-msgid " may not be installed.\n"
-msgstr "tal vez no est� instalado.\n"
-
-#: ../utils.c:1930
-msgid "Error reading file"
-msgstr "Error al leer el fichero"
-
-#: ../utils.c:2671
-msgid "PC ID is 0.\n"
-msgstr "el ID de PC es 0.\n"
-
-#: ../utils.c:2672
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Se ha generado un ID nuevo de PC.  Es %lu\n"
-
-#: ../weekview_gui.c:328
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Vista Semanal"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Australia"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Austria"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "B�lgica"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Canad�"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "UE (Euro)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Francia"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Alemania"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "India"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Italia"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Jap�n"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Corea"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Malasia"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "M�xico"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Pa�ses Bajos"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Nueva Zelandia"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Noruega"
 
 # �Ups! Es abreviatura de Corea o de China? cfuga
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "R.P.Corea"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Espa�a"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Suiza"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Taiw�n"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Gastos"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1367
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "TarifaA�rea"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1368
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Desayuno"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1369
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Autob�s"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1370
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "ComidadNegocios"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1371
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "RentaAuto"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1372
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Cena"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1373
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Diversi�n"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1374
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fax"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1375
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Combustible"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1376
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Regalos"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1377
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hotel"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1378
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Incidentales"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1379
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Lavander�a"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1380
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limusina"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1381
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Alojamiento"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1382
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Almuerzo"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1383
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Millaje"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1385
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Estacionamiento"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1386
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Estampillas"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1387
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Bocadillo"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1388
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Subterr�neo"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1389
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Recursos"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1390
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taxi"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1391
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Tel�fono"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1392
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Propinas"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1393
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Peajes"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1394
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Tren"
 
-#: ../Expense/expense.c:1167
-msgid "Expense: Unknown category\n"
-msgstr "Gastos: Categor�a desconocida\n"
-
-#: ../Expense/expense.c:1173
+#: ../Expense/expense.c:1237
 msgid "Expense: Unknown expense type\n"
 msgstr "Gastos: Tipo de gasto desconocido\n"
 
-#: ../Expense/expense.c:1179
+#: ../Expense/expense.c:1243
 msgid "Expense: Unknown payment type\n"
 msgstr "Gastos: Tipo de pago desconocido\n"
 
-#: ../Expense/expense.c:1356
+#: ../Expense/expense.c:1375
 msgid "American Express"
 msgstr "American Express"
 
-#: ../Expense/expense.c:1357
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Efectivo"
 
-#: ../Expense/expense.c:1358
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Cheque"
 
-#: ../Expense/expense.c:1359
+#: ../Expense/expense.c:1378
 msgid "Credit Card"
 msgstr "Tarjeta de Cr�dito"
 
-#: ../Expense/expense.c:1360
+#: ../Expense/expense.c:1379
 msgid "Master Card"
 msgstr "Master Card"
 
-#: ../Expense/expense.c:1361
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Prepago"
 
-#: ../Expense/expense.c:1362
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Tipo:"
+
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Cantidad:"
+
 #. Category Menu
-#: ../Expense/expense.c:1644
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Categor�a:"
 
 #. Type Menu
-#: ../Expense/expense.c:1657
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Tipo:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1670
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Pago:"
 
 #. Currency Menu
-#: ../Expense/expense.c:1683
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Moneda:"
 
-#. Date Spinners
-#: ../Expense/expense.c:1696
-msgid "Date:"
-msgstr "Fecha:"
-
-#: ../Expense/expense.c:1713
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Mes:"
 
-#: ../Expense/expense.c:1727
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "D�a:"
 
-#: ../Expense/expense.c:1741
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "A�o:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1754
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Cantidad:"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1768
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Vendedor:"
 
 #. City
-#: ../Expense/expense.c:1782
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "Ciudad:"
 
 #. Attendees
-#: ../Expense/expense.c:1796
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Asistentes"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+"%s %s fue escrito por\n"
+"Judd Montgomery (c) 1999-2002.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "KeyRing: pack_KeyRing(): buf_size demasiado peque�o\n"
 
-#: ../KeyRing/keyring.c:1561
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Incorrecta, Reintroducir la Contrase�a de KeyRing"
 
-#: ../KeyRing/keyring.c:1563
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Introducir una Contrase�a NUEVA de KeyRing"
 
-#: ../KeyRing/keyring.c:1565
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Introducir la Contrase�a de KeyRing"
 
-#: ../KeyRing/keyring.c:1651
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "Su variable de ambiente HOME es demasiado larga (>1024)\n"
-
-#: ../KeyRing/keyring.c:1656
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "KeyRing: no se encuentra el fichero %s.\n"
 
-#: ../KeyRing/keyring.c:1657
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "KeyRing: Pruebe sincronizando.\n"
 
-#: ../KeyRing/keyring.c:1741 ../KeyRing/keyring.c:1752
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "KeyRing"
 
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "No se puede exportar la nota %d\n"
+
 #. Change Password button
-#: ../KeyRing/keyring.c:2039
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3060,65 +3720,248 @@ msgstr ""
 "KeyRing"
 
 #. Clist
-#: ../KeyRing/keyring.c:2124
+#: ../KeyRing/keyring.c:2564
 msgid "Changed"
 msgstr "Modificado"
 
-#: ../KeyRing/keyring.c:2126
+#: ../KeyRing/keyring.c:2566
 msgid "Account"
 msgstr "Cuenta"
 
 #. Name entry
-#: ../KeyRing/keyring.c:2219
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "nombre: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2226
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "cuenta: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2233
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "contrase�a: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2240
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr "�ltimo cambio: "
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2250
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Generar Contrase�a"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 msgid "SyncTime"
 msgstr "SyncTime"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+"%s %s fue escrito por\n"
+"Judd Montgomery (c) 1999-2002.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr "synctime: Palm OS Versi�n 3.25 y 3.30 no admiten SyncTime\n"
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr "synctime: NO se modifica la hora en el pilot\n"
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr "synctime: Se modifica la hora en el pilot..."
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 msgid "Done\n"
 msgstr "Hecho\n"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Sobreescribir el Fichero"
+
+#~ msgid "Field"
+#~ msgstr "Campo"
+
+#~ msgid "email command empty\n"
+#~ msgstr "comando de correo vac�o\n"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "No se puede abrir el fichero %s%s\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "No se puede abrir el fichero de alarmas %s.alarms\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "No se puede editar la categor�a %s.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "No se puede borrar la categor�a %s.\n"
+
+#~ msgid "category name"
+#~ msgstr "nombre de categor�a"
+
+#~ msgid "debug"
+#~ msgstr "depurar"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#~ msgid "none"
+#~ msgstr "ninguno"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "Se encontr� un repeatType desconocido en DatebookDB\n"
+
+#~ msgid "W"
+#~ msgstr "S"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Este Evento no tiene una hora en particular"
+
+#~ msgid "Start Time"
+#~ msgstr "Tiempo de Inicio"
+
+#~ msgid "End Time"
+#~ msgstr "Tiempo de Fin"
+
+#~ msgid "Dismiss"
+#~ msgstr "Descartar"
+
+#~ msgid "Done"
+#~ msgstr "Hecho"
+
+#~ msgid "Add"
+#~ msgstr "Agregar"
+
+#~ msgid "Remove"
+#~ msgstr "Remover"
+
+#~ msgid "User name"
+#~ msgstr "Nombre de usuario"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = versi�n\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = ayuda\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = ejecuci�n en modo de depuraci�n\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = no carga plugins.\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr ""
+#~ " -b = Hace una sincronizaci�n y despu�s un respaldo, de otra forma s�lo "
+#~ "sincroniza.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Especificaci�n de geometr�a inv�lida: \"%s\"\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Ayuda/programa PayBack"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "Di�logo de Selecci�n de Tipo de Letra"
+
+#~ msgid "Clear"
+#~ msgstr "Borrar"
+
+#~ msgid "Show private records"
+#~ msgstr "Mostrar los registros privados"
+
+#~ msgid "Hide private records"
+#~ msgstr "Ocultar los registros privados"
+
+#~ msgid "Mask private records"
+#~ msgstr "Enmascarar los registros privados"
+
+#~ msgid "Font"
+#~ msgstr "Tipo de letra"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "Vaya al men� \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" y cambie el \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "No se puede abrir el fichero de registros PC\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "El primer d�a de la semana es "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Puerto Serial (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "One record"
+#~ msgstr "Un registro"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s: presione el bot�n hotsync en la base o ejecute \"kill %d\"\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "Terminado\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "�ltimo Nombre de Usuario = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "�ltimo ID de Usuario = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Nombre de Usuario = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "ID de Usuario = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: n�mero de registros = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "disco: n�mero de registros = %d\n"
+
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i hace que este programa se iconifique al iniciar.\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "Parece que %s no es un directorio.\n"
+#~ "Necesita serlo.\n"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "Gastos: Categor�a desconocida\n"
+
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "Su variable de ambiente HOME es demasiado larga (>1024)\n"
+
 #~ msgid "Directory"
 #~ msgstr "Directorio"
 
-#~ msgid "Overwrite File"
-#~ msgstr "Sobreescribir el Fichero"
-
 #~ msgid "Filename"
 #~ msgstr "Nombre de fichero"
 
@@ -3201,7 +4044,8 @@ msgstr "Hecho\n"
 #~ "    este programa.\n"
 #~ " -A ignora todas las alarmas, pasadas y futuras.\n"
 #~ " -i hace que jpilot se iconifique despu�s de cargarse.\n"
-#~ " Las variables de ambiente PILOTPORT y PILOTRATE se utilizan para especificar\n"
+#~ " Las variables de ambiente PILOTPORT y PILOTRATE se utilizan para "
+#~ "especificar\n"
 #~ " en qu� puerto se sincroniza, y a qu� velocidad.\n"
 #~ " Si PILOTPORT no est� definido entonces por omisi�n es /dev/pilot.\n"
 
@@ -3234,7 +4078,9 @@ msgstr "Hecho\n"
 #~ msgstr "Error al leer de %s: %s %d\n"
 
 #~ msgid "Warning ToDo description too long, truncating to %d\n"
-#~ msgstr "Aviso la descripci�n de la Lista de Pendientes es demasiado larga, truncando a %d\n"
+#~ msgstr ""
+#~ "Aviso la descripci�n de la Lista de Pendientes es demasiado larga, "
+#~ "truncando a %d\n"
 
 #~ msgid "Show Preferences"
 #~ msgstr "Mostrar Preferencias"
@@ -3281,25 +4127,11 @@ msgstr "Hecho\n"
 #~ msgid "Cannot open "
 #~ msgstr "No se puede abrir "
 
-#~ msgid "_to_install file\n"
-#~ msgstr "el fichero _to_install\n"
-
 #~ msgid "RTh"
 #~ msgstr "Ju"
 
 #~ msgid "Time:"
 #~ msgstr "Hora:"
 
-#~ msgid ""
-#~ "%s %s was written by\n"
-#~ "Judd Montgomery (Copyright) 1999-2002.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-#~ msgstr ""
-#~ "%s %s fue escrito por\n"
-#~ "Judd Montgomery (c) 1999-2002.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-
 #~ msgid "Last Syned UserID-->\"%d\"\n"
 #~ msgstr "�ltimo ID de Usuario Sincronizado-->\"%d\"\n"
diff --git a/po/fr.po b/po/fr.po
index c98620c7..22620a7e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.9-pre1\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2012-01-08 13:39+0100\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2004-10-01 23:05+0100\n"
 "Last-Translator: Ludovic Rousseau <ludovic.rousseau@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -15,43 +15,43 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../address.c:276 ../address.c:448 ../alarms.c:332 ../calendar.c:309
-#: ../calendar.c:547 ../contact.c:324 ../contact.c:738 ../dat.c:189
-#: ../dat.c:655 ../dat.c:859 ../dat.c:993 ../dat.c:1132 ../datebook.c:130
-#: ../datebook.c:165 ../datebook.c:172 ../datebook.c:231 ../jpilot.c:1254
-#: ../jpilot-merge.c:95 ../libplugin.c:208 ../libplugin.c:455
-#: ../libplugin.c:534 ../libplugin.c:563 ../libplugin.c:811 ../memo.c:214
-#: ../memo.c:287 ../otherconv.c:280 ../plugins.c:112 ../prefs.c:350
-#: ../prefs.c:375 ../prefs.c:906 ../sync.c:2170 ../sync.c:2187 ../sync.c:2296
-#: ../sync.c:2310 ../sync.c:2507 ../sync.c:2646 ../todo.c:236 ../todo.c:490
-#: ../utils.c:748
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
 #, c-format
 msgid "Out of memory"
 msgstr "Plus de mémoire"
 
-#: ../address.c:332 ../calendar.c:230 ../contact.c:580 ../datebook.c:494
-#: ../memo.c:87 ../todo.c:90
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
 #, c-format
 msgid "%s:%d Error reading application info %s\n"
 msgstr "%s:%d Erreur de lecture application info %s\n"
 
-#: ../address.c:344 ../address_gui.c:2285 ../address_gui.c:2324
-#: ../calendar.c:246 ../contact.c:596 ../datebook.c:514 ../datebook_gui.c:3737
-#: ../libplugin.c:405 ../libplugin.c:431 ../memo.c:99 ../memo_gui.c:863
-#: ../todo_gui.c:1070 ../Expense/expense.c:1105
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Erreur en lecture: %s\n"
 
-#: ../address.c:492 ../calendar.c:598 ../calendar.c:607 ../contact.c:780
-#: ../libplugin.c:846 ../memo.c:353 ../todo.c:302 ../utils.c:1124
-#: ../utils.c:1131 ../utils.c:1138 ../utils.c:1145 ../utils.c:1152
-#: ../utils.c:1159
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
 msgid "error"
 msgstr "erreur"
 
-#: ../address_gui.c:325 ../datebook_gui.c:2844 ../memo_gui.c:176
-#: ../todo_gui.c:292 ../KeyRing/keyring.c:834
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -59,100 +59,100 @@ msgstr ""
 "Cet enregistrement est effacé.\n"
 "Restaurez le ou copier le avant de pouvoir le modifier.\n"
 
-#: ../address_gui.c:452 ../address_gui.c:458 ../address_gui.c:469
-#: ../address_gui.c:481 ../address_gui.c:493 ../address_gui.c:506
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
 #, c-format
 msgid "%s%s: %s"
 msgstr "%s%s : %s"
 
-#: ../address_gui.c:542 ../category.c:118 ../category.c:176 ../category.c:330
-#: ../category.c:336 ../datebook_gui.c:430 ../jpilot-merge.c:88
-#: ../jpilot-merge.c:146 ../jpilot-merge.c:151 ../memo_gui.c:280
-#: ../sync.c:2129 ../sync.c:2135 ../sync.c:2481 ../sync.c:2842
-#: ../todo_gui.c:416 ../utils.c:2674 ../utils.c:2711 ../utils.c:2717
-#: ../utils.c:2776 ../utils.c:2782 ../utils.c:2836 ../utils.c:2890
-#: ../utils.c:2896 ../utils.c:2954 ../utils.c:2961
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Impossible d'ouvrir: %s\n"
 
-#: ../address_gui.c:561
+#: ../address_gui.c:559
 #, c-format
 msgid "Unable to read file: %s\n"
 msgstr "Impossible de lire: %s\n"
 
-#: ../address_gui.c:715
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Le fichier n'est pas du type carnet d'adresses\n"
 
-#: ../address_gui.c:725 ../datebook_gui.c:647 ../memo_gui.c:324
-#: ../memo_gui.c:417 ../todo_gui.c:542 ../Expense/expense.c:1384
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Non renseigné"
 
-#: ../address_gui.c:781 ../datebook_gui.c:698 ../memo_gui.c:470
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
 #: ../todo_gui.c:595
 msgid "CSV (Comma Separated Values)"
 msgstr ""
 
-#: ../address_gui.c:782
+#: ../address_gui.c:780
 msgid "DAT/ABA (Palm Archive Formats)"
 msgstr ""
 
 #. current category name
 #. previous category name
 #. entry text, in Pilot character set
-#: ../address_gui.c:868 ../category.c:408 ../datebook_gui.c:729
-#: ../jpilot.c:234 ../jpilot.c:278 ../jpilot.c:352 ../jpilot.c:396
-#: ../jpilot.c:953 ../memo_gui.c:506 ../todo_gui.c:635 ../utils.c:1305
-#: ../KeyRing/keyring.c:2090
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "OK"
 
-#: ../address_gui.c:869 ../address_gui.c:1011 ../datebook_gui.c:362
-#: ../datebook_gui.c:390 ../datebook_gui.c:730 ../memo_gui.c:507
-#: ../memo_gui.c:633 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
-#: ../utils.c:1322 ../utils.c:1346 ../KeyRing/keyring.c:2091
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Non"
 
-#: ../address_gui.c:869 ../address_gui.c:1011 ../datebook_gui.c:362
-#: ../datebook_gui.c:390 ../datebook_gui.c:730 ../memo_gui.c:507
-#: ../memo_gui.c:633 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
-#: ../utils.c:1322 ../utils.c:1346 ../KeyRing/keyring.c:2091
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Oui"
 
-#: ../address_gui.c:888 ../datebook_gui.c:753 ../memo_gui.c:520
-#: ../todo_gui.c:655 ../KeyRing/keyring.c:2104
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s est un répertoire"
 
-#: ../address_gui.c:890 ../address_gui.c:907 ../datebook_gui.c:755
-#: ../datebook_gui.c:772 ../memo_gui.c:522 ../memo_gui.c:539 ../todo_gui.c:657
-#: ../todo_gui.c:674 ../KeyRing/keyring.c:2106 ../KeyRing/keyring.c:2123
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Erreur d'ouverture du fichier"
 
-#: ../address_gui.c:894 ../datebook_gui.c:759 ../memo_gui.c:526
-#: ../todo_gui.c:661 ../KeyRing/keyring.c:2110
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Voulez vous écraser le fichier %s?"
 
-#: ../address_gui.c:896 ../datebook_gui.c:761 ../memo_gui.c:528
-#: ../todo_gui.c:663 ../KeyRing/keyring.c:2112
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Écraser le fichier?"
 
-#: ../address_gui.c:905 ../datebook_gui.c:770 ../memo_gui.c:537
-#: ../todo_gui.c:672 ../KeyRing/keyring.c:2121
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Erreur d'ouverture du fichier: %s"
 
-#: ../address_gui.c:922
+#: ../address_gui.c:920
 #, c-format
 msgid ""
 "Address exported from %s %s on %s\n"
@@ -161,7 +161,7 @@ msgstr ""
 "Address exporté de %s %s le %s\n"
 "\n"
 
-#: ../address_gui.c:925
+#: ../address_gui.c:923
 #, c-format
 msgid ""
 "Contact exported from %s %s on %s\n"
@@ -170,121 +170,125 @@ msgstr ""
 "Contact exporté de %s %s le %s\n"
 "\n"
 
-#: ../address_gui.c:989
+#: ../address_gui.c:998
 msgid ""
 "Host character encoding is not UTF-8 based.\n"
 " Exported ldif file may not be standards-compliant\n"
 msgstr ""
 
-#: ../address_gui.c:1002
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Ne peut pas exporter l'adresse %d\n"
 
-#: ../address_gui.c:1008 ../memo_gui.c:630 ../todo_gui.c:760
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
 #, c-format
 msgid "Category: %s\n"
 msgstr "Catégorie : %s\n"
 
-#: ../address_gui.c:1010 ../memo_gui.c:632 ../todo_gui.c:763
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
 #, c-format
 msgid "Private: %s\n"
 msgstr "Privé : %s\n"
 
-#: ../address_gui.c:1018 ../address_gui.c:1032 ../address_gui.c:1036
-#: ../address_gui.c:1045 ../address_gui.c:1048
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
 #, c-format
 msgid "%s: "
 msgstr "%s : "
 
-#: ../address_gui.c:1022
+#: ../address_gui.c:1031
 #, c-format
 msgid "%s\n"
 msgstr ""
 
 #. E-mail should be the Palm dropdown menu item for email
 #. Set dial/email button text and callback data
-#: ../address_gui.c:1196 ../address_gui.c:2846 ../address_gui.c:4185
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../address_gui.c:1482 ../datebook_gui.c:1147 ../memo_gui.c:640
-#: ../todo_gui.c:844 ../KeyRing/keyring.c:2214
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Type d'export inconnu\n"
 
-#: ../address_gui.c:1508 ../datebook_gui.c:1226 ../memo_gui.c:469
-#: ../memo_gui.c:666 ../todo_gui.c:870 ../KeyRing/keyring.c:2229
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
 msgid "Text"
 msgstr ""
 
-#: ../address_gui.c:1509 ../datebook_gui.c:1227 ../memo_gui.c:667
-#: ../todo_gui.c:871 ../KeyRing/keyring.c:2229
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
 msgid "CSV"
 msgstr ""
 
-#: ../address_gui.c:1510
+#: ../address_gui.c:1562
 msgid "vCard"
 msgstr "vCard"
 
-#: ../address_gui.c:1511
+#: ../address_gui.c:1563
 msgid "vCard (Optimized for Gmail/Android Import)"
 msgstr ""
 
-#: ../address_gui.c:1512
+#: ../address_gui.c:1564
 msgid "ldif"
 msgstr "ldif"
 
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
 #. Initialize variable if default case taken
-#: ../address_gui.c:1777 ../address_gui.c:3902
+#: ../address_gui.c:1831 ../address_gui.c:3953
 msgid "Last Name/Company"
 msgstr "Nom/Société"
 
-#: ../address_gui.c:1780 ../address_gui.c:3905
+#: ../address_gui.c:1834 ../address_gui.c:3956
 msgid "First Name/Company"
 msgstr "Prénom/Société"
 
-#: ../address_gui.c:1783 ../address_gui.c:3908
+#: ../address_gui.c:1837 ../address_gui.c:3959
 msgid "Company/Last Name"
 msgstr "Société/Nom"
 
-#: ../address_gui.c:1920 ../datebook_gui.c:2907 ../memo_gui.c:1036
-#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1181
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Vous ne pouvez pas modifier un enregistrement effacé\n"
 
 #. Illegal category, Assume that category 0 is Unfiled and valid
-#: ../address_gui.c:2119 ../address_gui.c:2370 ../address_gui.c:2803
-#: ../address_gui.c:2809 ../address_gui.c:3601 ../datebook_gui.c:1994
-#: ../datebook_gui.c:3434 ../datebook_gui.c:3783 ../datebook_gui.c:4074
-#: ../memo_gui.c:900 ../memo_gui.c:946 ../memo_gui.c:1161 ../memo_gui.c:1548
-#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2141
-#: ../Expense/expense.c:689 ../Expense/expense.c:1143
-#: ../Expense/expense.c:1227 ../Expense/expense.c:1887
-#: ../KeyRing/keyring.c:1070 ../KeyRing/keyring.c:1512
-#: ../KeyRing/keyring.c:1574 ../KeyRing/keyring.c:2688
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Catégorie illégale\n"
 
-#: ../address_gui.c:2179 ../alarms.c:598 ../dialer.c:164
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "Exécution de la commande = [%s]\n"
 
-#: ../address_gui.c:2181
-#, c-format
-msgid "Failed to execute [%s]\n"
+#: ../address_gui.c:2235
+#, fuzzy, c-format
+msgid "Failed to execute [%s] at %s %d\n"
 msgstr "Échec d'exécution [%s]\n"
 
-#: ../address_gui.c:2425
+#: ../address_gui.c:2479
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: ../address_gui.c:2521
+#: ../address_gui.c:2575
 msgid "External program not found, or other error"
 msgstr "Programme externe non trouvé, ou autre erreur"
 
-#: ../address_gui.c:2523
+#: ../address_gui.c:2577
 msgid ""
 "J-Pilot can not find the external program \"convert\"\n"
 "or an error occurred while executing convert.\n"
@@ -294,110 +298,110 @@ msgstr ""
 "ou une erreur s'est produite pendant l'excution de convert.\n"
 "Vous devez peut-être installer le paquet ImageMagick"
 
-#: ../address_gui.c:2524
+#: ../address_gui.c:2578
 #, c-format
 msgid "Command executed was \"%s\"\n"
 msgstr "La commande exécutée était \"%s\"\n"
 
-#: ../address_gui.c:2525
+#: ../address_gui.c:2579
 #, c-format
 msgid "return code was %d\n"
 msgstr "le code de retour était %d\n"
 
-#: ../address_gui.c:2603
+#: ../address_gui.c:2657
 msgid "chdir() failed\n"
 msgstr "echec de chdir()\n"
 
-#: ../address_gui.c:2606
+#: ../address_gui.c:2660
 msgid "Add Photo"
 msgstr "Ajouter une photo"
 
 #. Category menu
-#: ../address_gui.c:2828 ../KeyRing/keyring.c:2585
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Catégorie : "
 
-#: ../address_gui.c:2848 ../address_gui.c:4186
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Mél"
 
 #. Dial Phone Button
-#: ../address_gui.c:2851 ../address_gui.c:4189 ../dialer.c:307 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Appel"
 
-#: ../address_gui.c:3041 ../datebook_gui.c:2757 ../memo_gui.c:1228
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
 #: ../todo_gui.c:1697
 msgid "Could not get temporary file name\n"
 msgstr ""
 
-#: ../address_gui.c:3049 ../datebook_gui.c:2765 ../memo_gui.c:1236
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
 #: ../todo_gui.c:1705
 msgid "Could not open temporary file for external editor\n"
 msgstr ""
 
-#: ../address_gui.c:3089 ../datebook_gui.c:2806 ../memo_gui.c:1277
-#: ../todo_gui.c:1746
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
 msgid "Could not open temporary file from external editor\n"
 msgstr ""
 
-#: ../address_gui.c:3261 ../address_gui.c:3292
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Sans-nom-"
 
-#: ../address_gui.c:3374 ../memo_gui.c:1454 ../todo_gui.c:2019
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 enregistrements"
 
-#: ../address_gui.c:3377 ../datebook_gui.c:2637 ../memo_gui.c:1457
-#: ../todo_gui.c:2022
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d enregistrements sur %d"
 
-#: ../address_gui.c:3772 ../address_gui.c:3780 ../KeyRing/keyring.c:2498
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
 msgid "Name"
 msgstr "Nom"
 
-#: ../address_gui.c:3773 ../address_gui.c:3774 ../address_gui.c:3775
-#: ../address_gui.c:3781
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
 msgid "Address"
 msgstr "Adresse"
 
-#: ../address_gui.c:3776 ../address_gui.c:3782 ../Expense/expense.c:584
-#: ../Expense/expense.c:1405
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
 msgid "Other"
 msgstr "Autre"
 
 #. Note textbox
-#: ../address_gui.c:3777 ../address_gui.c:3783 ../todo_gui.c:2484
-#: ../Expense/expense.c:1836 ../KeyRing/keyring.c:2632
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
 msgid "Note"
 msgstr "Note"
 
-#: ../address_gui.c:3793
+#: ../address_gui.c:3844
 msgid "Reverting to Address database\n"
 msgstr "Utilise la base Address\n"
 
-#: ../address_gui.c:3914
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../address_gui.c:3946
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Recherche rapide : "
 
 #. Cancel button
 #. Add record modification buttons
 #. Cancel button
-#: ../address_gui.c:3964 ../category.c:409 ../datebook_gui.c:1782
-#: ../datebook_gui.c:5124 ../memo_gui.c:1692 ../todo_gui.c:2345
-#: ../utils.c:1346 ../KeyRing/keyring.c:2528
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../address_gui.c:3964 ../datebook_gui.c:5124 ../memo_gui.c:1692
-#: ../todo_gui.c:2345 ../KeyRing/keyring.c:2528
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "Annuler les modifications"
 
@@ -407,14 +411,14 @@ msgstr "Annuler les modifications"
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:3969 ../category.c:409 ../category.c:852
-#: ../datebook_gui.c:5129 ../memo_gui.c:1697 ../todo_gui.c:2350
-#: ../Expense/expense.c:1663 ../KeyRing/keyring.c:2533
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Effacer"
 
-#: ../address_gui.c:3969 ../datebook_gui.c:5129 ../memo_gui.c:1697
-#: ../todo_gui.c:2350 ../Expense/expense.c:1663 ../KeyRing/keyring.c:2533
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Efface l'enregistrement sélectionné"
 
@@ -422,131 +426,131 @@ msgstr "Efface l'enregistrement sélectionné"
 #. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:3975 ../datebook_gui.c:5135 ../memo_gui.c:1703
-#: ../todo_gui.c:2356 ../KeyRing/keyring.c:2539
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Restaurer"
 
-#: ../address_gui.c:3975 ../datebook_gui.c:5135 ../memo_gui.c:1703
-#: ../todo_gui.c:2356 ../KeyRing/keyring.c:2539
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Récupérer l'enregistrement sélectionné"
 
 #. Copy button
-#: ../address_gui.c:3981 ../datebook_gui.c:5141 ../memo_gui.c:1709
-#: ../todo_gui.c:2362 ../Expense/expense.c:1668 ../KeyRing/keyring.c:2545
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Copier"
 
-#: ../address_gui.c:3981 ../datebook_gui.c:5141 ../memo_gui.c:1709
-#: ../todo_gui.c:2362 ../Expense/expense.c:1668 ../KeyRing/keyring.c:2545
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Copier l'enregistrement sélectionné"
 
 #. New button
 #. New Record button
-#: ../address_gui.c:3987 ../datebook_gui.c:5147 ../memo_gui.c:1715
-#: ../todo_gui.c:2368 ../Expense/expense.c:1673 ../KeyRing/keyring.c:2551
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Nouveau"
 
-#: ../address_gui.c:3987 ../datebook_gui.c:5147 ../memo_gui.c:1715
-#: ../todo_gui.c:2368 ../Expense/expense.c:1673 ../KeyRing/keyring.c:2551
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Ajouter un nouvel enregistrement"
 
 #. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:3992 ../datebook_gui.c:5153 ../memo_gui.c:1721
-#: ../todo_gui.c:2374 ../Expense/expense.c:1678 ../KeyRing/keyring.c:2557
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Ajouter"
 
-#: ../address_gui.c:3992 ../datebook_gui.c:5153 ../memo_gui.c:1721
-#: ../todo_gui.c:2374 ../Expense/expense.c:1678 ../KeyRing/keyring.c:2557
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Ajouter le nouvel enregistrement"
 
 #. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:4002 ../datebook_gui.c:5163 ../memo_gui.c:1731
-#: ../todo_gui.c:2384 ../Expense/expense.c:1687 ../KeyRing/keyring.c:2566
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Appliquer"
 
-#: ../address_gui.c:4002 ../datebook_gui.c:5163 ../memo_gui.c:1731
-#: ../todo_gui.c:2384 ../Expense/expense.c:1687 ../KeyRing/keyring.c:2566
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "Appliquer les modifications"
 
 #. Private check box
 #. Private checkbox
-#: ../address_gui.c:4033 ../datebook_gui.c:5191 ../datebook_gui.c:5233
-#: ../memo_gui.c:1747 ../todo_gui.c:2410
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privé"
 
-#: ../address_gui.c:4118
+#: ../address_gui.c:4169
 msgid "Change Photo"
 msgstr "Changer la photo"
 
-#: ../address_gui.c:4123
+#: ../address_gui.c:4174
 msgid "Remove Photo"
 msgstr "Supprimer la photo"
 
-#: ../address_gui.c:4195
+#: ../address_gui.c:4246
 msgid "Show In List"
 msgstr "Montrer dans la liste"
 
-#: ../address_gui.c:4296
+#: ../address_gui.c:4347
 msgid "Reminder"
 msgstr "Me le rappeler"
 
-#: ../address_gui.c:4312 ../datebook_gui.c:238 ../datebook_gui.c:5221
-#: ../datebook_gui.c:5378
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
 msgid "Days"
 msgstr "Jours"
 
 #. The Quickview (ALL) page
 #. All button
-#: ../address_gui.c:4356 ../datebook_gui.c:1478 ../datebook_gui.c:1782
-#: ../utils.c:2528
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
 msgid "All"
 msgstr "Tous"
 
-#: ../alarms.c:232 ../datebook_gui.c:236 ../datebook_gui.c:5215
-#: ../datebook_gui.c:5372
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minutes"
 
-#: ../alarms.c:234 ../datebook_gui.c:237 ../datebook_gui.c:5219
-#: ../datebook_gui.c:5376
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Heures"
 
-#: ../alarms.c:255
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Me le rappeler"
 
-#: ../alarms.c:425 ../alarms.c:991 ../sync.c:1639 ../sync.c:1645
-#: ../utils.c:3717
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
 msgid "Unable to open file: %s%s\n"
 msgstr "Impossible d'ouvrir le fichier %s%s\n"
 
-#: ../alarms.c:512
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Rappel de rendez-vous"
 
-#: ../alarms.c:515
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Rendez-vous passé"
 
-#: ../alarms.c:518
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "rendez-vous reporté"
 
-#: ../alarms.c:521 ../datebook_gui.c:5025
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Rendez-vous"
 
@@ -554,55 +558,55 @@ msgstr "Rendez-vous"
 msgid "J-Pilot Alarm"
 msgstr "Alarme de J-Pilot"
 
-#: ../category.c:131 ../category.c:188 ../sync.c:2158 ../sync.c:2495
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "Fichier PC corrompu?\n"
 
-#: ../category.c:138 ../category.c:148 ../category.c:196 ../category.c:206
-#: ../category.c:216 ../sync.c:2280 ../sync.c:2334 ../sync.c:2371
-#: ../sync.c:2386 ../sync.c:2410 ../sync.c:2630 ../sync.c:2675 ../sync.c:2712
-#: ../sync.c:2725 ../sync.c:2750
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek échoué - erreur fatale\n"
 
-#: ../category.c:364 ../utils.c:2738 ../utils.c:2812 ../utils.c:2916
-#: ../utils.c:2981
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
 msgid "rename failed"
 msgstr "echec de renommage"
 
-#: ../category.c:409
+#: ../category.c:407
 msgid "Move"
 msgstr "Déplacer"
 
-#: ../category.c:438 ../category.c:500 ../category.c:580 ../category.c:769
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
 msgid "Edit Categories"
 msgstr "Edition Catégories"
 
-#: ../category.c:439
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Le nombre maximum de catégories (16) est atteint"
 
-#: ../category.c:442
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Saisir la nouvelle Catégorie"
 
-#: ../category.c:453 ../category.c:477
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr "Erreur d'édition de catégories"
 
-#: ../category.c:454
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Vous devez sélectionner une catégorie à renommer"
 
-#: ../category.c:463
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "Saisir le nom de la nouvelle catégorie"
 
-#: ../category.c:478
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Vous devez sélectionnet la catégorie à supprimer"
 
-#: ../category.c:496
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
@@ -611,130 +615,130 @@ msgstr ""
 "Il y a %d enregistrements dans %s.\n"
 "Voulez vous les déplacer vers %s, ou les supprimer?"
 
-#: ../category.c:556
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "état invalide fichier %s ligne %d\n"
 
-#: ../category.c:578
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "La catégorie %s ne peut pas être utilisée plusieures fois"
 
 #. Category names in host character set
-#: ../category.c:735
+#: ../category.c:733
 msgid "Category"
 msgstr "Catégorie"
 
-#: ../category.c:836
+#: ../category.c:834
 msgid "New"
 msgstr "Nouveau"
 
-#: ../category.c:843
+#: ../category.c:841
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../dat.c:456
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "type inconnu ="
 
-#: ../dat.c:537
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "champs par colonne != %d, format inconnu\n"
 
-#: ../dat.c:551
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "nombre de champs != %d, format inconnu\n"
 
-#: ../dat.c:559
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Format inconnu, le fichier utilise un mauvais schéma\n"
 
-#: ../dat.c:560
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Le schéma du fichier est :"
 
-#: ../dat.c:564
+#: ../dat.c:640
 msgid "It should be:"
 msgstr "Il devrait être :"
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:876 ../dat.c:889 ../dat.c:1012
-#: ../dat.c:1025 ../dat.c:1149 ../dat.c:1162
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 "%s:%d Enregistrement %d, champ %d: Type invalide.  Attendu %d, trouvé %d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:877 ../dat.c:890 ../dat.c:994
-#: ../dat.c:1013 ../dat.c:1026 ../dat.c:1150 ../dat.c:1163
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "lecture du fichier terminé\n"
 
-#: ../datebook.c:705 ../datebook_gui.c:3648
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "repeatType (%d) inconnu trouvé dans DatebookDB\n"
 
-#: ../datebook_gui.c:241
+#: ../datebook_gui.c:239
 msgid "Repeat Never"
 msgstr "Aucune répétition"
 
-#: ../datebook_gui.c:242
+#: ../datebook_gui.c:240
 msgid "Repeat Daily"
 msgstr "Répété tous les jours"
 
-#: ../datebook_gui.c:243
+#: ../datebook_gui.c:241
 msgid "Repeat Weekly"
 msgstr "Répété toutes les semaines"
 
-#: ../datebook_gui.c:244
+#: ../datebook_gui.c:242
 msgid "Repeat MonthlyByDay"
 msgstr "Répété les mois tel jour"
 
-#: ../datebook_gui.c:245
+#: ../datebook_gui.c:243
 msgid "Repeat MonthlyByDate"
 msgstr "Répété les mois telle date"
 
-#: ../datebook_gui.c:246
+#: ../datebook_gui.c:244
 msgid "Repeat YearlyDate"
 msgstr "Répété tous les ans telle date"
 
-#: ../datebook_gui.c:247
+#: ../datebook_gui.c:245
 msgid "Repeat YearlyDay"
 msgstr "Répété les ans tel jour"
 
-#: ../datebook_gui.c:250 ../datebook_gui.c:257 ../datebook_gui.c:4803
-#: ../datebook_gui.c:4810
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Di"
 
-#: ../datebook_gui.c:251 ../datebook_gui.c:4804
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Lu"
 
-#: ../datebook_gui.c:252 ../datebook_gui.c:4805
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Ma"
 
-#: ../datebook_gui.c:253 ../datebook_gui.c:4806
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Me"
 
-#: ../datebook_gui.c:254 ../datebook_gui.c:4807
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Je"
 
-#: ../datebook_gui.c:255 ../datebook_gui.c:4808
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Ve"
 
-#: ../datebook_gui.c:256 ../datebook_gui.c:4809
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Sa"
 
-#: ../datebook_gui.c:269
+#: ../datebook_gui.c:267
 #, c-format
 msgid ""
 "Start Date: %s\n"
@@ -743,7 +747,7 @@ msgstr ""
 "Rendez-vous commence le : %s\n"
 "Heure : Événement"
 
-#: ../datebook_gui.c:277
+#: ../datebook_gui.c:275
 #, c-format
 msgid ""
 "Start Date: %s\n"
@@ -752,39 +756,39 @@ msgstr ""
 "Rendez-vous commence le : %s\n"
 "Heure : %s à %s"
 
-#: ../datebook_gui.c:287 ../datebook_gui.c:297
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
 msgid "Unknown"
 msgstr "Inconnu"
 
 #. End Date
-#: ../datebook_gui.c:300
+#: ../datebook_gui.c:298
 msgid "End Date: "
 msgstr "Date de fin : "
 
-#: ../datebook_gui.c:302
+#: ../datebook_gui.c:300
 msgid "Never"
 msgstr "Jamais"
 
-#: ../datebook_gui.c:308
+#: ../datebook_gui.c:306
 #, c-format
 msgid "Repeat Frequency: %d\n"
 msgstr "Fréquence de répétition : %d\n"
 
-#: ../datebook_gui.c:316
+#: ../datebook_gui.c:314
 #, c-format
 msgid "Monthly Repeat Day %d\n"
 msgstr "Répété tous les mois le %dème jour\n"
 
-#: ../datebook_gui.c:321 ../datebook_gui.c:5520
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
 msgid "Repeat on Days:"
 msgstr "Répété les jours :"
 
-#: ../datebook_gui.c:332
+#: ../datebook_gui.c:330
 #, c-format
 msgid "Number of exceptions: %d"
 msgstr "Nombre d'exceptions : %d"
 
-#: ../datebook_gui.c:338
+#: ../datebook_gui.c:336
 msgid ""
 "\n"
 "more..."
@@ -792,27 +796,27 @@ msgstr ""
 "\n"
 "plus..."
 
-#: ../datebook_gui.c:359 ../datebook_gui.c:386
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
 msgid "Description:"
 msgstr "Description :"
 
-#: ../datebook_gui.c:360 ../datebook_gui.c:387
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
 msgid "Note:"
 msgstr "Note :"
 
-#: ../datebook_gui.c:362 ../datebook_gui.c:390
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
 msgid "Alarm:"
 msgstr "Alarme :"
 
-#: ../datebook_gui.c:363 ../datebook_gui.c:391
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
 msgid "Repeat Type:"
 msgstr "Type de répétition :"
 
-#: ../datebook_gui.c:366 ../datebook_gui.c:394
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
 msgid "Start of Week:"
 msgstr "Début de semaine :"
 
-#: ../datebook_gui.c:388 ../datebook_gui.c:5343
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
 msgid "Location:"
 msgstr "Emplacement : "
 
@@ -866,7 +870,7 @@ msgstr "Type d'export inconnu"
 msgid "iCalendar"
 msgstr "iCalendar"
 
-#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:429
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Exporter"
 
@@ -890,7 +894,7 @@ msgstr "Catégories agenda"
 
 #. None button
 #. Labels for notebook tabs
-#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5449
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Aucun"
 
@@ -902,11 +906,11 @@ msgstr "Date de début"
 msgid "End On Date"
 msgstr "Date de fin"
 
-#: ../datebook_gui.c:1751 ../prefs.c:451
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: ../datebook_gui.c:1752 ../prefs.c:452
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Lundi"
 
@@ -1009,19 +1013,19 @@ msgstr ""
 "jour de la semaine."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2516 ../datebook_gui.c:5264
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Pas d'heure"
 
-#: ../datebook_gui.c:2788 ../memo_gui.c:1259 ../todo_gui.c:1728
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
 msgid "External editor command too long to execute\n"
 msgstr ""
 
-#: ../datebook_gui.c:2943
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Rendez-vous non valable"
 
-#: ../datebook_gui.c:2944
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -1030,137 +1034,137 @@ msgstr ""
 "est antérieure à celle de début."
 
 #. "No Date" check box
-#: ../datebook_gui.c:3339 ../datebook_gui.c:5482 ../datebook_gui.c:5513
-#: ../datebook_gui.c:5565 ../datebook_gui.c:5613 ../todo_gui.c:142
-#: ../todo_gui.c:2454
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Pas de date"
 
-#: ../datebook_gui.c:3494
+#: ../datebook_gui.c:3491
 #, c-format
 msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "Erreur dans DateBookDB ou Calendar advanceUnits = %d\n"
 
-#: ../datebook_gui.c:3681
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3686
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (AUJOURD'HUI)"
 
 #. Weekview button
-#: ../datebook_gui.c:4934 ../datebook_gui.c:5451
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Semaine"
 
-#: ../datebook_gui.c:4943
+#: ../datebook_gui.c:4940
 msgid "View appointments by week   Ctrl+W"
 msgstr "Voir les rendez-vous par semaine   Ctrl+W"
 
 #. Monthview button
-#: ../datebook_gui.c:4946 ../datebook_gui.c:5452
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Mois"
 
-#: ../datebook_gui.c:4955
+#: ../datebook_gui.c:4952
 msgid "View appointments by month   Ctrl+M"
 msgstr "Voir les rendez-vous par mois   Ctrl+M"
 
 #. Make Category button
-#: ../datebook_gui.c:4960
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Cats"
 
-#: ../datebook_gui.c:5024
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Heure"
 
 #. "Show ToDos" button
-#: ../datebook_gui.c:5067
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Montrer les tâches à faire"
 
-#: ../datebook_gui.c:5081 ../todo_gui.c:2285
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Tâche"
 
-#: ../datebook_gui.c:5082 ../todo_gui.c:2286
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Prévu(e)"
 
-#: ../datebook_gui.c:5201 ../datebook_gui.c:5358
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarme"
 
 #. Date Spinners
-#: ../datebook_gui.c:5241 ../Expense/expense.c:1736
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
 msgid "Date:"
 msgstr "Date :"
 
 #. Start date and time
-#: ../datebook_gui.c:5283
+#: ../datebook_gui.c:5280
 msgid "Start"
 msgstr "Commence à"
 
 #. End date and time
-#: ../datebook_gui.c:5300
+#: ../datebook_gui.c:5297
 msgid "End"
 msgstr "Fini à"
 
-#: ../datebook_gui.c:5433
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "Étiquettes DateBk"
 
-#: ../datebook_gui.c:5450
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Jour"
 
-#: ../datebook_gui.c:5453
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Année"
 
 #. "No Repeat" page for notebook
-#: ../datebook_gui.c:5456
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Cet évènement ne se répètera pas"
 
-#: ../datebook_gui.c:5465 ../datebook_gui.c:5498 ../datebook_gui.c:5550
-#: ../datebook_gui.c:5596
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "La fréquence est chaque"
 
-#: ../datebook_gui.c:5471
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "jour(s)"
 
-#: ../datebook_gui.c:5474 ../datebook_gui.c:5507 ../datebook_gui.c:5559
-#: ../datebook_gui.c:5605
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Fin le"
 
-#: ../datebook_gui.c:5504
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "semaine(s)"
 
-#: ../datebook_gui.c:5556
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "mois"
 
-#: ../datebook_gui.c:5573
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Répété tous les :"
 
-#: ../datebook_gui.c:5577
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Jour de la semaine"
 
-#: ../datebook_gui.c:5586 ../Expense/expense.c:1618
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Date"
 
-#: ../datebook_gui.c:5602
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "année(s)"
 
@@ -1207,7 +1211,7 @@ msgstr "Utilisez les touches Ctrl et Shift"
 
 #. Import button
 #: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
-#: ../import_gui.c:471 ../jpilot.c:385
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importer"
 
@@ -1241,7 +1245,7 @@ msgstr "Importer tout"
 msgid "Skip"
 msgstr "Sauter"
 
-#: ../import_gui.c:457 ../install_gui.c:429
+#: ../import_gui.c:457 ../install_gui.c:427
 msgid "To change to a hidden directory type it below and hit TAB"
 msgstr "Pour aller dans un répertoire caché tapez son nom et pressez <TAB>"
 
@@ -1249,26 +1253,26 @@ msgstr "Pour aller dans un répertoire caché tapez son nom et pressez <TAB>"
 msgid "Import File Type"
 msgstr "Importer Fichier"
 
-#: ../install_gui.c:366
+#: ../install_gui.c:364
 msgid "Files to install"
 msgstr "Fichiers à installer"
 
-#: ../install_gui.c:374
+#: ../install_gui.c:372
 msgid "Install"
 msgstr "Installer"
 
-#: ../install_user.c:118 ../install_user.c:220
+#: ../install_user.c:116 ../install_user.c:218
 msgid "Install User"
 msgstr "Installer un utilisateur"
 
-#: ../install_user.c:139
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 "Un PDA PalmOS(c) a besoin d'un ID d'utilisateur pour fonctionner "
 "correctement."
 
-#: ../install_user.c:146
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
@@ -1277,46 +1281,46 @@ msgstr ""
 "différent et, de préférence, un nom d'utilisateur différent."
 
 #. Instruction label
-#: ../install_user.c:168
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 "La plupart des utilisateurs utilisent leur nom ou surnom comme nom "
 "d'utilisateur."
 
-#: ../install_user.c:176 ../restore_gui.c:278
+#: ../install_user.c:174 ../restore_gui.c:276
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
-#: ../install_user.c:186
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr "L'ID devrait être un nombre aléatoire."
 
-#: ../install_user.c:194 ../restore_gui.c:297
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "ID utilisateur"
 
-#: ../jpilot.c:319
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Imprimer"
 
-#: ../jpilot.c:320
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Pas de support d'impression pour ce conduit"
 
-#: ../jpilot.c:386
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Pas d'import pour ce conduit"
 
-#: ../jpilot.c:430
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Pas d'export pour ce conduit"
 
-#: ../jpilot.c:659
+#: ../jpilot.c:657
 msgid " Cancelling HotSync\n"
 msgstr "Annuler HotSync\n"
 
 #. -------------------------------------------
-#: ../jpilot.c:675
+#: ../jpilot.c:673
 msgid ""
 "This handheld does not have the same user name or user ID\n"
 "as the one that was synced the last time.\n"
@@ -1332,7 +1336,7 @@ msgstr ""
 "Lisez le manuel utilisateur en cas de doute."
 
 #. -------------------------------------------
-#: ../jpilot.c:682
+#: ../jpilot.c:680
 msgid ""
 "This handheld has a NULL user ID.\n"
 "Every handheld must have a unique user ID in order to sync properly.\n"
@@ -1353,19 +1357,19 @@ msgstr ""
 "\n"
 "Lisez le manuel utilisateur en cas de doute."
 
-#: ../jpilot.c:690
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Annuler Sync"
 
-#: ../jpilot.c:690
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Sync quand même"
 
-#: ../jpilot.c:699 ../jpilot.c:703
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Problème de synchronisation"
 
-#: ../jpilot.c:932 ../jpilot.c:1785
+#: ../jpilot.c:932 ../jpilot.c:1787
 msgid " User: "
 msgstr " Utilisateur : "
 
@@ -1373,200 +1377,200 @@ msgstr " Utilisateur : "
 msgid "Unknown command from sync process\n"
 msgstr "Commande inconnue du processus de synchronisation\n"
 
-#: ../jpilot.c:963 ../Expense/expense.c:529 ../KeyRing/keyring.c:1872
-#: ../SyncTime/synctime.c:61
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
 
-#: ../jpilot.c:1105
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: ../jpilot.c:1106
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Fichier/tear"
 
-#: ../jpilot.c:1107
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Fichier/Rechercher"
 
-#: ../jpilot.c:1108 ../jpilot.c:1114 ../jpilot.c:1117
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Fichier/sep1"
 
-#: ../jpilot.c:1109
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Fichier/_Installer"
 
-#: ../jpilot.c:1110
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Fichier/Importer"
 
-#: ../jpilot.c:1111
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Fichier/Exporter"
 
-#: ../jpilot.c:1112 ../jpilot.c:2190
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Fichier/Préférences"
 
-#: ../jpilot.c:1113
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Fichier/Im_primer"
 
-#: ../jpilot.c:1115
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Fichier/Installer un utilisateur"
 
-#: ../jpilot.c:1116
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Fichier/Restauration manuelle"
 
-#: ../jpilot.c:1118
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Fichier/_Quitter"
 
-#: ../jpilot.c:1119
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/Affichage"
 
-#: ../jpilot.c:1120 ../jpilot.c:1121 ../jpilot.c:1122 ../jpilot.c:1368
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Affichage/Cacher les enregistrements privés"
 
-#: ../jpilot.c:1121 ../jpilot.c:1371
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Affichage/Montrer les enregistrements privés"
 
-#: ../jpilot.c:1122 ../jpilot.c:1374
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Affichage/Masquer les enregistrements privés"
 
-#: ../jpilot.c:1123
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Affichage/sep1"
 
-#: ../jpilot.c:1124
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Affichage/Agenda"
 
-#: ../jpilot.c:1125
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Affichage/Carnet d'adresses"
 
-#: ../jpilot.c:1126
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Affichage/Tâches"
 
-#: ../jpilot.c:1127
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Affichage/Bloc-notes"
 
-#: ../jpilot.c:1128 ../jpilot.c:1259
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Greffons"
 
-#: ../jpilot.c:1130
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1131
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/Netscape"
 
-#: ../jpilot.c:1135
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/Mozilla"
 
-#: ../jpilot.c:1140
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/Galeon"
 
-#: ../jpilot.c:1145
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/Opera"
 
-#: ../jpilot.c:1149
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/GnomeUrl"
 
-#: ../jpilot.c:1151
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/Lynx"
 
-#: ../jpilot.c:1153
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/Links"
 
-#: ../jpilot.c:1155
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W3M"
 
-#: ../jpilot.c:1157
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/Konqueror"
 
-#: ../jpilot.c:1160
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: ../jpilot.c:1161
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/Aide/À propos de J-Pilot"
 
-#: ../jpilot.c:1227
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Greffons/%s"
 
-#: ../jpilot.c:1237
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Aide/%s"
 
-#: ../jpilot.c:1591
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:1634 ../jpilot-sync.c:171
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "Non chargement des plugins.\n"
 
-#: ../jpilot.c:1638
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "Ignore toutes les alarmes.\n"
 
-#: ../jpilot.c:1642
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "Ignore les alarmes échues.\n"
 
-#: ../jpilot.c:1730 ../jpilot.c:1738
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "Impossible d'ouvrir le pipe\n"
 
-#: ../jpilot.c:1947
+#: ../jpilot.c:1949
 msgid "Show private records   Ctrl+Z"
 msgstr "Montrer les enregistrements privés   Ctrl+Z"
 
-#: ../jpilot.c:1952
+#: ../jpilot.c:1954
 msgid "Hide private records   Ctrl+Z"
 msgstr "Cacher les enregistrements privés   Ctrl+Z"
 
-#: ../jpilot.c:1957
+#: ../jpilot.c:1959
 msgid "Mask private records   Ctrl+Z"
 msgstr "Masquer les enregistrements privés   Ctrl+Z"
 
-#: ../jpilot.c:1969
+#: ../jpilot.c:1971
 msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Synchronise le Palm avec l'ordinateur   Ctrl+Y"
 
-#: ../jpilot.c:1981
+#: ../jpilot.c:1983
 msgid "Stop Sync process"
 msgstr "Arrêter la synchronisation"
 
-#: ../jpilot.c:1993
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1574,35 +1578,35 @@ msgstr ""
 "Synchronise le palm au bureau\n"
 "et fait une sauvegarde"
 
-#: ../jpilot.c:2141
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Agenda/Aller à Aujourd'hui"
 
-#: ../jpilot.c:2142
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../jpilot.c:2143
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Liste de tâches"
 
-#: ../jpilot.c:2144
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Bloc notes"
 
-#: ../jpilot.c:2172
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "Le faire maintenant"
 
-#: ../jpilot.c:2172
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Me le rappeler plus tard"
 
-#: ../jpilot.c:2172
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "Ne plus me le rapeller !"
 
-#: ../jpilot.c:2185
+#: ../jpilot.c:2187
 #, c-format
 msgid ""
 "J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
@@ -1620,161 +1624,161 @@ msgstr ""
 "Allez dans le menu \"%s\" et changez le \"%s\"."
 
 #. Character Set
-#: ../jpilot.c:2190 ../prefs_gui.c:511
+#: ../jpilot.c:2192 ../prefs_gui.c:509
 msgid "Character Set"
 msgstr "Jeu de caractères"
 
-#: ../jpilot.c:2192
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Selectionnez un encodage UTF-8"
 
-#: ../jpilot-dump.c:94
+#: ../jpilot-dump.c:92
 #, c-format
 msgid " +D +A +T +M format like date +format.\n"
 msgstr " +D +A +T +M format comme date +format.\n"
 
-#: ../jpilot-dump.c:95
+#: ../jpilot-dump.c:93
 #, c-format
 msgid " -v display version and exit\n"
 msgstr " -v affiche la version et sort\n"
 
-#: ../jpilot-dump.c:96 ../jpilot-sync.c:68 ../utils.c:1874
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
 #, c-format
 msgid " -h display help text\n"
 msgstr " -h affiche l'aide et sort\n"
 
-#: ../jpilot-dump.c:97
+#: ../jpilot-dump.c:95
 #, c-format
 msgid " -f display help for format codes\n"
 msgstr " -h affiche l'aide des codes de formatage\n"
 
-#: ../jpilot-dump.c:98
+#: ../jpilot-dump.c:96
 #, c-format
 msgid " -D dump DateBook\n"
 msgstr " -D dump agenda\n"
 
-#: ../jpilot-dump.c:99
+#: ../jpilot-dump.c:97
 #, c-format
 msgid " -i dump DateBook in iCalendar format\n"
 msgstr " -i affiche l'agenda au format iCalendar\n"
 
-#: ../jpilot-dump.c:100
+#: ../jpilot-dump.c:98
 #, c-format
 msgid " -N dump appts for today in DateBook\n"
 msgstr " -N affiche les rendez-vous d'aujourd'hui\n"
 
-#: ../jpilot-dump.c:101
+#: ../jpilot-dump.c:99
 #, c-format
 msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr " -NYYYY/MM/DD affiche les rendez-vous du YYYY/MM/DD\n"
 
-#: ../jpilot-dump.c:102
+#: ../jpilot-dump.c:100
 #, c-format
 msgid " -A dump Address book\n"
 msgstr " -A dump le carnet d'adresse\n"
 
-#: ../jpilot-dump.c:103
+#: ../jpilot-dump.c:101
 #, c-format
 msgid " -T dump ToDo list as CSV\n"
 msgstr " -T affiche les tâches au format CSV\n"
 
-#: ../jpilot-dump.c:104
+#: ../jpilot-dump.c:102
 #, c-format
 msgid " -M dump Memos\n"
 msgstr " -M dump mémos\n"
 
-#: ../jpilot-dump.c:165
+#: ../jpilot-dump.c:163
 #, c-format
 msgid ""
 "Warning: Host character encoding is not UTF-8 based.\n"
 "Exported ical file may not be standards-compliant\n"
 msgstr ""
 
-#: ../jpilot-merge.c:163 ../jpilot-merge.c:169
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
 #, c-format
 msgid "%s: Unable to open file:%s\n"
 msgstr "%s: Impossible d'ouvrir: %s\n"
 
-#: ../jpilot-merge.c:271
+#: ../jpilot-merge.c:269
 #, c-format
 msgid "Records read from pdb = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:272
+#: ../jpilot-merge.c:270
 #, c-format
 msgid "Records added         = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:273
+#: ../jpilot-merge.c:271
 #, c-format
 msgid "Records deleted       = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:274
+#: ../jpilot-merge.c:272
 #, c-format
 msgid "Records modified      = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:275
+#: ../jpilot-merge.c:273
 #, c-format
 msgid "Records written       = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:293
+#: ../jpilot-merge.c:291
 #, c-format
 msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
 msgstr ""
 
-#: ../jpilot-merge.c:294
+#: ../jpilot-merge.c:292
 #, c-format
 msgid "  This program will merge an unsynced records file (pc3)\n"
 msgstr ""
 
-#: ../jpilot-merge.c:295
+#: ../jpilot-merge.c:293
 #, c-format
 msgid ""
 "  into the corresponding palm database (pdb) file.\n"
 "\n"
 msgstr ""
 
-#: ../jpilot-merge.c:296
+#: ../jpilot-merge.c:294
 #, c-format
 msgid "  WARNING: Only run this utility if you understand the consequences!\n"
 msgstr ""
 
-#: ../jpilot-merge.c:297
+#: ../jpilot-merge.c:295
 #, c-format
 msgid "  The merge will leave your databases in an unsync-able state.\n"
 msgstr ""
 
-#: ../jpilot-merge.c:298
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
 "  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
 
-#: ../jpilot-merge.c:299
+#: ../jpilot-merge.c:297
 #, c-format
 msgid "  and where no syncing occurs to physical hardware.\n"
 msgstr ""
 
-#: ../jpilot-merge.c:300
+#: ../jpilot-merge.c:298
 #, c-format
 msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
 msgstr ""
 
-#: ../jpilot-merge.c:301
+#: ../jpilot-merge.c:299
 #, c-format
 msgid ""
 "  It is quite simple to destroy your databases by accidentally merging\n"
 msgstr ""
 
-#: ../jpilot-merge.c:302
+#: ../jpilot-merge.c:300
 #, c-format
 msgid "  address records into datebook databases, etc.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:66
+#: ../jpilot-sync.c:64
 #, c-format
 msgid ""
 " J-Pilot preferences are read to get sync info such as port, rate, number of "
@@ -1783,146 +1787,146 @@ msgstr ""
 " Les préférences J-Pilot sont lus pour connaître le port, la vitesse, le "
 "nombre de sauvegardes, etc.\n"
 
-#: ../jpilot-sync.c:67 ../utils.c:1873
+#: ../jpilot-sync.c:65 ../utils.c:1871
 #, c-format
 msgid " -v display version and compile options\n"
 msgstr " -v affiche la version, les options de compilation et sort\n"
 
-#: ../jpilot-sync.c:69 ../utils.c:1875
+#: ../jpilot-sync.c:67 ../utils.c:1873
 #, c-format
 msgid " -d display debug info to stdout\n"
 msgstr " -d affiche les information de debug sur stdout\n"
 
-#: ../jpilot-sync.c:70
+#: ../jpilot-sync.c:68
 #, c-format
 msgid " -P skip loading plugins\n"
 msgstr " -P ne charge pas les plugins\n"
 
-#: ../jpilot-sync.c:71
+#: ../jpilot-sync.c:69
 #, c-format
 msgid " -b sync, and then do a backup\n"
 msgstr " -b synchroniser et faire une sauvegarde\n"
 
-#: ../jpilot-sync.c:72
+#: ../jpilot-sync.c:70
 #, c-format
 msgid " -l loop, otherwise sync once and exit\n"
 msgstr " -l boucle, sinon synchronise une fois et sort\n"
 
-#: ../jpilot-sync.c:73
+#: ../jpilot-sync.c:71
 #, c-format
 msgid " -p {port} use this port to sync on instead of default\n"
 msgstr ""
 " -p {port} utilise ce port pour synchroniser plutôt que celui par défaut\n"
 
-#: ../jpilot-sync.c:221
+#: ../jpilot-sync.c:219
 #, c-format
 msgid "Error: connecting to port %s\n"
 msgstr "Erreur de connexion au port %s\n"
 
-#: ../jpilot-sync.c:225
+#: ../jpilot-sync.c:223
 #, c-format
 msgid "Error: pi_listen\n"
 msgstr ""
 
-#: ../jpilot-sync.c:229
+#: ../jpilot-sync.c:227
 #, c-format
 msgid "Error: opening conduit to handheld\n"
 msgstr "Erreur d'ouverture du conduit vers le palm\n"
 
-#: ../jpilot-sync.c:233
+#: ../jpilot-sync.c:231
 #, c-format
 msgid "Error: pi_accept\n"
 msgstr ""
 
-#: ../jpilot-sync.c:237 ../jpilot-sync.c:265
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
 #, c-format
 msgid "Error: "
 msgstr "Erreur : "
 
-#: ../jpilot-sync.c:238
+#: ../jpilot-sync.c:236
 #, c-format
 msgid "This handheld does not have the same user name.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:239 ../jpilot-sync.c:253
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
 #, c-format
 msgid "as the one that was synced the last time.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:241
+#: ../jpilot-sync.c:239
 #, c-format
 msgid ""
 "Syncing with different handhelds to the same directory can destroy data.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
 #, c-format
 msgid " COPILOT_HOME"
 msgstr ""
 
-#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
 #, c-format
 msgid " JPILOT_HOME"
 msgstr ""
 
-#: ../jpilot-sync.c:247 ../jpilot-sync.c:260
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
 #, c-format
 msgid " environment variable can be used to sync different handhelds,\n"
 msgstr ""
 
-#: ../jpilot-sync.c:248 ../jpilot-sync.c:261
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
 #, c-format
 msgid " to different directories for the same UNIX user name.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:252
+#: ../jpilot-sync.c:250
 #, c-format
 msgid "This handheld does not have the same user ID.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:254
+#: ../jpilot-sync.c:252
 #, c-format
 msgid ""
 " Syncing with different handhelds to the same directory can destroy data.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:266
+#: ../jpilot-sync.c:264
 #, c-format
 msgid "This handheld has a NULL user ID.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:267
+#: ../jpilot-sync.c:265
 #, c-format
 msgid "Every handheld must have a unique user ID in order to sync properly.\n"
 msgstr ""
 "Un palm a besoin d'un ID d'utilisateur pour fonctionner correctement.\n"
 
-#: ../jpilot-sync.c:268
+#: ../jpilot-sync.c:266
 #, c-format
 msgid "If the handheld has been hard reset, \n"
 msgstr ""
 
-#: ../jpilot-sync.c:269
+#: ../jpilot-sync.c:267
 #, c-format
 msgid "   use restore from within "
 msgstr ""
 
-#: ../jpilot-sync.c:270
+#: ../jpilot-sync.c:268
 #, c-format
 msgid "Otherwise, to add a new user name and ID\n"
 msgstr ""
 
-#: ../jpilot-sync.c:271
+#: ../jpilot-sync.c:269
 #, c-format
 msgid "   use \"install-user %s name numeric_id\"\n"
 msgstr ""
 
-#: ../jpilot-sync.c:275
+#: ../jpilot-sync.c:273
 #, c-format
 msgid "Error: sync returned error %d\n"
 msgstr ""
 
-#: ../libplugin.c:64 ../utils.c:1054
+#: ../libplugin.c:62 ../utils.c:1052
 msgid ""
 "This record is already deleted.\n"
 "It is scheduled to be deleted from the Palm on the next sync.\n"
@@ -1930,58 +1934,58 @@ msgstr ""
 "Cet enregistrement est déjà efface.\n"
 "Il sera effacé du Palm lors de la prochaine synchronisation.\n"
 
-#: ../libplugin.c:73 ../libplugin.c:110 ../utils.c:1064 ../utils.c:1106
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
 msgid "Unable to open PC records file\n"
 msgstr "Impossible d'ouvrir le fichiers des enregistrements\n"
 
-#: ../libplugin.c:79 ../utils.c:1071
+#: ../libplugin.c:77 ../utils.c:1069
 msgid "Couldn't find record to delete\n"
 msgstr "Impossible de trouver l'enregistrement à effacer\n"
 
-#: ../libplugin.c:97 ../utils.c:1091
+#: ../libplugin.c:95 ../utils.c:1089
 #, c-format
 msgid "Unknown header version %d\n"
 msgstr "version d'entête inconnue %d\n"
 
-#: ../libplugin.c:182
+#: ../libplugin.c:180
 #, c-format
 msgid "%s:%d Error opening file: %s\n"
 msgstr "%s:%d Erreur à l'ouverture du fichier %s\n"
 
-#: ../libplugin.c:188 ../libplugin.c:217 ../sync.c:1721 ../todo.c:102
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
 #, c-format
 msgid "%s:%d Error reading file: %s\n"
 msgstr "%s:%d Erreur en lisant le fichier %s\n"
 
-#: ../libplugin.c:340 ../libplugin.c:398 ../utils.c:2119 ../utils.c:2132
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
 #, c-format
 msgid "Error opening file: %s\n"
 msgstr "Erreur d'ouverture du fichier : %s\n"
 
-#: ../libplugin.c:526
+#: ../libplugin.c:524
 #, c-format
 msgid "Error reading %s 5\n"
 msgstr "Erreur en lecture %s 5\n"
 
-#: ../libplugin.c:801
+#: ../libplugin.c:799
 msgid "Error reading PC file 1\n"
 msgstr "Erreur en lecture fichier PC 1\n"
 
-#: ../libplugin.c:817
+#: ../libplugin.c:815
 msgid "Error reading PC file 2\n"
 msgstr "Erreur en lecture fichier PC 2\n"
 
-#: ../libplugin.c:923
+#: ../libplugin.c:921
 #, c-format
 msgid "Unknown PC header version = %d\n"
 msgstr "Version PC header inconnue =%d\n"
 
-#: ../log.c:101
+#: ../log.c:98
 #, c-format
 msgid "Unable to open log file, giving up.\n"
 msgstr "Impossible d'ouvrir le journal de bord, abandon.\n"
 
-#: ../log.c:111
+#: ../log.c:108
 #, c-format
 msgid "Unable to open log file\n"
 msgstr "Impossible d'ouvrir le journal de bord\n"
@@ -1995,15 +1999,15 @@ msgstr "Texte du mémo > 65535, troncation\n"
 msgid "Imported Memo %s\n"
 msgstr "Mémo importé %s\n"
 
-#: ../memo_gui.c:400
+#: ../memo_gui.c:402
 msgid "File doesn't appear to be memopad.dat format\n"
 msgstr "Le fichier n'est pas au format bloc-notes\n"
 
-#: ../memo_gui.c:471
+#: ../memo_gui.c:473
 msgid "DAT/MPA (Palm Archive Formats)"
 msgstr ""
 
-#: ../memo_gui.c:554
+#: ../memo_gui.c:558
 #, c-format
 msgid ""
 "Memo exported from %s %s on %s\n"
@@ -2012,7 +2016,7 @@ msgstr ""
 "Memo exporté de %s %s le %s\n"
 "\n"
 
-#: ../memo_gui.c:557
+#: ../memo_gui.c:561
 #, c-format
 msgid ""
 "Memos exported from %s %s on %s\n"
@@ -2021,22 +2025,22 @@ msgstr ""
 "Memos exporté de %s %s le %s\n"
 "\n"
 
-#: ../memo_gui.c:584
+#: ../memo_gui.c:597 ../memo_gui.c:679
 #, c-format
 msgid "Can't export memo %d\n"
 msgstr "Imposible d'exporter le mémo %d\n"
 
-#: ../memo_gui.c:628
+#: ../memo_gui.c:641
 #, c-format
 msgid "Memo: %ld\n"
 msgstr "Note : %ld\n"
 
-#: ../memo_gui.c:634
+#: ../memo_gui.c:647
 #, c-format
 msgid "----- Start of Memo -----\n"
 msgstr "----- Début de la Note ----\n"
 
-#: ../memo_gui.c:636
+#: ../memo_gui.c:649
 #, c-format
 msgid ""
 "\n"
@@ -2047,104 +2051,104 @@ msgstr ""
 "----- Fin de la Note -----\n"
 "\n"
 
-#: ../memo_gui.c:668
-msgid "B-Folders CSV"
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
 msgstr ""
 
-#: ../monthview_gui.c:438
+#: ../monthview_gui.c:436
 msgid "Monthly View"
 msgstr "Vue mensuelle"
 
-#: ../monthview_gui.c:480
+#: ../monthview_gui.c:478
 msgid "Last month   Alt+LeftArrow"
 msgstr ""
 
-#: ../monthview_gui.c:508
+#: ../monthview_gui.c:506
 msgid "Next month   Alt+RightArrow"
 msgstr ""
 
-#: ../otherconv.c:76
+#: ../otherconv.c:74
 #, c-format
 msgid "%s: error exit from g_iconv_close(%s)\n"
 msgstr ""
 
-#: ../otherconv.c:201
+#: ../otherconv.c:199
 #, c-format
 msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
 msgstr ""
 
-#: ../otherconv.c:203
+#: ../otherconv.c:201
 msgid "last char truncated"
 msgstr "dernier caractère tronqué"
 
-#: ../otherconv.c:280
+#: ../otherconv.c:278
 #, c-format
 msgid "UTF_to_other: %s\n"
 msgstr ""
 
-#: ../otherconv.c:294
+#: ../otherconv.c:292
 #, c-format
 msgid "iconv: unconvertible sequence at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:298
+#: ../otherconv.c:296
 #, c-format
 msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:301
+#: ../otherconv.c:299
 #, c-format
 msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:304
+#: ../otherconv.c:302
 #, c-format
 msgid "iconv: unexpected error at place %d in '%s'\n"
 msgstr ""
 
-#: ../password.c:283
+#: ../password.c:281
 msgid "Palm Password"
 msgstr "Mot de passe Palm"
 
-#: ../password.c:308
+#: ../password.c:306
 msgid "Incorrect, Reenter PalmOS Password"
 msgstr "Erreur, Re-entrez le mot de passe PalmOS"
 
-#: ../password.c:310
+#: ../password.c:308
 msgid "Enter PalmOS Password"
 msgstr "Entrez le mot de passe PalmOS"
 
-#: ../pidfile.c:67
+#: ../pidfile.c:69
 msgid "removing stale pidfile\n"
 msgstr "effacement du fichier de pid inutile\n"
 
-#: ../pidfile.c:91
+#: ../pidfile.c:95
 #, c-format
 msgid "create pidfile failed: %s\n"
 msgstr "echec de creation du fichier de pid: %s\n"
 
-#: ../pidfile.c:92
+#: ../pidfile.c:96
 msgid "Warning: hotplug syncing disabled.\n"
 msgstr "Attention: synchronisation hotplug désactivée.\n"
 
-#: ../plugins.c:90 ../plugins.c:203 ../restore_gui.c:133
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
 msgid "infinite loop"
 msgstr "boucle infinie"
 
-#: ../plugins.c:216
+#: ../plugins.c:214
 #, c-format
 msgid "While reading %s%s line 1:[%s]\n"
 msgstr "En lisant %s%s ligne 1:[%s]\n"
 
-#: ../plugins.c:217
+#: ../plugins.c:215
 msgid "Wrong Version\n"
 msgstr "Mauvaise version\n"
 
-#: ../plugins.c:218
+#: ../plugins.c:216
 msgid "Check preferences->conduits\n"
 msgstr "Verifiez préférences->conduits\n"
 
-#: ../plugins.c:274
+#: ../plugins.c:272
 #, c-format
 msgid ""
 "Open failed on plugin [%s]\n"
@@ -2153,463 +2157,463 @@ msgstr ""
 "Échec d'ouverture du greffon [%s]\n"
 " erreur [%s]\n"
 
-#: ../plugins.c:291 ../plugins.c:316
+#: ../plugins.c:289 ../plugins.c:314
 #, c-format
 msgid " plugin is invalid: [%s]\n"
 msgstr " greffon invalide : [%s]\n"
 
-#: ../plugins.c:299
+#: ../plugins.c:297
 #, c-format
 msgid "Plugin:[%s]\n"
 msgstr "Greffon:[%s]\n"
 
-#: ../plugins.c:300
+#: ../plugins.c:298
 #, c-format
 msgid "This plugin is version (%d.%d).\n"
 msgstr "Ce greffon est version (%d.%d).\n"
 
-#: ../plugins.c:302
+#: ../plugins.c:300
 msgid "It is too old to work with this version of J-Pilot.\n"
 msgstr "Il est trop ancien pour fonctionner avec cette version de J-Pilot.\n"
 
-#: ../prefs.c:420
+#: ../prefs.c:418
 msgid "%B %d, %Y"
 msgstr ""
 
-#: ../prefs.c:421
+#: ../prefs.c:419
 msgid "%d %B %Y"
 msgstr ""
 
-#: ../prefs.c:422
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr ""
 
-#: ../prefs.c:423
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr ""
 
-#: ../prefs.c:424
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr ""
 
-#: ../prefs.c:425
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr ""
 
-#: ../prefs_gui.c:454
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../prefs_gui.c:485
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Locale"
 
-#: ../prefs_gui.c:487
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Réglages"
 
-#: ../prefs_gui.c:489
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr "Agenda"
 
-#: ../prefs_gui.c:493
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "Liste de tâches"
 
-#: ../prefs_gui.c:495
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "Bloc-notes"
 
-#: ../prefs_gui.c:497
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../prefs_gui.c:499
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Conduits"
 
 #. Shortdate
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:522
 msgid "Short date format"
 msgstr "Date format court"
 
 #. Longdate
-#: ../prefs_gui.c:537
+#: ../prefs_gui.c:535
 msgid "Long date format"
 msgstr "Date format long"
 
 #. Time
-#: ../prefs_gui.c:550
+#: ../prefs_gui.c:548
 msgid "Time format"
 msgstr "Format de l'heure"
 
 #. GTK colors file
-#: ../prefs_gui.c:570
+#: ../prefs_gui.c:568
 msgid "GTK color theme file"
 msgstr "Mon fichier couleurs GTK est"
 
 #. Port
-#: ../prefs_gui.c:583
+#: ../prefs_gui.c:581
 msgid "Sync Port"
 msgstr "Port de synchronisation"
 
 #. Serial Rate
-#: ../prefs_gui.c:607
+#: ../prefs_gui.c:605
 msgid "Serial Rate"
 msgstr "Vitesse série"
 
 #. Number of backups
-#: ../prefs_gui.c:627
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Nombre de sauvegardes à archiver"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:645
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Montrer les enregistrements effacés (NON par défaut)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:649
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Montrer les enregistrements modifiés (NON par défaut)"
 
-#: ../prefs_gui.c:654
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr ""
 "Demande confirmation pour l'installation de fichier (J-Pilot -> PDA) (OUI "
 "par défaut)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:658
+#: ../prefs_gui.c:656
 msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Montre les bulles d'aide (défaut OUI) (nécessite un redémarrage)"
 
-#: ../prefs_gui.c:668
+#: ../prefs_gui.c:666
 msgid "Use Datebook database (Palm OS < 5.2.1)"
 msgstr "Utiliser la base de donnée Datebook (Palm OS < 5.2.1)"
 
-#: ../prefs_gui.c:671
+#: ../prefs_gui.c:669
 msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr "Utiliser la base de donnée Calendar (Palm OS > 5.2)"
 
 #. Show highlight days check box
-#: ../prefs_gui.c:697
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Surligner les jours avec rendez-vous"
 
 #. Highlight today on month and week view
-#: ../prefs_gui.c:702
+#: ../prefs_gui.c:700
 msgid "Annotate today in day, week, and month views"
 msgstr "Signaler aujourd'hui dans les vues jour, semaine et mois"
 
 #. Show number of years on anniversaries in month and week view
-#: ../prefs_gui.c:706
+#: ../prefs_gui.c:704
 msgid "Append years on anniversaries in day, week, and month views"
 msgstr ""
 "Ajoute le nombre d'années pour les anniversaires dans les vues jour, semaine "
 "et mois"
 
 #. Show use DateBk check box
-#: ../prefs_gui.c:712
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "Utilise DateBk note tags"
 
-#: ../prefs_gui.c:715
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "Le support pour DateBk est désactivé pour cet exécutable"
 
-#: ../prefs_gui.c:727
+#: ../prefs_gui.c:725
 msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr "Utiliser la base de donnée Address (Palm OS < 5.2.1)"
 
-#: ../prefs_gui.c:730
+#: ../prefs_gui.c:728
 msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr "Utiliser la base de donnée Contacts (Palm OS > 5.2)"
 
-#: ../prefs_gui.c:759
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Commande d'envoi de mél"
 
-#: ../prefs_gui.c:773
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s est remplacé par l'adresse mél"
 
-#: ../prefs_gui.c:785
+#: ../prefs_gui.c:783
 msgid "Use ToDo database (Palm OS < 5.2.1)"
 msgstr "Utiliser la base ToDo (Palm OS < 5.2.1)"
 
-#: ../prefs_gui.c:788
+#: ../prefs_gui.c:786
 msgid "Use Task database (Palm OS > 5.2)"
 msgstr "Utiliser la base Task (Palm OS > 5.2)"
 
 #. hide completed check box
-#: ../prefs_gui.c:815
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Masquer les tâches terminées"
 
 #. hide todos not yet due check box
-#: ../prefs_gui.c:819
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Cacher les tâches à date non échue"
 
 #. record todo completion date check box
-#: ../prefs_gui.c:823
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Date de fin de l'enregistrement"
 
 #. Use Manana check box
-#: ../prefs_gui.c:828
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Utiliser la base de données Manana"
 
-#: ../prefs_gui.c:836
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "Utilise le nombre de jours à 'échéance par défaut"
 
-#: ../prefs_gui.c:858
+#: ../prefs_gui.c:856
 msgid "Use Memo database (Palm OS < 5.2.1)"
 msgstr "Utiliser la base Memo (Palm OS < 5.2.1)"
 
-#: ../prefs_gui.c:861
+#: ../prefs_gui.c:859
 msgid "Use Memos database (Palm OS > 5.2)"
 msgstr "Utiliser la base Memos (Palm OS > 5.2)"
 
-#: ../prefs_gui.c:864
+#: ../prefs_gui.c:862
 msgid "Use Memo32 database (pedit32)"
 msgstr "Utiliser la base Memo32 (pedit32)"
 
-#: ../prefs_gui.c:904
+#: ../prefs_gui.c:902
 msgid "External Editor"
 msgstr ""
 
-#: ../prefs_gui.c:917
+#: ../prefs_gui.c:915
 msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
 msgstr ""
 
 #. ********************************************************************
 #. Alarms preference tab
 #. Open alarm windows check box
-#: ../prefs_gui.c:925
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Ouvrir une fenêtre de rappel pour les rendez vous"
 
 #. Execute alarm command check box
-#: ../prefs_gui.c:929
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Exécuter la commande"
 
 #. Shell warning label
-#: ../prefs_gui.c:933
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "ATTENTION : exécuter des commandes shell peut être dangereux !!!"
 
-#: ../prefs_gui.c:941
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Commande d'alarme"
 
-#: ../prefs_gui.c:954
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t est remplacé par l'heure de l'alarme"
 
-#: ../prefs_gui.c:958
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d est remplace par la date de l'alarme"
 
-#: ../prefs_gui.c:963
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D est remplacé par la description de l'alarme"
 
-#: ../prefs_gui.c:967
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N est remplacé par le note associée à l'alarme"
 
-#: ../prefs_gui.c:971
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (description substitution) est désactivé pour cet exécutable"
 
-#: ../prefs_gui.c:976
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (note substitution) est désactivé pour cet exécutable"
 
 #. ********************************************************************
 #. Conduits preference tab
 #. Sync datebook check box
-#: ../prefs_gui.c:986
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Sync agenda"
 
 #. Sync address check box
-#: ../prefs_gui.c:990
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Sync carnet d'adresses"
 
 #. Sync todo check box
-#: ../prefs_gui.c:994
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Sync tâches"
 
 #. Sync memo check box
-#: ../prefs_gui.c:998
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Sync bloc-notes"
 
 #. Show sync Manana check box
-#: ../prefs_gui.c:1003
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Sync Manana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:1009
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Utilise J-OS (Sauf PalmOS:WorkPad/CLIE japonais)"
 
 #. Make a Sync checkbox for each plugin
-#: ../prefs_gui.c:1022
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "Synchronise %s (%s)"
 
-#: ../print_gui.c:185
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Options d'impression"
 
-#: ../print_gui.c:198
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Taille papier"
 
-#: ../print_gui.c:214
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Impression quotidienne"
 
-#: ../print_gui.c:220
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Impression hebdomadaire"
 
-#: ../print_gui.c:226
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Impression mensuelle"
 
-#: ../print_gui.c:266
+#: ../print_gui.c:264
 msgid "Selected record"
 msgstr "Enregistrement selectionné"
 
-#: ../print_gui.c:270
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Tous les enregistrements de cette catégorie"
 
-#: ../print_gui.c:274
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Imprimer tous les enregistrements"
 
-#: ../print_gui.c:296
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Un enregistrement par page"
 
-#: ../print_gui.c:312
+#: ../print_gui.c:310
 msgid "Blank lines between each record"
 msgstr "Lignes blanches entre les enregistrements"
 
 #. Print Command
-#: ../print_gui.c:321
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Commande d'impression (e.g. lpr ou cat > fichier.ps)"
 
-#: ../restore_gui.c:71 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Restaure le PDA"
 
-#: ../restore_gui.c:176 ../restore_gui.c:178
+#: ../restore_gui.c:174 ../restore_gui.c:176
 msgid "Unable to convert filename for GTK display\n"
 msgstr "Impossible de convertir le fichier en affichage GTK\n"
 
-#: ../restore_gui.c:177
+#: ../restore_gui.c:175
 msgid "See console log to find which file will not be restored\n"
 msgstr ""
 "Regardez la console de log pour savoir quel fichier ne sera pas restauré\n"
 
-#: ../restore_gui.c:179
+#: ../restore_gui.c:177
 #, c-format
 msgid "File %s will not be restored\n"
 msgstr "Le fichier %s ne sera pas restauré\n"
 
 #. Label for instructions
-#: ../restore_gui.c:246
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Restaurer votre PDA :"
 
-#: ../restore_gui.c:249
+#: ../restore_gui.c:247
 msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1. Choisir toutes les applications à restaurer. Toutes par défaut."
 
-#: ../restore_gui.c:252
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Entrez le nom d'utilisateur et l'identifiant (user ID)."
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Appuyez sur OK."
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Cette opération écrase les données sur le PDA."
 
-#: ../search_gui.c:144
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "agenda"
 
-#: ../search_gui.c:146
+#: ../search_gui.c:144
 msgid "calendar"
 msgstr "calendar"
 
-#: ../search_gui.c:233
+#: ../search_gui.c:231
 msgid "address"
 msgstr "adresse"
 
-#: ../search_gui.c:235
+#: ../search_gui.c:233
 msgid "contact"
 msgstr ""
 
-#: ../search_gui.c:304
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "tâches"
 
-#: ../search_gui.c:361
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "bloc-notes"
 
-#: ../search_gui.c:363
+#: ../search_gui.c:361
 msgid "memos"
 msgstr "bloc-notes"
 
-#: ../search_gui.c:421
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "Greffons ?"
 
-#: ../search_gui.c:501
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Aucun enregistrement trouvé"
 
-#: ../search_gui.c:600
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Recherche"
 
 #. Search label
-#: ../search_gui.c:617
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Chercher : "
 
 #. Case Sensitive checkbox
-#: ../search_gui.c:626
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Tiens compte de MAJ/min"
 
-#: ../sync.c:120
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "Échec à l'ouverture du fichier verrou\n"
 
-#: ../sync.c:133
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "echec du verrouillage\n"
 
@@ -2618,58 +2622,58 @@ msgstr "echec du verrouillage\n"
 msgid "sync file is locked by pid %d\n"
 msgstr "fichier de synchro verrouillé par pid %d\n"
 
-#: ../sync.c:171
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "echec du déverrouillage\n"
 
-#: ../sync.c:174
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "synchro verrouillée par pid %d\n"
 
-#: ../sync.c:410
+#: ../sync.c:418
 msgid "Check your sync port and settings\n"
 msgstr "Vérifier le port de synchronisation et ses réglages\n"
 
-#: ../sync.c:669
+#: ../sync.c:677
 msgid "Unable to read home dir\n"
 msgstr "Impossible d'ouvrir le home dir\n"
 
-#: ../sync.c:1075 ../sync.c:1413
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
 msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
 msgstr "%s (Creator ID '%s') est à jour, récupération sautée\n"
 
-#: ../sync.c:1079 ../sync.c:1417
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
 msgid "Fetching '%s' (Creator ID '%s')... "
 msgstr "Récupère '%s' (Creator ID '%s')... "
 
-#: ../sync.c:1086 ../sync.c:1423
+#: ../sync.c:1096 ../sync.c:1433
 #, c-format
 msgid "Failed, unable to create file %s\n"
 msgstr "Échoué, ne peut créer le fichier %s\n"
 
-#: ../sync.c:1090 ../sync.c:1428
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
 msgid "Failed, unable to back up database %s\n"
 msgstr "Échoué, ne peut sauvegarder la base de données %s\n"
 
-#: ../sync.c:1094 ../sync.c:1432 ../sync.c:1619
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
 msgid "OK\n"
 msgstr "OK\n"
 
-#: ../sync.c:1294
+#: ../sync.c:1304
 #, c-format
 msgid "Skipping %s (Creator ID '%s')\n"
 msgstr "Saute  %s (Creator ID '%s')\n"
 
-#: ../sync.c:1488
+#: ../sync.c:1498
 #, c-format
 msgid "Installing %s "
 msgstr "Installe %s "
 
-#: ../sync.c:1494 ../sync.c:1530
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
 msgid ""
 "\n"
@@ -2678,7 +2682,7 @@ msgstr ""
 "\n"
 "Ne peut pas ouvrir '%s' : %s !\n"
 
-#: ../sync.c:1498
+#: ../sync.c:1508
 #, c-format
 msgid ""
 "\n"
@@ -2687,22 +2691,22 @@ msgstr ""
 "\n"
 "Ne peut pas synchroniser '%s' : fichier corrompu ?\n"
 
-#: ../sync.c:1514
+#: ../sync.c:1524
 #, c-format
 msgid "(Creator ID '%s')... "
 msgstr "(Creator ID est '%s')... "
 
-#: ../sync.c:1518
+#: ../sync.c:1528
 #, c-format
 msgid "(Creator ID '%s') "
 msgstr "(Creator ID est '%s') "
 
-#: ../sync.c:1520
+#: ../sync.c:1530
 #, c-format
 msgid "(SDcard dir %s)... "
 msgstr "(répertoire CDcard est '%s')... "
 
-#: ../sync.c:1552 ../sync.c:1565 ../sync.c:1580 ../sync.c:1593
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
 msgid ""
 "\n"
@@ -2711,114 +2715,114 @@ msgstr ""
 "\n"
 "Impossible d'ouvrir le fichier %s\n"
 
-#: ../sync.c:1605
+#: ../sync.c:1615
 #, c-format
 msgid "Install %s failed"
 msgstr "Installation de %s echouée"
 
-#: ../sync.c:1609
+#: ../sync.c:1619
 msgid "Failed.\n"
 msgstr "Échoué.\n"
 
-#: ../sync.c:1615
+#: ../sync.c:1625
 #, c-format
 msgid "Installed %s"
 msgstr "Installé %s"
 
-#: ../sync.c:1726
+#: ../sync.c:1736
 #, c-format
 msgid "%s:%d Error getting app info %s\n"
 msgstr "%s:%d Erreur de lecture app info  %s\n"
 
-#: ../sync.c:1732 ../sync.c:1762
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
 msgid "%s:%d Error unpacking app info %s\n"
 msgstr "%s:%d Erreur décompactage app info %s\n"
 
-#: ../sync.c:1753
+#: ../sync.c:1763
 #, c-format
 msgid "Error reading appinfo block for %s\n"
 msgstr "Erreur en lecture bloc appinfo pour %s\n"
 
 #. Fix - need a func for this logging
-#: ../sync.c:1991 ../sync.c:1995
+#: ../sync.c:2001 ../sync.c:2005
 #, c-format
 msgid "Could not add category %s to remote.\n"
 msgstr "Impossible d'ajouter la catégorie %s au distant.\n"
 
-#: ../sync.c:1992 ../sync.c:1998
+#: ../sync.c:2002 ../sync.c:2008
 #, c-format
 msgid "Too many categories on remote.\n"
 msgstr "Trop de catégories sur le distant.\n"
 
-#: ../sync.c:1993 ../sync.c:2001
+#: ../sync.c:2003 ../sync.c:2011
 #, c-format
 msgid "All records on desktop in %s will be moved to %s.\n"
 msgstr "Tous les enregistrements dans %s seront déplacés vers %s.\n"
 
-#: ../sync.c:2096 ../sync.c:2814
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Synchronise %s\n"
 
-#: ../sync.c:2104 ../sync.c:2457 ../sync.c:2822
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Écrit un enregistrement %s."
 
-#: ../sync.c:2106 ../sync.c:2459 ../sync.c:2824
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "L'écriture d'un enregistrement %s a échoué."
 
-#: ../sync.c:2108 ../sync.c:2461 ../sync.c:2826
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "La suppression d'un enregistrement %s a échoué."
 
-#: ../sync.c:2110 ../sync.c:2463 ../sync.c:2828
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Supprime un enregistrement %s."
 
-#: ../sync.c:2112 ../sync.c:2465
+#: ../sync.c:2122 ../sync.c:2475
 #, c-format
 msgid "Sync Conflict: duplicated an %s record."
 msgstr "Conflit de synchronisation : duplication de l'enregistrement %s."
 
-#: ../sync.c:2115 ../sync.c:2468 ../sync.c:2831
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Écrit un enregistrement %s."
 
-#: ../sync.c:2117 ../sync.c:2470 ../sync.c:2833
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "L'écriture d'un enregistrement %s a échoué."
 
-#: ../sync.c:2119 ../sync.c:2472 ../sync.c:2835
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "La suppression d'un enregistrement %s a échoué."
 
-#: ../sync.c:2121 ../sync.c:2474 ../sync.c:2837
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Supprime un enregistrement %s."
 
-#: ../sync.c:2123 ../sync.c:2476
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
 msgid "Sync Conflict: duplicated a %s record."
 msgstr "Conflit de synchronisation : duplication de l'enregistrement %s."
 
-#: ../sync.c:2227 ../sync.c:2557
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
 msgid "Sync Conflict: a %s record must be manually merged\n"
 msgstr ""
 "Conflit de synchronisation : un enregistrement %s doit être fusionné à la "
 "main\n"
 
-#: ../sync.c:2358 ../sync.c:2698
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2826,93 +2830,93 @@ msgstr ""
 "dlp_DeleteRecord failed\n"
 "l'enregistrement est peut-être déjà supprimé sur le Palm\n"
 
-#: ../sync.c:2927
+#: ../sync.c:2937
 msgid "Finished installing user information.\n"
 msgstr "Fin de l'installation des informations utilisateur.\n"
 
-#: ../sync.c:3084
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr " Synchronisation sur %s\n"
 
-#: ../sync.c:3085
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr " Appuyez sur le bouton HotSync maintenant\n"
 
-#: ../sync.c:3127 ../sync.c:3149 ../sync.c:3170
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr "Dernière Sync Username-->\"%s\"\n"
 
-#: ../sync.c:3128 ../sync.c:3150 ../sync.c:3171
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr "Dernière Sync UserID-->\"%d\"\n"
 
-#: ../sync.c:3129 ../sync.c:3151 ../sync.c:3172
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr " Ce Username-->\"%s\"\n"
 
-#: ../sync.c:3130 ../sync.c:3152 ../sync.c:3173
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
 msgid " This User ID-->%d\n"
 msgstr " Ce User ID-->%d\n"
 
-#: ../sync.c:3194
+#: ../sync.c:3204
 #, c-format
 msgid "Username is \"%s\"\n"
 msgstr "Le nom d'utilisateur est \"%s\"\n"
 
-#: ../sync.c:3195
+#: ../sync.c:3205
 #, c-format
 msgid "User ID is %d\n"
 msgstr "L'ID utilisateur est %d\n"
 
-#: ../sync.c:3197
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr "lastSyncPC = %d\n"
 
-#: ../sync.c:3198
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr "Ce PC = %lu\n"
 
-#: ../sync.c:3222
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr "Sync annulé\n"
 
-#: ../sync.c:3245
+#: ../sync.c:3255
 msgid "Finished restoring handheld.\n"
 msgstr "Restauration manuelle terminée.\n"
 
-#: ../sync.c:3246
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr "Vous pouvez avoir besoin de synchroniser pour mettre à jour J-Pilot.\n"
 
-#: ../sync.c:3268
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr "Effectue une synchronisation rapide.\n"
 
-#: ../sync.c:3281
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr "Effectue une synchronisation lente.\n"
 
-#: ../sync.c:3356
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr "Merci d'utiliser J-Pilot."
 
-#: ../sync.c:3401 ../sync.c:3469
+#: ../sync.c:3411 ../sync.c:3479
 msgid "Finished.\n"
 msgstr "Terminé.\n"
 
-#: ../sync.c:3436
+#: ../sync.c:3446
 #, c-format
 msgid "%s: sync process already in progress (process ID = %d)\n"
 msgstr ""
 
-#: ../sync.c:3437
+#: ../sync.c:3447
 #, c-format
 msgid ""
 "%s: press the HotSync button on the cradle\n"
@@ -2924,22 +2928,22 @@ msgstr ""
 "      ou arrétez la synchronisation en tapant \"kill %d\" sur la ligne de "
 "comande\n"
 
-#: ../sync.c:3468
+#: ../sync.c:3478
 #, c-format
 msgid "Exiting with status %s\n"
 msgstr "Fin avec l'état %s\n"
 
-#: ../todo.c:266
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "Description de la tâche trop longue > %d, coupée à %d\n"
 
-#: ../todo.c:272
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "Note de la tâche trop longue > %d, coupée à %d\n"
 
-#: ../todo_gui.c:161
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Date prévue"
 
@@ -3003,120 +3007,120 @@ msgstr ""
 msgid "Priority out of range\n"
 msgstr "Priorité hors limite\n"
 
-#: ../todo_gui.c:1932 ../KeyRing/keyring.c:1310
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Sans date"
 
 #. Completed checkbox
-#: ../todo_gui.c:2414
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../todo_gui.c:2421
+#: ../todo_gui.c:2418
 msgid "Priority:"
 msgstr "Priorité : "
 
-#: ../todo_gui.c:2423
+#: ../todo_gui.c:2420
 msgid "Set priority   Alt+#"
 msgstr ""
 
-#: ../todo_gui.c:2444
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "Date prévue : "
 
-#: ../utils.c:332
+#: ../utils.c:330
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ../utils.c:577
+#: ../utils.c:575
 #, c-format
 msgid "Couldn't find empty DB file %s: %s\n"
 msgstr "Ne peut pas trouver la base vide %s : %s.\n"
 
-#: ../utils.c:580
+#: ../utils.c:578
 msgid " may not be installed.\n"
 msgstr " peut ne pas être installé.\n"
 
 #. Can't create directory
-#: ../utils.c:615 ../utils.c:619
+#: ../utils.c:613 ../utils.c:617
 #, c-format
 msgid "Can't create directory %s\n"
 msgstr "Ne peut créer le répertoire %s\n"
 
-#: ../utils.c:625
+#: ../utils.c:623
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s n'est pas un répertoire.\n"
 
-#: ../utils.c:630
+#: ../utils.c:628
 #, c-format
 msgid "Unable to get write permission for directory %s\n"
 msgstr "N'a pas le droit d'écrire dans le répertoire %s\n"
 
-#: ../utils.c:1330 ../utils.c:1354
+#: ../utils.c:1328 ../utils.c:1352
 msgid "Save Changed Record?"
 msgstr "Sauver les enregistrements modifiés ?"
 
-#: ../utils.c:1331 ../utils.c:1355
+#: ../utils.c:1329 ../utils.c:1353
 msgid "Do you want to save the changes to this record?"
 msgstr "Voulez vous sauvegarder les modifications de cet enregistrement ?"
 
-#: ../utils.c:1336 ../utils.c:1360
+#: ../utils.c:1334 ../utils.c:1358
 msgid "Save New Record?"
 msgstr "Sauver nouvel enregistrement ?"
 
-#: ../utils.c:1337 ../utils.c:1361
+#: ../utils.c:1335 ../utils.c:1359
 msgid "Do you want to save this new record?"
 msgstr "Voulez vous sauvegarder ce nouvel enregistrement ?"
 
-#: ../utils.c:1652
+#: ../utils.c:1650
 msgid "infinite loop, breaking\n"
 msgstr "boucle infinie, annulation\n"
 
-#: ../utils.c:1876
+#: ../utils.c:1874
 #, c-format
 msgid " -p skip loading plugins\n"
 msgstr " -p ne charge pas des plugins\n"
 
-#: ../utils.c:1877
+#: ../utils.c:1875
 #, c-format
 msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr " -a ignore les alarmes échues depuis la dernière exécution\n"
 
-#: ../utils.c:1878
+#: ../utils.c:1876
 #, c-format
 msgid " -A ignore all alarms past and future\n"
 msgstr " -A ignore toutes les alarmes; passées et futures\n"
 
-#: ../utils.c:1879
+#: ../utils.c:1877
 #, c-format
 msgid " -s start sync using existing instance of GUI\n"
 msgstr ""
 
-#: ../utils.c:1880
+#: ../utils.c:1878
 #, c-format
 msgid " -i iconify program immediately after launch\n"
 msgstr ""
 
-#: ../utils.c:1881
+#: ../utils.c:1879
 #, c-format
 msgid ""
 " -geometry {X geometry} use specified geometry for main window\n"
 "\n"
 msgstr ""
 
-#: ../utils.c:1882
+#: ../utils.c:1880
 #, c-format
 msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " Les variables d'environnement PILOTPORT et PILOTRATE sont utilisées\n"
 
-#: ../utils.c:1883
+#: ../utils.c:1881
 #, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " pour spécifier quel port utiliser et quelle vitesse.\n"
 
-#: ../utils.c:1884
+#: ../utils.c:1882
 #, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " Si PILOTPORT n'est pas défini alors /dev/pilot est utilisé.\n"
@@ -3125,97 +3129,99 @@ msgstr " Si PILOTPORT n'est pas défini alors /dev/pilot est utilisé.\n"
 msgid "Error reading file"
 msgstr "Erreur en lisant le fichier"
 
-#: ../utils.c:1971
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Date de compilation"
 
-#: ../utils.c:1972
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Compilé avec ces options :"
 
-#: ../utils.c:1974
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Chemin d'installation"
 
-#: ../utils.c:1976
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "version de pilot-link"
 
-#: ../utils.c:1980
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "Support USB"
 
-#: ../utils.c:1981 ../utils.c:1984 ../utils.c:1990 ../utils.c:1996
-#: ../utils.c:2002 ../utils.c:2008 ../utils.c:2013
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "oui"
 
-#: ../utils.c:1982
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Support des enregistrements privés"
 
-#: ../utils.c:1986 ../utils.c:1992 ../utils.c:1998 ../utils.c:2004
-#: ../utils.c:2010
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
 msgid "no"
 msgstr "non"
 
-#: ../utils.c:1988
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Support Datebk"
 
-#: ../utils.c:1994
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Support des greffons"
 
-#: ../utils.c:2000
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Support Manana"
 
-#: ../utils.c:2006
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "Support NLS (autres langages)"
 
-#: ../utils.c:2012
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "support GTK2"
 
 #. No HOME var
-#: ../utils.c:2055
+#: ../utils.c:2057
+#, c-format
 msgid "Can't get HOME environment variable\n"
 msgstr "Ne peut pas récupérer la variable d'environnement HOME\n"
 
-#: ../utils.c:2062
+#: ../utils.c:2064
+#, c-format
 msgid "HOME environment variable is too long to process\n"
 msgstr "Votre variable d'environnement HOME est trop longue\n"
 
-#: ../utils.c:2557
+#: ../utils.c:2567
 msgid "Edit Categories..."
 msgstr "Edition des Catégories..."
 
-#: ../utils.c:3223
+#: ../utils.c:3233
 msgid "PC ID is 0.\n"
 msgstr "PC ID est 0.\n"
 
-#: ../utils.c:3224
+#: ../utils.c:3234
 #, c-format
 msgid "Generated a new PC ID.  It is %lu\n"
 msgstr "Génération d'un nouveau PC ID. C'est %lu\n"
 
-#: ../utils.c:3309
+#: ../utils.c:3376
 msgid "Invalid UTF-8 encoding in export string\n"
 msgstr ""
 
-#: ../utils.c:3470
+#: ../utils.c:3537
 #, c-format
 msgid "Today is %A, %x %X"
 msgstr "Aujourd'hui %A, %x %X"
 
-#: ../utils.c:3472
+#: ../utils.c:3539
 #, c-format
 msgid "Today is %%A, %s %s"
 msgstr "Aujourd'hui %%A, %s %s"
 
-#: ../utils.c:3701
+#: ../utils.c:3768
 #, c-format
 msgid ""
 "Incorrect header format for CSV import\n"
@@ -3223,374 +3229,374 @@ msgid ""
 "Aborting import\n"
 msgstr ""
 
-#: ../utils.c:3738
+#: ../utils.c:3805
 #, c-format
 msgid "Error writing version header to file: %s%s\n"
 msgstr "Erreur d'écriture de l'entête de version dans le fichier : %s%s\n"
 
-#: ../utils.c:3743
+#: ../utils.c:3810
 #, c-format
 msgid "Error writing next id to file: %s%s"
 msgstr "Erreur d'écriture de next id dans le fichier : %s%s"
 
-#: ../weekview_gui.c:297
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Vue hebdo"
 
-#: ../weekview_gui.c:337
+#: ../weekview_gui.c:335
 msgid "Last week   Alt+LeftArrow"
 msgstr ""
 
-#: ../weekview_gui.c:366
+#: ../weekview_gui.c:364
 msgid "Next week   Alt+RightArrow"
 msgstr ""
 
-#: ../Expense/expense.c:97
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Australie"
 
-#: ../Expense/expense.c:98
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Autriche"
 
-#: ../Expense/expense.c:99
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brésil"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Canada"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Danemark"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (Euro)"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finlande"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "France"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Allemagne"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Islande"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Inde"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Irlande"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Italie"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Japon"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Corée"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Malaysie"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Mexique"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Pays Bas"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Nouvelle-Zélande"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Norvège"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "Chine"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Philippines"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Espagne"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Suisse"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Taïwan"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Royaume Uni"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "USA"
 
-#: ../Expense/expense.c:518 ../Expense/expense.c:529
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Dépenses"
 
-#: ../Expense/expense.c:550 ../Expense/expense.c:1388
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Transport aérien"
 
-#: ../Expense/expense.c:552 ../Expense/expense.c:1389
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "petit déjeuner"
 
-#: ../Expense/expense.c:554 ../Expense/expense.c:1390
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Bus"
 
-#: ../Expense/expense.c:556 ../Expense/expense.c:1391
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "repas d'affaire"
 
-#: ../Expense/expense.c:558 ../Expense/expense.c:1392
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Location de voiture"
 
-#: ../Expense/expense.c:560 ../Expense/expense.c:1393
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Diner"
 
-#: ../Expense/expense.c:562 ../Expense/expense.c:1394
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Distraction"
 
-#: ../Expense/expense.c:564 ../Expense/expense.c:1395
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Télécopie"
 
-#: ../Expense/expense.c:566 ../Expense/expense.c:1396
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Essence"
 
-#: ../Expense/expense.c:568 ../Expense/expense.c:1397
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Cadeaux"
 
-#: ../Expense/expense.c:570 ../Expense/expense.c:1398
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hôtel"
 
-#: ../Expense/expense.c:572 ../Expense/expense.c:1399
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Faux-frais"
 
-#: ../Expense/expense.c:574 ../Expense/expense.c:1400
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Blanchisserie"
 
-#: ../Expense/expense.c:576 ../Expense/expense.c:1401
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Voiture"
 
-#: ../Expense/expense.c:578 ../Expense/expense.c:1402
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Pension"
 
-#: ../Expense/expense.c:580 ../Expense/expense.c:1403
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Déjeuner"
 
-#: ../Expense/expense.c:582 ../Expense/expense.c:1404
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Kilométrage"
 
-#: ../Expense/expense.c:586 ../Expense/expense.c:1406
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Parking"
 
-#: ../Expense/expense.c:588 ../Expense/expense.c:1407
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "frais d'envois"
 
-#: ../Expense/expense.c:590 ../Expense/expense.c:1408
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Snack"
 
-#: ../Expense/expense.c:592 ../Expense/expense.c:1409
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Métro"
 
-#: ../Expense/expense.c:594 ../Expense/expense.c:1410
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Subsistance"
 
-#: ../Expense/expense.c:596 ../Expense/expense.c:1411
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taxi"
 
-#: ../Expense/expense.c:598 ../Expense/expense.c:1412
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: ../Expense/expense.c:600 ../Expense/expense.c:1413
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Pourboires"
 
-#: ../Expense/expense.c:602 ../Expense/expense.c:1414
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Péages"
 
-#: ../Expense/expense.c:604 ../Expense/expense.c:1415
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Train"
 
-#: ../Expense/expense.c:1239
+#: ../Expense/expense.c:1237
 msgid "Expense: Unknown expense type\n"
 msgstr "Expense : type de dépense inconnu\n"
 
-#: ../Expense/expense.c:1245
+#: ../Expense/expense.c:1243
 msgid "Expense: Unknown payment type\n"
 msgstr "Expense : type de paiement inconnu\n"
 
-#: ../Expense/expense.c:1377
+#: ../Expense/expense.c:1375
 msgid "American Express"
 msgstr "American Express"
 
-#: ../Expense/expense.c:1378
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Espèces"
 
-#: ../Expense/expense.c:1379
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Chèque"
 
-#: ../Expense/expense.c:1380
+#: ../Expense/expense.c:1378
 msgid "Credit Card"
 msgstr "Carte de crédit"
 
-#: ../Expense/expense.c:1381
+#: ../Expense/expense.c:1379
 msgid "Master Card"
 msgstr "MasterCard/Eurocard"
 
-#: ../Expense/expense.c:1382
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Prépayé"
 
-#: ../Expense/expense.c:1383
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA / CB"
 
-#: ../Expense/expense.c:1619
+#: ../Expense/expense.c:1617
 msgid "Type"
 msgstr "Type"
 
-#: ../Expense/expense.c:1620
+#: ../Expense/expense.c:1618
 msgid "Amount"
 msgstr "Montant"
 
 #. Category Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Catégorie :"
 
 #. Type Menu
-#: ../Expense/expense.c:1712
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Type :"
 
 #. Payment Menu
-#: ../Expense/expense.c:1720
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Paiement :"
 
 #. Currency Menu
-#: ../Expense/expense.c:1728
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Monnaie :"
 
-#: ../Expense/expense.c:1748
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Mois :"
 
-#: ../Expense/expense.c:1762
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Jour :"
 
-#: ../Expense/expense.c:1776
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Année :"
 
 #. Amount Entry
-#: ../Expense/expense.c:1789
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Montant :"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1799
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Vendeur :"
 
 #. City
-#: ../Expense/expense.c:1809
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "Ville :"
 
 #. Attendees
-#: ../Expense/expense.c:1819
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Invités"
 
 #. -------------------------------------------
-#: ../Expense/expense.c:2102
+#: ../Expense/expense.c:2100
 #, c-format
 msgid ""
 "%s\n"
@@ -3600,37 +3606,37 @@ msgid ""
 "judd@jpilot.org, http://jpilot.org"
 msgstr ""
 
-#: ../KeyRing/keyring.c:291
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "KeyRing : pack_KeyRing() : buf_size trop petite\n"
 
-#: ../KeyRing/keyring.c:1699
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Erreur, Re-entrez le mot de passe KeyRing"
 
-#: ../KeyRing/keyring.c:1701
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Tapez le NOUVEAU mot de passe KeyRing"
 
-#: ../KeyRing/keyring.c:1703
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Tapez le mot de passe KeyRing"
 
-#: ../KeyRing/keyring.c:1769
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "KeyRing : fichier %s non trouvé.\n"
 
-#: ../KeyRing/keyring.c:1770
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "KeyRing : Essayez de synchroniser.\n"
 
-#: ../KeyRing/keyring.c:1861 ../KeyRing/keyring.c:1872
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "KeyRing"
 
 #. -------------------------------------------
-#: ../KeyRing/keyring.c:1900
+#: ../KeyRing/keyring.c:1898
 #, c-format
 msgid ""
 "%s\n"
@@ -3644,7 +3650,7 @@ msgid ""
 "http://gnukeyring.sourceforge.net"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2137
+#: ../KeyRing/keyring.c:2136
 #, c-format
 msgid ""
 "Keys exported from %s %s on %s\n"
@@ -3653,17 +3659,13 @@ msgstr ""
 "Clés exportés de %s %s le %s\n"
 "\n"
 
-#: ../KeyRing/keyring.c:2162
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
 #, c-format
 msgid "Can't export key %d\n"
 msgstr "Imposible d'exporter la clé %d\n"
 
-#: ../KeyRing/keyring.c:2229
-msgid "B-FOLDERS CSV"
-msgstr ""
-
 #. Change Password button
-#: ../KeyRing/keyring.c:2384
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3674,45 +3676,45 @@ msgstr ""
 "Mot de passe"
 
 #. Clist
-#: ../KeyRing/keyring.c:2497
+#: ../KeyRing/keyring.c:2564
 msgid "Changed"
 msgstr "Modifié"
 
-#: ../KeyRing/keyring.c:2499
+#: ../KeyRing/keyring.c:2566
 msgid "Account"
 msgstr "Compte"
 
 #. Name entry
-#: ../KeyRing/keyring.c:2593
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "nom : "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2601
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "compte : "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2609
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "Mot de passe : "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2616
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr "dernier changement : "
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2626
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Génération d'un mot de passe"
 
-#: ../SyncTime/synctime.c:61
+#: ../SyncTime/synctime.c:59
 msgid "SyncTime"
 msgstr "SyncTime"
 
 #. -------------------------------------------
-#: ../SyncTime/synctime.c:72
+#: ../SyncTime/synctime.c:70
 #, c-format
 msgid ""
 "%s\n"
@@ -3724,22 +3726,26 @@ msgid ""
 "SyncTime WILL NOT work with PalmOS 3.3!"
 msgstr ""
 
-#: ../SyncTime/synctime.c:106
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr "synctime: Palm OS versions 3.25 et 3.30 ne supportent pas SyncTime\n"
 
-#: ../SyncTime/synctime.c:107
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr "synctime: PAS de mise à l'heure du pilot\n"
 
-#: ../SyncTime/synctime.c:112
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr "synctime: Mise à l'heure du pilot..."
 
-#: ../SyncTime/synctime.c:117
+#: ../SyncTime/synctime.c:115
 msgid "Done\n"
 msgstr "Fait\n"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Écrase le fichier"
+
 #~ msgid "Serial Port"
 #~ msgstr "Port série"
 
@@ -3955,9 +3961,6 @@ msgstr "Fait\n"
 #~ msgid "Directory"
 #~ msgstr "Répertoire"
 
-#~ msgid "Overwrite File"
-#~ msgstr "Écrase le fichier"
-
 #~ msgid "Filename"
 #~ msgstr "Nom de fichier"
 
diff --git a/po/it.po b/po/it.po
index f2501a5a..517ab63e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,42 +7,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 1.6.0-pre2\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2007-11-23 20:00+0100\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2008-05-12 12:13+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\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"
 
-#: ../address.c:295 ../address.c:539 ../alarms.c:370 ../contact.c:277
-#: ../contact.c:582 ../dat.c:181 ../dat.c:655 ../dat.c:857 ../dat.c:991
-#: ../dat.c:1130 ../datebook.c:89 ../datebook.c:390 ../datebook.c:397
-#: ../datebook.c:427 ../datebook.c:1043 ../jpilot.c:1564 ../libplugin.c:437
-#: ../libplugin.c:719 ../libplugin.c:829 ../libplugin.c:908 ../libplugin.c:952
-#: ../memo.c:95 ../memo.c:384 ../plugins.c:112 ../prefs.c:323 ../prefs.c:348
-#: ../prefs.c:887 ../sync.c:294 ../sync.c:1256 ../sync.c:1311 ../sync.c:1325
-#: ../sync.c:2549 ../sync.c:2618 ../todo.c:206 ../todo.c:543 ../utils.c:2520
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: ../address.c:352 ../address.c:359 ../contact.c:334 ../datebook.c:340
-#: ../libplugin.c:179 ../memo.c:166 ../memo.c:173 ../todo.c:289 ../todo.c:296
-#: ../utils.c:2130 ../utils.c:2138 ../utils.c:2151 ../utils.c:2159
-#: ../utils.c:2167 ../utils.c:2183 ../utils.c:2192 ../utils.c:2201
-#: ../utils.c:2210 ../utils.c:2220
-msgid "error"
-msgstr "errore"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Errore durante la lettura delle informazioni categoria %s\n"
 
-#: ../address.c:418 ../address_gui.c:1999 ../contact.c:403 ../datebook.c:686
-#: ../libplugin.c:779 ../libplugin.c:805 ../memo.c:258 ../memo_gui.c:986
-#: ../todo_gui.c:1290 ../Expense/expense.c:1088 ../Expense/expense.c:2088
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Errore durante la lettura del file: %s\n"
 
-#: ../address_gui.c:391 ../datebook_gui.c:2538 ../memo_gui.c:166
-#: ../todo_gui.c:281 ../KeyRing/keyring.c:634
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "errore"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -50,469 +60,559 @@ msgstr ""
 "Questa voce è eliminata.\n"
 "Occorre ripristinarla o copiarla per apportare cambiamenti.\n"
 
-#: ../address_gui.c:526 ../address_gui.c:531 ../address_gui.c:541
-#: ../address_gui.c:551 ../address_gui.c:561 ../address_gui.c:572
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
 #, c-format
 msgid "%s%s: %s"
 msgstr ""
 
-#: ../address_gui.c:650 ../category.c:155 ../category.c:161 ../category.c:209
-#: ../category.c:266 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1212
-#: ../sync.c:1218 ../sync.c:2520 ../sync.c:2823 ../sync.c:2829 ../sync.c:2951
-#: ../sync.c:3273 ../todo_gui.c:421 ../utils.c:2925 ../utils.c:2966
-#: ../utils.c:2972 ../utils.c:3035 ../utils.c:3041 ../utils.c:3102
-#: ../utils.c:3157 ../utils.c:3163 ../utils.c:3224 ../utils.c:3231
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Impossibile aprire il file: %s\n"
 
-#: ../address_gui.c:729
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Impossibile aprire il file: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Il file non ha il formato di un file address.dat.\n"
 
-#: ../address_gui.c:739 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:546 ../Expense/expense.c:1363
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Non archiviato"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:876 ../alarms.c:289 ../category.c:412 ../category.c:891
-#: ../category.c:944 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:359 ../jpilot.c:404 ../jpilot.c:472
-#: ../jpilot.c:516 ../jpilot.c:1000 ../jpilot.c:1898 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:331 ../todo_gui.c:634 ../utils.c:1188
-#: ../utils.c:1369 ../KeyRing/keyring.c:1597
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "OK"
 
-#: ../address_gui.c:877 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:635 ../utils.c:1387
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "No"
 
-#: ../address_gui.c:877 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:635 ../utils.c:1387
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Sì"
 
-#: ../address_gui.c:900 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:660
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s è una directory"
 
-#: ../address_gui.c:902 ../address_gui.c:919 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:662
-#: ../todo_gui.c:679
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Errore durante l'apertura del file"
 
-#: ../address_gui.c:906 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:666
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Sovrascrivere il file %s?"
 
-#: ../address_gui.c:908 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:668
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Sovrascrivere il file?"
 
-#: ../address_gui.c:917 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:677
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Errore durante l'apertura del file: %s"
 
-#: ../address_gui.c:928
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Impossibile esportare l'indirizzo %d\n"
 
-#: ../address_gui.c:996 ../address_gui.c:1004 ../address_gui.c:1024
-msgid "Field"
-msgstr "Campo"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Categoria: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Privato"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "Email"
 
-#: ../address_gui.c:1225 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:816
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Tipo di esportazione sconosciuto\n"
 
-#: ../address_gui.c:1473 ../address_gui.c:3385
-msgid "Company/Name"
-msgstr "Società/Nome"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Nome/Società"
 
-#: ../address_gui.c:1475 ../address_gui.c:3387
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Nome/Società"
 
-#: ../address_gui.c:1602 ../datebook_gui.c:2616 ../memo_gui.c:894
-#: ../todo_gui.c:1218 ../KeyRing/keyring.c:974
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Società/Nome"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Impossibile modificare una voce eliminata\n"
 
-#. Illegal category
-#: ../address_gui.c:1789 ../address_gui.c:2416 ../address_gui.c:3086
-#: ../memo_gui.c:800 ../memo_gui.c:1078 ../memo_gui.c:1368 ../todo_gui.c:1084
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Categoria non valida\n"
 
-#: ../address_gui.c:1841
-#, fuzzy
-msgid "email command empty\n"
-msgstr "Comando di posta"
-
-#: ../address_gui.c:1849 ../alarms.c:629 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "esecuzione comando = [%s]\n"
 
-#: ../address_gui.c:2055
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
 msgid "Birthday"
 msgstr ""
 
-#: ../address_gui.c:2137
+#: ../address_gui.c:2575
 msgid "External program not found, or other error"
 msgstr ""
 
-#: ../address_gui.c:2138
+#: ../address_gui.c:2577
 msgid ""
-"J-Pilot can not find an external program \"convert\"\n"
+"J-Pilot can not find the external program \"convert\"\n"
 "or an error occurred while executing convert.\n"
 "You may need to install package ImageMagick"
 msgstr ""
 
-#: ../address_gui.c:2139
+#: ../address_gui.c:2578
 #, c-format
 msgid "Command executed was \"%s\"\n"
 msgstr ""
 
-#: ../address_gui.c:2140
+#: ../address_gui.c:2579
 #, c-format
 msgid "return code was %d\n"
 msgstr ""
 
-#: ../address_gui.c:2219
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "lock non riuscito\n"
+
+#: ../address_gui.c:2660
 msgid "Add Photo"
 msgstr ""
 
-#. NEW CODE
-#. Fill out the "All" text buffer
 #. Category menu
-#: ../address_gui.c:2441 ../Expense/expense.c:1560 ../KeyRing/keyring.c:2112
-#: ../KeyRing/keyring.c:2213
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Categoria: "
 
-#. Set dial/email button text and callback data
-#: ../address_gui.c:2460 ../address_gui.c:3644
-msgid "E-mail"
-msgstr "Email"
-
-#: ../address_gui.c:2463 ../address_gui.c:2465 ../address_gui.c:3645
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Posta"
 
 #. Dial Phone Button
-#: ../address_gui.c:2470 ../address_gui.c:2472 ../address_gui.c:3648
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Componi"
 
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
 # FIXME
-#: ../address_gui.c:2767 ../address_gui.c:2791
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "- Senza nome -"
 
-#: ../address_gui.c:2864 ../memo_gui.c:1278 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 voci"
 
-#: ../address_gui.c:2867 ../datebook_gui.c:2414 ../memo_gui.c:1281
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d di %d voci"
 
-#: ../address_gui.c:3258 ../address_gui.c:3265 ../KeyRing/keyring.c:2125
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
 msgid "Name"
 msgstr "Nome"
 
-#: ../address_gui.c:3259 ../address_gui.c:3260 ../address_gui.c:3261
-#: ../address_gui.c:3266 ../prefs_gui.c:423
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ../address_gui.c:3262 ../address_gui.c:3267 ../Expense/expense.c:555
-#: ../Expense/expense.c:1384
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
 msgid "Other"
 msgstr "Altro"
 
-#: ../address_gui.c:3281
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Note"
+
+#: ../address_gui.c:3844
 msgid "Reverting to Address database\n"
 msgstr ""
 
-#. Edit category button
-#: ../address_gui.c:3360 ../category.c:442 ../category.c:488 ../category.c:506
-#: ../category.c:585 ../category.c:778 ../memo_gui.c:1496 ../todo_gui.c:2101
-#: ../Expense/expense.c:1566
-msgid "Edit Categories"
-msgstr "Modifica categorie"
-
-#: ../address_gui.c:3391
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../address_gui.c:3414
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Ricerca rapida: "
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:3430 ../category.c:413 ../category.c:881 ../category.c:934
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4385
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1530
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:322
-#: ../todo_gui.c:2172 ../utils.c:1174 ../KeyRing/keyring.c:1587
-#: ../KeyRing/keyring.c:2154
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../address_gui.c:3430 ../datebook_gui.c:4385 ../memo_gui.c:1530
-#: ../todo_gui.c:2172 ../KeyRing/keyring.c:2154
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "Annulla le modifiche"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:3435 ../category.c:413 ../category.c:846
-#: ../datebook_gui.c:4390 ../memo_gui.c:1535 ../todo_gui.c:2177
-#: ../Expense/expense.c:1603 ../KeyRing/keyring.c:2159
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../address_gui.c:3435 ../datebook_gui.c:4390 ../memo_gui.c:1535
-#: ../todo_gui.c:2177 ../Expense/expense.c:1603 ../KeyRing/keyring.c:2159
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Elimina la voce selezionata"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:3441 ../datebook_gui.c:4396 ../memo_gui.c:1541
-#: ../todo_gui.c:2183 ../KeyRing/keyring.c:2165
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Ripristina"
 
-#: ../address_gui.c:3441 ../datebook_gui.c:4396 ../memo_gui.c:1541
-#: ../todo_gui.c:2183 ../KeyRing/keyring.c:2165
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Ripristina la voce selezionata"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:3447 ../datebook_gui.c:4402 ../memo_gui.c:1547
-#: ../todo_gui.c:2189 ../Expense/expense.c:1608 ../KeyRing/keyring.c:2171
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Copia"
 
-#: ../address_gui.c:3447 ../datebook_gui.c:4402 ../memo_gui.c:1547
-#: ../todo_gui.c:2189 ../Expense/expense.c:1608 ../KeyRing/keyring.c:2171
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Copia la voce selezionata"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:3453 ../datebook_gui.c:4408 ../memo_gui.c:1553
-#: ../todo_gui.c:2195 ../Expense/expense.c:1613 ../KeyRing/keyring.c:2177
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Nuova voce"
 
-#: ../address_gui.c:3453 ../datebook_gui.c:4408 ../memo_gui.c:1553
-#: ../todo_gui.c:2195 ../Expense/expense.c:1613 ../KeyRing/keyring.c:2177
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Aggiungi una nuova voce"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:3458 ../datebook_gui.c:4414 ../memo_gui.c:1559
-#: ../todo_gui.c:2201 ../Expense/expense.c:1618 ../KeyRing/keyring.c:2183
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Aggiungi voce"
 
-#: ../address_gui.c:3458 ../datebook_gui.c:4414 ../memo_gui.c:1559
-#: ../todo_gui.c:2201 ../Expense/expense.c:1618 ../KeyRing/keyring.c:2183
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Aggiungi una nuova voce"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:3468 ../datebook_gui.c:4424 ../memo_gui.c:1569
-#: ../todo_gui.c:2211 ../Expense/expense.c:1627 ../KeyRing/keyring.c:2193
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Applica"
 
-#: ../address_gui.c:3468 ../datebook_gui.c:4424 ../memo_gui.c:1569
-#: ../todo_gui.c:2211 ../Expense/expense.c:1627 ../KeyRing/keyring.c:2193
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "Applica le modifiche"
 
 #. Private check box
-#: ../address_gui.c:3485 ../datebook_gui.c:4475 ../memo_gui.c:1587
-#: ../todo_gui.c:2274
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privato"
 
-#: ../address_gui.c:3582
+#: ../address_gui.c:4169
 #, fuzzy
 msgid "Change Photo"
 msgstr "Cambiato"
 
-#: ../address_gui.c:3587
+#: ../address_gui.c:4174
 #, fuzzy
 msgid "Remove Photo"
 msgstr "Rimuovi"
 
-#: ../address_gui.c:3654
+#: ../address_gui.c:4246
 #, fuzzy
 msgid "Show In List"
 msgstr ""
 "Mostra\n"
 "in lista"
 
-#: ../address_gui.c:3797
+#: ../address_gui.c:4347
 #, fuzzy
 msgid "Reminder"
 msgstr "Ricordami"
 
-#: ../address_gui.c:3813 ../datebook_gui.c:4463
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
 msgid "Days"
 msgstr "Giorni"
 
-#. All page
-#. Create a "All" button
-#: ../address_gui.c:3848 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2881
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
 msgid "All"
 msgstr "Tutto"
 
-#: ../alarms.c:257 ../datebook_gui.c:4457
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minuti"
 
-#: ../alarms.c:259 ../datebook_gui.c:4461
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Ore"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Ricordami"
 
-#: ../alarms.c:457
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "Impossibile aprire il file %s%s\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "Impossibile aprire il file: %s%s\n"
 
-#: ../alarms.c:544
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Reminder appuntamento"
 
-#: ../alarms.c:547
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Appuntamento passato"
 
-#: ../alarms.c:550
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Appuntamento rimandato"
 
-#: ../alarms.c:553 ../datebook_gui.c:4293
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Impegno"
 
-#: ../alarms.c:636
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "Allarme J-Pilot"
 
-#: ../alarms.c:1103
-msgid "infinite loop, breaking\n"
-msgstr "ciclo infinito, interrotto\n"
-
-#: ../alarms.c:1472
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Impossibile aprire il file %s.alarms\n"
-
-#: ../category.c:188 ../sync.c:2860 ../utils.c:2993 ../utils.c:3071
-#: ../utils.c:3183 ../utils.c:3251
-msgid "rename failed"
-msgstr "rinominazione non riuscita"
-
-#: ../category.c:225 ../category.c:282 ../sync.c:1245 ../sync.c:2538
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "File sul computer danneggiato?\n"
 
-#: ../category.c:232 ../category.c:242 ../category.c:289 ../category.c:300
-#: ../category.c:310 ../sync.c:1295 ../sync.c:1359 ../sync.c:1389
-#: ../sync.c:1432 ../sync.c:1449 ../sync.c:1478 ../sync.c:2602 ../sync.c:2654
-#: ../sync.c:2682 ../sync.c:2727 ../sync.c:2741 ../sync.c:2768
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "posizionamento non riuscito - errore fatale\n"
 
-#: ../category.c:413
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "rinominazione non riuscita"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Sposta"
 
-#: ../category.c:443
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Modifica categorie"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Il massimo numero di categorie (16) è già usato"
 
-#: ../category.c:446
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Inserire nuova categoria"
 
-#: ../category.c:456 ../category.c:463 ../category.c:481
+#: ../category.c:451 ../category.c:475
 #, fuzzy
 msgid "Edit Categories Error"
 msgstr "Modifica categorie"
 
-#: ../category.c:457
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Selezionare una categoria da rinominare"
 
 #: ../category.c:461
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "Impossibile modificare la categoria %s.\n"
-
-#: ../category.c:468
 msgid "Enter New Category Name"
 msgstr "Inserire il nuovo nome di categoria"
 
-#: ../category.c:482
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Selezionare una categoria da eliminare"
 
-#: ../category.c:486
-#, c-format
-msgid "You can't delete category %s.\n"
-msgstr "Impossibile eliminare la categoria %s.\n"
-
-#: ../category.c:502
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
@@ -521,204 +621,342 @@ msgstr ""
 "Ci sono %d voci in %s.\n"
 "Si vuole spostarle in %s o eliminarle?"
 
-#: ../category.c:561
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "file di stato %s non valido, riga %d\n"
 
-#: ../category.c:583
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "La categoria %s non può essere usata più di una volta"
 
-# NdT: è l'intestazione di una colonna, sta meglio con la maiuscola
-#. correctly translate title
-#: ../category.c:805
-msgid "category name"
-msgstr "Nome categoria"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "Categoria:"
 
-#: ../category.c:830
+#: ../category.c:834
 msgid "New"
 msgstr "Nuovo"
 
-#: ../category.c:837
+#: ../category.c:841
 msgid "Rename"
 msgstr "Rinomina"
 
-#: ../category.c:952
-msgid "debug"
-msgstr "debug"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "tipo sconosciuto ="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "numero di campi per riga != %d, formato sconosciuto\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "numero di campi != %d, formato sconosciuto\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Formato sconosciuto, il file usa uno schema scorretto\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Lo schema del file è:"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "Dovrebbe essere:  "
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr "%s:%d Voce %d, campo %d: Tipo non valido. Atteso %d, trovato %d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "lettura del file completata\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "repeatType (%d) sconosciuto trovato in DatebookDB\n"
 
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Ripeti ogni:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Ripeti i giorni:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Ripeti ogni:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Ripeti i giorni:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Ripeti i giorni:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Ripeti i giorni:"
+
 # These days of the week are put in the buttons above the calendar and
 # the little buttons in the repeat weekly window.
 # They should be one letter if possible.  The English ones get truncated to
 # one letter.
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4118
-#: ../datebook_gui.c:4125
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Do"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4119
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Lu"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4120
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Ma"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4121
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Me"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4122
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Gi"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4123
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Ve"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4124
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Sa"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Termina il"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Ripeti i giorni:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "Numero di voci: %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Note"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Sveglia"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Ripeti ogni:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Giorno della settimana"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
-msgstr "Testo di descrizione dell'appuntamento > %d caratteri, troncato a %d caratteri\n"
+msgstr ""
+"Testo di descrizione dell'appuntamento > %d caratteri, troncato a %d "
+"caratteri\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Errore"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Questo file non ha il formato di un file datebook.dat.\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "Tipo di esportazione sconosciuto"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:549
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Esporta"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Esporta tutte le voci dell'agenda"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Salva come"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Sfoglia"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Categorie agenda"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:566 ../search_gui.c:636 ../weekview_gui.c:371
-msgid "Close"
-msgstr "Chiudi"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4640
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Nessuna"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Comincia il"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Termina il"
 
-#: ../datebook_gui.c:1567 ../prefs.c:431
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Domenica"
 
-#: ../datebook_gui.c:1568 ../prefs.c:432
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Lunedì"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Venerdì"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Sabato"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4."
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Ultimo"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -733,18 +971,18 @@ msgstr ""
 "%s del mese.\n"
 "Quale si preferisce?"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "Domanda?"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Questo è un impegno periodico\n"
 "Applicare queste modifiche\n"
@@ -752,49 +990,58 @@ msgstr ""
 "o a TUTTE le occorrenze di\n"
 "questo impegno?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Corrente"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "nessuno"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "giorno"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "settimana"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "mese"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "anno"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Impossibile avere un impegno che si ripete ogni %d %s\n"
 
-#: ../datebook_gui.c:2139
-msgid "You can not have a weekly repeating appointment that doesn't repeat on any day of the week."
-msgstr "Impossibile avere un impegno settimanale che non si ripete nessun giorno della settimana."
+#: ../datebook_gui.c:2339
+#, fuzzy
+msgid ""
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
+"day of the week."
+msgstr ""
+"Impossibile avere un impegno settimanale che non si ripete nessun giorno "
+"della settimana."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Nessun orario"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Appuntamento non valido"
 
-#: ../datebook_gui.c:2633
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -802,106 +1049,95 @@ msgstr ""
 "La data di fine di questo appuntamento\n"
 "è prima della data di inizio."
 
-#. The No due date check box
-#: ../datebook_gui.c:2902 ../datebook_gui.c:4674 ../datebook_gui.c:4704
-#: ../datebook_gui.c:4759 ../datebook_gui.c:4808 ../todo_gui.c:130
-#: ../todo_gui.c:2265
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Nessuna data"
 
-#: ../datebook_gui.c:3022
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "Errore in DateBookDB advanceUnits = %d\n"
 
-#: ../datebook_gui.c:3193
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "repeatType sconosciuto trovato in DatebookDB\n"
-
-#: ../datebook_gui.c:3226
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3231 ../monthview_gui.c:236 ../weekview_gui.c:221
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (OGGI)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4201 ../datebook_gui.c:4642
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Settimana"
 
-#: ../datebook_gui.c:4207
-msgid "W"
-msgstr "S"
-
-#: ../datebook_gui.c:4209
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "Visualizza appuntamenti per settimana"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4212 ../datebook_gui.c:4643
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Mese"
 
-#: ../datebook_gui.c:4219
-msgid "M"
-msgstr "M"
-
-#: ../datebook_gui.c:4221
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "Visualizza appuntamenti per mese"
 
 #. Make Category button
-#: ../datebook_gui.c:4226
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Categorie"
 
-#: ../datebook_gui.c:4292
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Orario"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4329
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Mostra impegni"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2116
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Impegno"
 
-#: ../datebook_gui.c:4345 ../todo_gui.c:2117
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Scadenza"
 
-#: ../datebook_gui.c:4442
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Sveglia"
 
-#: ../datebook_gui.c:4486
-msgid "This Event has no particular time"
-msgstr "Questo evento non ha un orario particolare"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "Data:"
 
-#: ../datebook_gui.c:4494
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Inizio"
 
-#: ../datebook_gui.c:4508
-msgid "Start Time"
-msgstr "Ora di inizio"
-
-#: ../datebook_gui.c:4526
-msgid "End Time"
-msgstr "Ora di fine"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "Termina il"
 
-#: ../datebook_gui.c:4624
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr ""
 
-#: ../datebook_gui.c:4641
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Giorno"
 
@@ -909,79 +1145,74 @@ msgstr "Giorno"
 # msgstr "Woche"
 # msgid "MonthView"
 # msgstr "Monat"
-#: ../datebook_gui.c:4644
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Anno"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4648
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Questo impegno non si ripeterà"
 
-#: ../datebook_gui.c:4658 ../datebook_gui.c:4690 ../datebook_gui.c:4745
-#: ../datebook_gui.c:4792
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "La frequenza è ogni"
 
 # NdT: minuscolo è corretto, appare nel mezzo di una frase
-#: ../datebook_gui.c:4663
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "giorno/i"
 
-#. checkbutton
-#: ../datebook_gui.c:4666 ../datebook_gui.c:4698 ../datebook_gui.c:4753
-#: ../datebook_gui.c:4800
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Termina il"
 
 # NdT: minuscolo è corretto, appare nel mezzo di una frase
-#: ../datebook_gui.c:4695
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "settimana/e"
 
-#: ../datebook_gui.c:4711
-msgid "Repeat on Days:"
-msgstr "Ripeti i giorni:"
-
 # NdT: minuscolo è corretto, appare nel mezzo di una frase
-#: ../datebook_gui.c:4750
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "mese/i"
 
-#: ../datebook_gui.c:4767
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Ripeti ogni:"
 
-#: ../datebook_gui.c:4771
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Giorno della settimana"
 
-#: ../datebook_gui.c:4780
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Data"
 
 # NdT: minuscolo è corretto, appare nel mezzo di una frase
-#: ../datebook_gui.c:4797
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "anno/i"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr ""
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Prefisso 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Prefisso 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Prefisso 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Numero di telefono:"
 
@@ -989,484 +1220,376 @@ msgstr "Numero di telefono:"
 msgid "Extension"
 msgstr "Estensione"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr ""
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "Chiudi"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Sfoglia"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Scegliere le voci da esportare"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Usare i tasti Ctrl e Shift"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:505
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importa"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Per entrare in una directory nascosta, inserirne il nome e premere TAB"
-
-#: ../import_gui.c:307 ../prefs_gui.c:973
-msgid "Done"
-msgstr "Fatto"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "Importa tipo file"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
 #, c-format
 msgid "Record was marked as private"
 msgstr "La voce è stata impostata come privata"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
 #, c-format
 msgid "Record was not marked as private"
 msgstr "La voce non è stata impostata vome privata"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "La categoria prima dell'importazione era: [%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Le voci verranno messe nella categoria [%s]"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Importa tutto"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Salta"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Installa"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "Per entrare in una directory nascosta, inserirne il nome e premere TAB"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "File da installare"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Importa tipo file"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Aggiungi"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "File da installare"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Rimuovi"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Installa"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 msgid "Install User"
 msgstr "Installa utente"
 
-#: ../install_user.c:138
-msgid "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
+#: ../install_user.c:137
+msgid ""
+"A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
-msgid "If you want to sync more than 1 PalmOS(c) device each one should have a different ID and preferably a different user name."
+#: ../install_user.c:144
+msgid ""
+"If you want to sync more than 1 PalmOS(c) device each one should have a "
+"different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "Nome utente"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr "L'ID dovrebbe essere un numero a caso."
 
-#: ../install_user.c:194 ../restore_gui.c:304
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "ID utente"
 
-#: ../jpilot-dump.c:97
-msgid " +D +A +T +M format like date +format.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:98
-msgid " -v displays version and exits.\n"
-msgstr " -v mostra la versione ed esce.\n"
-
-#: ../jpilot-dump.c:99 ../utils.c:80
-msgid " -h displays help and exits.\n"
-msgstr " -h mostra l'aiuto ed esce.\n"
-
-#: ../jpilot-dump.c:100
-msgid " -f displays help for format codes.\n"
-msgstr " -f mostra l'aiuto per i codici di formato.\n"
-
-#: ../jpilot-dump.c:101
-msgid " -D dump DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:102
-msgid " -i dump DateBook in iCalendar format.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:103
-msgid " -N dump appts for today in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:104
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:105
-msgid " -A dump Address book.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:106
-msgid " -T dump ToDo list as CSV.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:107
-msgid " -M dump Memos.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:66
-msgid " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr " -v = versione\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr " -h = aiuto\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = esegue in modalità di debug\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = non carica i plugin.\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = sincronizza e poi fa un backup, altrimenti sincronizza solamente.\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:73
-msgid " -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr ""
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:138
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Specificazione della geometria non valida: \"%s\"\n"
-
-#: ../jpilot.c:445 ../monthview_gui.c:579 ../print_gui.c:338
-#: ../weekview_gui.c:385
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Stampa"
 
-#: ../jpilot.c:446
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Non c'è supporto per la stampa dei dati di questo canale."
 
-#: ../jpilot.c:506
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Non c'è supporto per importare dati da questo canale."
 
-#: ../jpilot.c:550
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Non c'è supporto per esportare dati da questo canale."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Annulla sincronizzazione"
+
 #. -------------------------------------------
-#: ../jpilot.c:726
+#: ../jpilot.c:673
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:733
+#: ../jpilot.c:680
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
-#: ../jpilot.c:740
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Annulla sincronizzazione"
 
-#: ../jpilot.c:740
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Sincronizza comunque"
 
-#: ../jpilot.c:749 ../jpilot.c:753
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "problema di sincronizzazione"
 
-#: ../jpilot.c:991
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr " Utente: "
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "Comando sconosciuto dal processo di sincronizzazione\n"
 
-#: ../jpilot.c:1012 ../Expense/expense.c:500 ../KeyRing/keyring.c:1752
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Informazioni su %s"
 
-#: ../jpilot.c:1415
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_File"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/File/tear"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/File/_Trova"
 
-#: ../jpilot.c:1418 ../jpilot.c:1424 ../jpilot.c:1427
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/File/sep1"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/File/_Installa"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/File/I_mporta"
 
-#: ../jpilot.c:1421
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/File/_Esporta"
 
-#: ../jpilot.c:1422 ../jpilot.c:2901
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/File/Preferenze"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/File/_Stampa"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/File/_Installa utente"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/File/Ripristina handheld"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/File/_Esci"
 
-#: ../jpilot.c:1429
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Visualizza"
 
-#: ../jpilot.c:1430 ../jpilot.c:1431 ../jpilot.c:1432 ../jpilot.c:1683
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Visualizza/Nascondi le voci private"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Visualizza/Mosta le voci private"
 
-#: ../jpilot.c:1432
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Visualizza/Maschera le voci private"
 
-#: ../jpilot.c:1433
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Visualizza/sep1"
 
-#: ../jpilot.c:1434
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Visualizza/Agenda"
 
 # NdT: tradotto con rubrica perché dovrebbe essere Address book
-#: ../jpilot.c:1435
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Visualizza/Rubrica"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Visualizza/Impegni"
 
-#: ../jpilot.c:1437
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Visualizza/Appunti"
 
-#: ../jpilot.c:1438 ../jpilot.c:1569
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Plugin"
 
-#: ../jpilot.c:1440
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1441
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/Netscape"
 
-#: ../jpilot.c:1445
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/Mozilla"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/Galeon"
 
-#: ../jpilot.c:1455
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/Opera"
 
-#: ../jpilot.c:1459
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/GnomeUrl"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/Lynx"
 
-#: ../jpilot.c:1463
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/Links"
 
-#: ../jpilot.c:1465
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W3M"
 
-#: ../jpilot.c:1467
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/Konqueror"
 
-#: ../jpilot.c:1470
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: ../jpilot.c:1471
-msgid "/Help/PayBack program"
-msgstr "/Aiuto/Payback program"
-
-#: ../jpilot.c:1472
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/Aiuto/Informazioni su J-Pilot"
 
-#: ../jpilot.c:1536
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Plugin/%s"
 
-#: ../jpilot.c:1547
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/A_iuto/%s"
 
-#: ../jpilot.c:1846
-msgid "Font Selection Dialog"
-msgstr "Finestra di selezione carattere"
-
-#: ../jpilot.c:2220
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:2269
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "Plugin non caricati.\n"
 
-#: ../jpilot.c:2273
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2277
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2372 ../jpilot.c:2380
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "Impossibile aprire la pipe\n"
 
-#: ../jpilot.c:2431
-msgid " User: "
-msgstr " Utente: "
-
-#: ../jpilot.c:2572
-msgid "Clear"
-msgstr "Pulisci"
-
 # FIXME UPSTREAM: should be Ctrl+...
-#: ../jpilot.c:2657
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "Mostra le voci private   Ctrl+Z"
 
-#: ../jpilot.c:2662
-msgid "Show private records"
-msgstr "Mostra le voci private"
-
 # FIXME UPSTREAM: should be Ctrl+...
-#: ../jpilot.c:2667
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "Nasconde le voci private   Ctrl+Z"
 
-#: ../jpilot.c:2672
-msgid "Hide private records"
-msgstr "Nascondi le voci private"
-
 # FIXME UPSTREAM: should be Ctrl+...
-#: ../jpilot.c:2677
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "Maschera le voci private   Ctrl+Z"
 
-#: ../jpilot.c:2682
-msgid "Mask private records"
-msgstr "Maschera le voci private"
-
 # FIXME UPSTREAM: should be Ctrl+...
-#: ../jpilot.c:2692
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Sincronizza il palmare con il computer   Ctrl+Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2698
-msgid "Font"
-msgstr "Carattere"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Sincronizzare la rubrica"
 
-#: ../jpilot.c:2713
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1474,825 +1597,1246 @@ msgstr ""
 "Sincronizza il palmare con il computer\n"
 "e poi fa il backup"
 
-#: ../jpilot.c:2827
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Agenda/Vai a oggi"
 
-#: ../jpilot.c:2829
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: ../jpilot.c:2831
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Impegni"
 
-#: ../jpilot.c:2833
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Appunti"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "Fallo adesso"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Ricordami"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "Non ricordarmi più!"
 
-#: ../jpilot.c:2897
+#: ../jpilot.c:2187
+#, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters (accents for example).\n"
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
+"(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 
-#: ../jpilot.c:2900
-msgid "Go to the menu \""
-msgstr "Vai al menù \""
-
-#: ../jpilot.c:2902
-msgid "\" and change the \""
-msgstr "\" e cambia il \""
-
 #. Character Set
-#: ../jpilot.c:2903 ../prefs_gui.c:443
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Set di caratteri "
 
-#: ../jpilot.c:2904
-msgid "\"."
-msgstr "\"."
-
-#: ../jpilot.c:2906
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Scegli una codifica UTF-8"
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:92
 #, c-format
-msgid "Unknown PC header version = %d\n"
+msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
 
-#: ../libplugin.c:411
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v mostra la versione ed esce.\n"
+
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h mostra l'aiuto ed esce.\n"
+
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -f mostra l'aiuto per i codici di formato.\n"
+
+#: ../jpilot-dump.c:96
 #, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d Errore durante l'apertura del file: %s\n"
+msgid " -D dump DateBook\n"
+msgstr ""
 
-#: ../libplugin.c:417 ../libplugin.c:446 ../sync.c:3249 ../todo.c:389
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Errore durante la lettura del file: %s\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: ../libplugin.c:473 ../utils.c:2052
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+#: ../jpilot-dump.c:98
+#, c-format
+msgid " -N dump appts for today in DateBook\n"
 msgstr ""
-"Questa voce è già stata eliminata.\n"
-"Verrà eliminata dal Palm alla prossima sincronizzazione.\n"
 
-#: ../libplugin.c:482 ../utils.c:2064 ../utils.c:2111
-msgid "Unable to open PC records file\n"
+#: ../jpilot-dump.c:99
+#, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr ""
 
-#: ../libplugin.c:488 ../utils.c:2073
-msgid "Couldn't find record to delete\n"
-msgstr "Impossibile trovare la voce da eliminare\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr "Rubrica"
 
-#: ../libplugin.c:506 ../utils.c:2094
+#: ../jpilot-dump.c:101
 #, c-format
-msgid "Unknown header version %d\n"
-msgstr "Versione %d dell'intestazione sconosciuta\n"
+msgid " -T dump ToDo list as CSV\n"
+msgstr ""
 
-#: ../libplugin.c:519
-msgid "Couldn't open PC records file\n"
+#: ../jpilot-dump.c:102
+#, c-format
+msgid " -M dump Memos\n"
 msgstr ""
 
-#: ../libplugin.c:680 ../libplugin.c:772 ../utils.c:1570 ../utils.c:1583
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Error opening file: %s\n"
-msgstr "Errore durante l'apertura del file: %s\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../libplugin.c:709
-msgid "Error reading PC file 1\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "Impossibile aprire il file: %s\n"
+
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
 msgstr ""
 
-#: ../libplugin.c:725
-msgid "Error reading PC file 2\n"
+#: ../jpilot-merge.c:270
+#, c-format
+msgid "Records added         = %d\n"
 msgstr ""
 
-#: ../libplugin.c:900
+#: ../jpilot-merge.c:271
 #, c-format
-msgid "Error reading %s 5\n"
-msgstr "Errore durante la lettura di %s 5\n"
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../log.c:95
+#: ../jpilot-merge.c:272
 #, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Impossibile aprire il file log, rinuncio.\n"
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../log.c:102
+#: ../jpilot-merge.c:273
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "Impossibile aprire il file di log\n"
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "Testo appunto > 65535, troncato\n"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:292
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "Importato apputno %s\n"
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Questo file non ha il formato di un file memopad.dat.\n"
+#: ../jpilot-merge.c:293
+#, c-format
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:294
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "Impossibile esportare appunto %d\n"
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../monthview_gui.c:521
-msgid "Monthly View"
-msgstr "Visualizzazione mensile"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Password del palmare"
+#: ../jpilot-merge.c:296
+#, c-format
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Sbagliata, reinserire la password del palmare"
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "Inserire la password del palmare"
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../plugins.c:90 ../plugins.c:204 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "loop infinito"
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: ../plugins.c:217
+#: ../jpilot-merge.c:300
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "Durante la lettura di %s%s riga 1: [%s]\n"
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: ../plugins.c:218
-msgid "Wrong Version\n"
-msgstr "Versione sbagliata\n"
+#: ../jpilot-sync.c:64
+#, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
 
-#: ../plugins.c:219
-msgid "Check preferences->conduits\n"
-msgstr "Controllare Preferenze->Canali\n"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v mostra la versione e le opzioni di compilazione ed esce.\n"
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d mostra informazioni di debug sullo standard output.\n"
+
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr " -p salta il caricamento dei plugin.\n"
 
-#: ../plugins.c:275
+#: ../jpilot-sync.c:69
 #, c-format
-msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+msgid " -b sync, and then do a backup\n"
 msgstr ""
-"Apertura non riuscita del plugin [%s]\n"
-" errore [%s]\n"
 
-#: ../plugins.c:292 ../plugins.c:318
+#: ../jpilot-sync.c:70
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " il plugin non è valido: [%s]\n"
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr ""
 
-#: ../plugins.c:300
+#: ../jpilot-sync.c:71
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "Plugin:[%s]\n"
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Errore durante l'apertura del file: %s\n"
 
-#: ../plugins.c:301
+#: ../jpilot-sync.c:223
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "Questo plugin è la versione (%d.%d).\n"
+msgid "Error: pi_listen\n"
+msgstr ""
 
-#: ../plugins.c:303
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "È troppo vecchio per funzionare con questa versione di J-Pilot.\n"
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Errore durante l'apertura del file: next_id\n"
 
-#: ../prefs.c:400
-msgid "%B %d, %Y"
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
 msgstr ""
 
-#: ../prefs.c:401
-msgid "%d %B %Y"
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Errore"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
 msgstr ""
 
-#: ../prefs.c:402
-msgid "%d. %B %Y"
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
 msgstr ""
 
-#: ../prefs.c:403
-msgid "%d %B, %Y"
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
 msgstr ""
 
-#: ../prefs.c:404
-msgid "%Y. %B. %d"
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
 msgstr ""
 
-#: ../prefs.c:405
-msgid "%Y %B %d"
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
 msgstr ""
 
-#: ../prefs_gui.c:387
-msgid "Preferences"
-msgstr "Preferenze"
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "La variabile d'ambiente HOME è troppo lunga per jpilot\n"
 
-#: ../prefs_gui.c:417
-msgid "Locale"
-msgstr "Localizzazione"
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
 
-#: ../prefs_gui.c:419
-msgid "Settings"
-msgstr "Impostazioni"
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
 
-#: ../prefs_gui.c:421
-msgid "Datebook"
-msgstr "Agenda"
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#: ../prefs_gui.c:425
-msgid "ToDo"
-msgstr "Impegni"
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
 
-#: ../prefs_gui.c:427
-msgid "Memo"
-msgstr "Appunti"
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
 
-#: ../prefs_gui.c:429
-msgid "Alarms"
-msgstr "Sveglie"
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
 
-#: ../prefs_gui.c:431
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"Questa voce è già stata eliminata.\n"
+"Verrà eliminata dal Palm alla prossima sincronizzazione.\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr ""
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "Impossibile trovare la voce da eliminare\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "Versione %d dell'intestazione sconosciuta\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d Errore durante l'apertura del file: %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Errore durante la lettura del file: %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "Errore durante l'apertura del file: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "Errore durante la lettura di %s 5\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr ""
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr ""
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr ""
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Impossibile aprire il file log, rinuncio.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "Impossibile aprire il file di log\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "Testo appunto > 65535, troncato\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "Importato apputno %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Questo file non ha il formato di un file memopad.dat.\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "Impossibile esportare appunto %d\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Appunti"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Visualizzazione mensile"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+#, fuzzy
+msgid "last char truncated"
+msgstr "ultima modifica: "
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Password del palmare"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Sbagliata, reinserire la password del palmare"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Inserire la password del palmare"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Errore durante la lettura del file: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "loop infinito"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "Durante la lettura di %s%s riga 1: [%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "Versione sbagliata\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "Controllare Preferenze->Canali\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"Apertura non riuscita del plugin [%s]\n"
+" errore [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " il plugin non è valido: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "Plugin:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "Questo plugin è la versione (%d.%d).\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "È troppo vecchio per funzionare con questa versione di J-Pilot.\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr ""
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr ""
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr ""
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr ""
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
+msgstr ""
+
+#: ../prefs.c:423
+msgid "%Y %B %d"
+msgstr ""
+
+#: ../prefs_gui.c:452
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: ../prefs_gui.c:483
+msgid "Locale"
+msgstr "Localizzazione"
+
+#: ../prefs_gui.c:485
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: ../prefs_gui.c:487
+msgid "Datebook"
+msgstr "Agenda"
+
+#: ../prefs_gui.c:491
+msgid "ToDo"
+msgstr "Impegni"
+
+#: ../prefs_gui.c:493
+msgid "Memo"
+msgstr "Appunti"
+
+#: ../prefs_gui.c:495
+msgid "Alarms"
+msgstr "Sveglie"
+
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Canali"
 
 #. Shortdate
-#: ../prefs_gui.c:456
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "Data in formato breve "
 
 #. Longdate
-#: ../prefs_gui.c:469
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "Data in formato completo "
 
 #. Time
-#: ../prefs_gui.c:482
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "Formato orario "
 
-#: ../prefs_gui.c:496
-msgid "The first day of the week is "
-msgstr "Il primo giorno della settimana è "
-
 #. GTK colors file
-#: ../prefs_gui.c:517
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "Il file personale dei colori GTK è "
 
 #. Port
-#: ../prefs_gui.c:530
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Porta seriale (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "problema di sincronizzazione"
 
-#. Rate
-#: ../prefs_gui.c:547
+#. Serial Rate
+#: ../prefs_gui.c:605
 msgid "Serial Rate"
 msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:560
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Numero di backup da conservare"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:577
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Mostrare le voci eliminate (predefinito: NO)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:581
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Mostrare le voci modificate (predefinito: NO)"
 
-#: ../prefs_gui.c:586
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
-msgstr "Chiedere conferma per l'installazione di file (J-Pilot -> PDA) (predefinito: SÌ)"
+msgstr ""
+"Chiedere conferma per l'installazione di file (J-Pilot -> PDA) (predefinito: "
+"SÌ)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:590
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr ""
 
-#: ../prefs_gui.c:602
-msgid "Use Datebook database (Palm OS <= 3.5)"
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:605
-msgid "Use Calendar database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr ""
 
 #. Show highlight days check box
-#: ../prefs_gui.c:632
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Evidenzia i giorni impegnati nel calendario"
 
-#. Show use DateBk check box
-#: ../prefs_gui.c:638
-msgid "Use DateBk note tags"
-msgstr ""
-
-#: ../prefs_gui.c:641
-msgid "DateBk support disabled in this build"
-msgstr "Il supporto all'agenda è disabilitato in questo programma"
-
 #. Highlight today on month and week view
-#: ../prefs_gui.c:648
+#: ../prefs_gui.c:700
 msgid "Annotate today in day, week, and month views"
 msgstr ""
 
-#: ../prefs_gui.c:653
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
 msgid "Append years on anniversaries in day, week, and month views"
 msgstr ""
 
-#: ../prefs_gui.c:664
-msgid "Use Address database (Palm OS <= 3.5)"
+#. Show use DateBk check box
+#: ../prefs_gui.c:710
+msgid "Use DateBk note tags"
+msgstr ""
+
+#: ../prefs_gui.c:713
+msgid "DateBk support disabled in this build"
+msgstr "Il supporto all'agenda è disabilitato in questo programma"
+
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:667
-msgid "Use Contacts database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:696
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Comando di posta"
 
-#: ../prefs_gui.c:710
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s è sostituito dall'indirizzo email"
 
-#: ../prefs_gui.c:722
-msgid "Use ToDo database (Palm OS <= 3.5) "
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:725
-msgid "Use Task database (Palm OS >= 4.0) "
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
 msgstr ""
 
-#. The hide completed check box
-#: ../prefs_gui.c:752
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Nascondere gli impegni completati"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:756
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Nascondere gli impegni non in scadenza"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:760
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Memorizzare la data di completamento"
 
 #. Use Manana check box
-#: ../prefs_gui.c:765
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Usare il database Manana"
 
-#: ../prefs_gui.c:773
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "Usare il numero predefinito di giorni di scadenza"
 
-#: ../prefs_gui.c:794
-msgid "Use Memo database (Palm OS <= 3.5)"
-msgstr ""
+#: ../prefs_gui.c:856
+#, fuzzy
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr "Usare Memo32 (pedit32)"
 
-#: ../prefs_gui.c:797
-msgid "Use Memos database (Palm OS >= 4.0)"
-msgstr ""
+#: ../prefs_gui.c:859
+#, fuzzy
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr "Usare Memo32 (pedit32)"
 
-#: ../prefs_gui.c:800
+#: ../prefs_gui.c:862
 #, fuzzy
 msgid "Use Memo32 database (pedit32)"
 msgstr "Usare Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:847
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Aprire finestre di avviso per ricordare gli impegni"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:851
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Eseguire questo comando"
 
-#. Shell warning
-#: ../prefs_gui.c:855
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
-msgstr "ATTENZIONE: l'esecuzione di comandi shell arbitrari può essere pericolosa!"
+msgstr ""
+"ATTENZIONE: l'esecuzione di comandi shell arbitrari può essere pericolosa!"
 
-#: ../prefs_gui.c:863
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Comando per la sveglia"
 
-#: ../prefs_gui.c:876
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t è sostituito con l'ora della sveglia"
 
-#: ../prefs_gui.c:880
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d è sostituito con la data della sveglia"
 
-#: ../prefs_gui.c:885
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D è sostituito con la descrizione della sveglia"
 
-#: ../prefs_gui.c:889
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N è sostituito con la nota della sveglia"
 
-#: ../prefs_gui.c:893
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (sostituzione della descrizione) è disabilitato in questo programma"
 
-#: ../prefs_gui.c:897
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%D (sostituzione della nota) è disabilitato in questo programma"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:906
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Sincronizzare l'agenda"
 
-#. Show sync address check box
-#: ../prefs_gui.c:910
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Sincronizzare la rubrica"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:914
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Sincronizzare gli impegni"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:925
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Sincronizzare gli appunti"
 
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:930
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Sincronizzare Manana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:936
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr ""
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:949
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "Sincronizza %s (%s)"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Opzioni stampa"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Impostazioni pagina"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Stampa quotidiana"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Stampa settimanale"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Stampa mensile"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "Una voce"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Eliminata una voce %s."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Tutte le voci in questa categoria"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Stampa tutte le voci"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Una voce per pagina"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " Spazio vuoto dopo ogni record"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Comando di stampa (es. lpr o cat > file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:238
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Ripristina handheld"
 
-#: ../restore_gui.c:178
-msgid ""
-"Unable to convert filename for GTK display\n"
-"See console log to find which file will not be restored"
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
 msgstr ""
 
-#: ../restore_gui.c:180
-#, c-format
-msgid ""
-"Unable to convert filename for GTK display\n"
-"File %s will not be restored\n"
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
 msgstr ""
 
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "File da installare"
+
 #. Label for instructions
-#: ../restore_gui.c:258
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr ""
 
-#: ../restore_gui.c:261
-msgid "1. Choose all the applications you wish to restore.  The default is all."
-msgstr "1. Scegliere tutte le applicazioni da ripristinare. Predefinito: tutte."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
+msgstr ""
+"1. Scegliere tutte le applicazioni da ripristinare. Predefinito: tutte."
 
-#: ../restore_gui.c:264
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Inserire il nome utente e l'ID utente."
 
-#: ../restore_gui.c:267
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Premere OK."
 
-#: ../restore_gui.c:270
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Questa azione sovrascriverà i dati attualmente sul palmare."
 
-#: ../restore_gui.c:291
-msgid "User Name"
-msgstr "Nome utente"
-
-#: ../search_gui.c:123
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "agenda"
 
-#: ../search_gui.c:204
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "indirizzo"
 
-#: ../search_gui.c:270
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "impegno"
 
-#: ../search_gui.c:324
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "appunto"
 
-#: ../search_gui.c:380
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "appunto"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "plugin?"
 
-#: ../search_gui.c:458
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Nessuna voce trovata"
 
-#: ../search_gui.c:559 ../search_gui.c:622
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Trova"
 
-#: ../search_gui.c:575
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Cerca: "
 
-#: ../search_gui.c:582
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Maiuscole/minuscole"
 
-#: ../sync.c:142
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "apertura del file di lock non riuscita\n"
 
-#: ../sync.c:155
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "lock non riuscito\n"
 
-#: ../sync.c:158
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:192
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "unlock non riuscito\n"
 
-#: ../sync.c:195
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "la sincronizzazione è bloccata dal pid %d\n"
 
-#: ../sync.c:286
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "Controllare la porta seriale e le impostazioni\n"
+
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "Impossibile leggere la directory home\n"
+
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr ""
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (ID autore '%s') è aggiornato: aggiornam. saltato.\n"
 
-#: ../sync.c:339
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
-msgid "Exiting with status %s\n"
-msgstr "Uscita con stato %s\n"
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Scaricamento di '%s' (ID autore '%s')... "
 
-#: ../sync.c:340
-msgid "Finished\n"
-msgstr "Completato\n"
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "Non riuscito, impossibile creare il file %s\n"
 
-#: ../sync.c:474
-msgid "Finished installing user information.\n"
-msgstr "Installazione delle informazioni dell'utente completata.\n"
+#: ../sync.c:1100 ../sync.c:1438
+#, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr "Non riuscito, impossibile fare il backup del database %s\n"
 
-#: ../sync.c:499 ../sync.c:617
-msgid "Check your serial port and settings\n"
-msgstr "Controllare la porta seriale e le impostazioni\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "OK\n"
+
+#: ../sync.c:1304
+#, c-format
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "Saltando %s (ID autore '%s')\n"
+
+#: ../sync.c:1498
+#, c-format
+msgid "Installing %s "
+msgstr "Installando %s"
+
+#: ../sync.c:1504 ../sync.c:1540
+#, c-format
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Impossibile aprire il file: '%s': '%s'!\n"
 
-#: ../sync.c:802
+#: ../sync.c:1508
 #, c-format
-msgid " Syncing on device %s\n"
-msgstr " Sincronizzazione sul dispositivo %s\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Impossibile sincronizzare il file: '%s': file danneggiato?\n"
 
-#: ../sync.c:803
-msgid " Press the HotSync button now\n"
-msgstr " Premere il tasto Hot-Sync ora\n"
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(ID autore '%s') ..."
 
-#: ../sync.c:855 ../sync.c:877 ../sync.c:899
-#, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "Ultimo nome utente sinc. -->\"%s\"\n"
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(ID autore '%s') ..."
 
-#: ../sync.c:856 ../sync.c:878 ../sync.c:900
+#: ../sync.c:1530
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "Ultimo ID utente sinc. -->\"%d\"\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:857 ../sync.c:879 ../sync.c:901
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr " Questo nome utente -->\"%s\"\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"Impossibile aprire il file: %s\n"
 
-#: ../sync.c:858 ../sync.c:880 ../sync.c:902
+#: ../sync.c:1615
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr " Questo ID utente -->%d\n"
+msgid "Install %s failed"
+msgstr "Installazione di %s fallita"
 
-#: ../sync.c:923
-#, c-format
-msgid "Username is \"%s\"\n"
-msgstr "Il nome utente è \"%s\"\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Fallita.\n"
 
-#: ../sync.c:924
-#, c-format
-msgid "User ID is %d\n"
-msgstr "L'ID utente è %d\n"
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s installato"
 
-#: ../sync.c:926 ../sync.c:934
+#: ../sync.c:1736
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "Ultima Sync = %d\n"
+msgid "%s:%d Error getting app info %s\n"
+msgstr ""
 
-#: ../sync.c:927
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
-msgid "This PC = %lu\n"
-msgstr "Questo PC = %lu\n"
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr ""
 
-#: ../sync.c:930
+#: ../sync.c:1763
 #, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Ultimo nome utente = [%s]\n"
+msgid "Error reading appinfo block for %s\n"
+msgstr ""
 
-#: ../sync.c:931
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "Ultimo ID utente = %d\n"
+msgid "Could not add category %s to remote.\n"
+msgstr "Impossibile aggiungere la categoria %s sul remoto.\n"
 
-#: ../sync.c:932
+#: ../sync.c:2002 ../sync.c:2008
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "Nome utente = [%s]\n"
+msgid "Too many categories on remote.\n"
+msgstr "Troppe categorie sul remoto.\n"
 
-#: ../sync.c:933
+#: ../sync.c:2003 ../sync.c:2011
 #, c-format
-msgid "userID = %d\n"
-msgstr "ID utente = %d\n"
-
-#: ../sync.c:951
-msgid "Sync canceled\n"
-msgstr "Sincronizzazione annullata\n"
-
-#: ../sync.c:974
-msgid "Finished restoring handheld.\n"
-msgstr "Ripristino handheld completato.\n"
-
-#: ../sync.c:975
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "È possibile che sia necessario aggiornare J-Pilot.\n"
-
-#: ../sync.c:1006
-msgid "Doing a fast sync.\n"
-msgstr "Esegui sincronizzaz. rapida.\n"
-
-#: ../sync.c:1019
-msgid "Doing a slow sync.\n"
-msgstr "Eseguendo sincronizzaz. lenta.\n"
-
-#: ../sync.c:1094
-msgid "Thank you for using J-Pilot."
-msgstr "Grazie per aver scelto J-Pilot."
-
-#: ../sync.c:1139
-msgid "Finished.\n"
-msgstr "Completato.\n"
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Tutte le voci sul desktop in %s saranno spostate in %s.\n"
 
-#: ../sync.c:1179 ../sync.c:2923
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Sincronizzazione di %s\n"
 
-#: ../sync.c:1187 ../sync.c:2496 ../sync.c:2931
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Scritta una voce %s."
 
-#: ../sync.c:1189 ../sync.c:2498 ../sync.c:2933
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Scrittura una voce %s fallita."
 
-#: ../sync.c:1191 ../sync.c:2500 ../sync.c:2935
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Eliminazione di una voce %s fallita."
 
-#: ../sync.c:1193 ../sync.c:2502 ../sync.c:2937
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Eliminata una voce %s."
 
-#: ../sync.c:1195 ../sync.c:2504
+#: ../sync.c:2122 ../sync.c:2475
 #, fuzzy, c-format
 msgid "Sync Conflict: duplicated an %s record."
 msgstr "Eliminata una voce %s."
 
-#: ../sync.c:1198 ../sync.c:2507 ../sync.c:2940
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Scritta una voce %s."
 
-#: ../sync.c:1200 ../sync.c:2509 ../sync.c:2942
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Scrittura di una voce %s non riuscita."
 
-#: ../sync.c:1202 ../sync.c:2511 ../sync.c:2944
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Eliminazione di una voce %s non riuscita."
 
-#: ../sync.c:1204 ../sync.c:2513 ../sync.c:2946
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Eliminata una voce %s."
 
-#: ../sync.c:1206 ../sync.c:2515
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
 msgid "Sync Conflict: duplicated a %s record."
 msgstr ""
 
-#: ../sync.c:1228
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
-msgid "number of records = %d\n"
-msgstr "Numero di voci: %d\n"
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:1376 ../sync.c:2668
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2300,761 +2844,838 @@ msgstr ""
 "dlp_DeleteRecord non riuscita\n"
 "Una possibile causa è la voce è già stata eliminata sul palmare\n"
 
-#: ../sync.c:1551 ../sync.c:1994
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (ID autore '%s') è aggiornato: aggiornam. saltato.\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "Installazione delle informazioni dell'utente completata.\n"
 
-#: ../sync.c:1555 ../sync.c:1998
+#: ../sync.c:3094
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Scaricamento di '%s' (ID autore '%s')... "
+msgid " Syncing on device %s\n"
+msgstr " Sincronizzazione sul dispositivo %s\n"
 
-#: ../sync.c:1562 ../sync.c:2004
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Non riuscito, impossibile creare il file %s\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " Premere il tasto Hot-Sync ora\n"
 
-#: ../sync.c:1573 ../sync.c:2013
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Non riuscito, impossibile fare il backup del database %s\n"
-
-#: ../sync.c:1577 ../sync.c:2017 ../sync.c:2199
-msgid "OK\n"
-msgstr "OK\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "Ultimo nome utente sinc. -->\"%s\"\n"
 
-#: ../sync.c:1870
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "Saltando %s (ID autore '%s')\n"
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "Ultimo ID utente sinc. -->\"%d\"\n"
 
-#: ../sync.c:2085
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid "Installing %s "
-msgstr "Installando %s"
+msgid " This Username-->\"%s\"\n"
+msgstr " Questo nome utente -->\"%s\"\n"
 
-#: ../sync.c:2091
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"Impossibile aprire il file: '%s': '%s'!\n"
+msgid " This User ID-->%d\n"
+msgstr " Questo ID utente -->%d\n"
 
-#: ../sync.c:2095
+#: ../sync.c:3204
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"Impossibile sincronizzare il file: '%s': file danneggiato?\n"
+msgid "Username is \"%s\"\n"
+msgstr "Il nome utente è \"%s\"\n"
 
-#: ../sync.c:2107
+#: ../sync.c:3205
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(ID autore '%s') ..."
+msgid "User ID is %d\n"
+msgstr "L'ID utente è %d\n"
 
-#: ../sync.c:2127 ../sync.c:2140 ../sync.c:2155 ../sync.c:2168
+#: ../sync.c:3207
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"Impossibile aprire il file: %s\n"
+msgid "lastSyncPC = %d\n"
+msgstr "Ultima Sync = %d\n"
 
-#: ../sync.c:2184
+#: ../sync.c:3208
 #, c-format
-msgid "Install %s failed"
-msgstr "Installazione di %s fallita"
+msgid "This PC = %lu\n"
+msgstr "Questo PC = %lu\n"
 
-#: ../sync.c:2188
-msgid "Failed.\n"
-msgstr "Fallita.\n"
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "Sincronizzazione annullata\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:2195
-#, c-format
-msgid "Installed %s "
-msgstr "%s installato"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "Ripristino handheld completato.\n"
 
-#: ../sync.c:2219 ../sync.c:2225
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Impossibile aprire il file: %s%s\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "È possibile che sia necessario aggiornare J-Pilot.\n"
 
-#: ../sync.c:2404
-msgid "Unable to read home dir\n"
-msgstr "Impossibile leggere la directory home\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "Esegui sincronizzaz. rapida.\n"
 
-#: ../sync.c:3025
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "Palm: numero di voci: %d\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "Eseguendo sincronizzaz. lenta.\n"
 
-#: ../sync.c:3026
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "Disco: numero di voci: %d\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "Grazie per aver scelto J-Pilot."
 
-#: ../sync.c:3258
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr ""
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "Completato.\n"
 
-#: ../sync.c:3264 ../sync.c:3305
+#: ../sync.c:3446
 #, c-format
-msgid "%s:%d Error unpacking app info %s\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
 msgstr ""
 
-#: ../sync.c:3286 ../sync.c:3298
+#: ../sync.c:3447
 #, c-format
-msgid "Error reading appinfo block for %s\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
 msgstr ""
 
-#. Fix - need a func for this logging
-#: ../sync.c:3442 ../sync.c:3446
-#, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "Impossibile aggiungere la categoria %s sul remoto.\n"
-
-#: ../sync.c:3443 ../sync.c:3449
-#, c-format
-msgid "Too many categories on remote.\n"
-msgstr "Troppe categorie sul remoto.\n"
-
-#: ../sync.c:3444 ../sync.c:3452
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Tutte le voci sul desktop in %s saranno spostate in %s.\n"
+msgid "Exiting with status %s\n"
+msgstr "Uscita con stato %s\n"
 
-#: ../todo.c:247
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
-msgstr "Testo di descrizione dell'impegno > %d caratteri, troncato a %d caratteri\n"
+msgstr ""
+"Testo di descrizione dell'impegno > %d caratteri, troncato a %d caratteri\n"
 
-#: ../todo.c:253
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "Testo dell'impegno > %d caratteri, troncato a %d caratteri\n"
 
-#: ../todo.c:378
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Errore durante la lettura delle informazioni categoria %s\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Data di scadenza"
 
-#: ../todo_gui.c:536
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Il file non sembra avere un formato todo.dat.\n"
 
-#: ../todo_gui.c:692 ../todo_gui.c:707
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "Impossibile esportare impegno %d\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Data di scadenza"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Data di scadenza"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "Priorità: "
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Completato"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "Priorità fuori dall'intervallo\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1092
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Nessuna data"
 
-#. The completed check box
-#: ../todo_gui.c:2226
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Completato"
 
-#: ../todo_gui.c:2234
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "Priorità: "
 
-#: ../todo_gui.c:2254
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "Data di scadenza:"
 
-#. Note textbox
-#: ../todo_gui.c:2316 ../Expense/expense.c:1819 ../KeyRing/keyring.c:2256
-msgid "Note"
-msgstr "Note"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Oggi"
 
-#: ../utils.c:79
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v mostra la versione e le opzioni di compilazione ed esce.\n"
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Impossibile trovare un file DB vuoto %s: %s\n"
 
-#: ../utils.c:81
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d mostra informazioni di debug sullo standard output.\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " potrebbe non essere installato.\n"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "Impossibile creare la directory %s\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s è una directory"
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "Impossibili scrivere file nella directory %s\n"
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Salvare le voci modificate?"
+
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Salvare le modifiche a questa voce?"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Salvare la nuova voce?"
+
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Salvare questa nuova voce?"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "ciclo infinito, interrotto\n"
 
-#: ../utils.c:82
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr " -p salta il caricamento dei plugin.\n"
 
-#: ../utils.c:83
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr " -a ignora gli allarmi mancati dall'ultima esecuzione del programma.\n"
 
-#: ../utils.c:84
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A ignora tutti gli allarmi passati e futuri.\n"
 
-#: ../utils.c:85
-#, fuzzy
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i avvia jpilot iconificato\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:86
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
-msgstr " Le variabili d'ambiente PILOTPORT e PILOTRATE sono usate per specificare\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
+msgstr ""
+" Le variabili d'ambiente PILOTPORT e PILOTRATE sono usate per specificare\n"
 
-#: ../utils.c:87
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " su quale porta sincronizzarsi e a quale velocità.\n"
 
-#: ../utils.c:88
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " Se PILOTPORT non è impostato, è predefinito a /dev/pilot.\n"
 
-#: ../utils.c:114
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Errore durante la lettura del file"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Data di compilazione"
 
-#: ../utils.c:115
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Compilato con queste opzioni:"
 
-#: ../utils.c:117
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Percorso di installazione"
 
-#: ../utils.c:119
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr ""
 
-#: ../utils.c:123
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "Supporto USB"
 
-#: ../utils.c:125 ../utils.c:131 ../utils.c:137 ../utils.c:143 ../utils.c:149
-#: ../utils.c:155 ../utils.c:161
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "sì"
 
-#: ../utils.c:127 ../utils.c:133 ../utils.c:139 ../utils.c:145 ../utils.c:151
-#: ../utils.c:157 ../utils.c:163
-msgid "no"
-msgstr "no"
-
-#: ../utils.c:129
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Supporto voci private"
 
-#: ../utils.c:135
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "no"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Supporto agenda"
 
-#: ../utils.c:141
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Supporto plugin"
 
-#: ../utils.c:147
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Supporto Manana"
 
-#: ../utils.c:153
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "Supporto NLS (lingue straniere)"
 
-#: ../utils.c:159
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "Supporto GTK2"
 
-#: ../utils.c:273
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Oggi è %A, %x %X"
-
-#: ../utils.c:275
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Oggi è %%A, %s %s"
-
-#: ../utils.c:1180
-msgid "Today"
-msgstr "Oggi"
-
-#: ../utils.c:1396
-msgid "Save Changed Record?"
-msgstr "Salvare le voci modificate?"
-
-#: ../utils.c:1397
-msgid "Do you want to save the changes to this record?"
-msgstr "Salvare le modifiche a questa voce?"
-
-#: ../utils.c:1402
-msgid "Save New Record?"
-msgstr "Salvare la nuova voce?"
-
-#: ../utils.c:1403
-msgid "Do you want to save this new record?"
-msgstr "Salvare questa nuova voce?"
-
-#. Not home;
-#: ../utils.c:1423 ../KeyRing/keyring.c:1646
 msgid "Can't get HOME environment variable\n"
 msgstr "Impossibile leggere la variabile d'ambiente HOME\n"
 
-#: ../utils.c:1430
-msgid "Your HOME environment variable is too long for me\n"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
 msgstr "La variabile d'ambiente HOME è troppo lunga per jpilot\n"
 
-#. Can't create directory
-#: ../utils.c:1455 ../utils.c:1459
-#, c-format
-msgid "Can't create directory %s\n"
-msgstr "Impossibile creare la directory %s\n"
-
-#: ../utils.c:1465
-#, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr ""
-"%s non sembra essere una directory.\n"
-"Deve esserlo.\n"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Modifica categorie"
 
-#: ../utils.c:1471
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "Impossibili scrivere file nella directory %s\n"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "Il PC ID è 0.\n"
 
-#: ../utils.c:1527 ../utils.c:1536
-msgid "Error writing PC header to file: next_id\n"
-msgstr ""
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Ho generato un nuovo PC ID: è %lu\n"
 
-#: ../utils.c:1532
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
 msgstr ""
 
-#: ../utils.c:1549
-msgid "Error opening file: next_id\n"
-msgstr "Errore durante l'apertura del file: next_id\n"
-
-#: ../utils.c:1746
+#: ../utils.c:3537
 #, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Impossibile trovare un file DB vuoto %s: %s\n"
+msgid "Today is %A, %x %X"
+msgstr "Oggi è %A, %x %X"
 
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1749
-msgid " may not be installed.\n"
-msgstr " potrebbe non essere installato.\n"
+#: ../utils.c:3539
+#, c-format
+msgid "Today is %%A, %s %s"
+msgstr "Oggi è %%A, %s %s"
 
-#: ../utils.c:1930
-msgid "Error reading file"
-msgstr "Errore durante la lettura del file"
+#: ../utils.c:3768
+#, c-format
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
+msgstr ""
 
-#: ../utils.c:2671
-msgid "PC ID is 0.\n"
-msgstr "Il PC ID è 0.\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
+msgstr "Errore durante la lettura del file: %s\n"
 
-#: ../utils.c:2672
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Ho generato un nuovo PC ID: è %lu\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
+msgstr "Errore durante la lettura del file: %s\n"
 
-#: ../weekview_gui.c:328
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Visualizzaz. settimanale"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Australia"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Austria"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brasile"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Canada"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Danimarca"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (Euro)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Francia"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Germania"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Islanda"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "India"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Italia"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Giappone"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Corea"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Lussemburgo"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Messico"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Paesi Bassi"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Nuova Zelanda"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "Cina"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Filippine"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Spagna"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Svezia"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Svizzera"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Regno Unito"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "Stati Uniti"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Spese"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1367
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "AirFare"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1368
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Colazione"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1369
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Autobus"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1370
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Pranzi di lavoro"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1371
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Affitto auto"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1372
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Cena"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1373
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Divertimento"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1374
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fax"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1375
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Gas"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1376
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Regali"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1377
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hotel"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1378
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Varie"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1379
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Lavanderia"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1380
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limo"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1381
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Alloggio"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1382
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Pranzo"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1383
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Chilometraggio"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1385
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Parcheggio"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1386
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Posta"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1387
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Snack"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1388
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Metrò"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1389
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Supplementi"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1390
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taxi"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1391
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Telefono"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1392
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Mance"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1393
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Pedaggi"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1394
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Treno"
 
-#: ../Expense/expense.c:1167
-msgid "Expense: Unknown category\n"
-msgstr "Spese: categoria sconosciuta\n"
-
-#: ../Expense/expense.c:1173
+#: ../Expense/expense.c:1237
 msgid "Expense: Unknown expense type\n"
 msgstr "Spese: tipo di spesa sconosciuto\n"
 
-#: ../Expense/expense.c:1179
+#: ../Expense/expense.c:1243
 msgid "Expense: Unknown payment type\n"
 msgstr "Spese: tipo di pagamento sconosciuto\n"
 
-#: ../Expense/expense.c:1356
+#: ../Expense/expense.c:1375
 msgid "American Express"
 msgstr "American Express"
 
-#: ../Expense/expense.c:1357
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Contante"
 
-#: ../Expense/expense.c:1358
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Assegni"
 
-#: ../Expense/expense.c:1359
+#: ../Expense/expense.c:1378
 msgid "Credit Card"
 msgstr "Carta di credito"
 
-#: ../Expense/expense.c:1360
+#: ../Expense/expense.c:1379
 msgid "Master Card"
 msgstr "Master Card"
 
-#: ../Expense/expense.c:1361
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Prepagati"
 
-#: ../Expense/expense.c:1362
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Tipo:"
+
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Ammontare: "
+
 #. Category Menu
-#: ../Expense/expense.c:1644
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Categoria:"
 
 #. Type Menu
-#: ../Expense/expense.c:1657
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Tipo:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1670
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Pagamento:"
 
 #. Currency Menu
-#: ../Expense/expense.c:1683
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Valuta:"
 
-#. Date Spinners
-#: ../Expense/expense.c:1696
-msgid "Date:"
-msgstr "Data:"
-
-#: ../Expense/expense.c:1713
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Mese: "
 
-#: ../Expense/expense.c:1727
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Giorno:"
 
-#: ../Expense/expense.c:1741
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Anno"
 
 #. Amount Entry
-#: ../Expense/expense.c:1754
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Ammontare: "
 
 #. Vendor Entry
-#: ../Expense/expense.c:1768
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr ""
 
 #. City
-#: ../Expense/expense.c:1782
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "Città:"
 
 #. Attendees
-#: ../Expense/expense.c:1796
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Partecipanti"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "KeyRing: pack_KeyRing(): buf_size troppo piccolo\n"
 
-#: ../KeyRing/keyring.c:1561
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Sbagliata, reinserire la password per KeyRing"
 
-#: ../KeyRing/keyring.c:1563
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Inserire la nuova password per KeyRing"
 
-#: ../KeyRing/keyring.c:1565
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Inserire la password per KeyRing"
 
-#: ../KeyRing/keyring.c:1651
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "La variabile d'ambiente HOME è troppo lunga (> 1024)\n"
-
-#: ../KeyRing/keyring.c:1656
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "KeyRing: file %s non trovato.\n"
 
-#: ../KeyRing/keyring.c:1657
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1741 ../KeyRing/keyring.c:1752
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "KeyRing"
 
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Impossibile esportare appunto %d\n"
+
 #. Change Password button
-#: ../KeyRing/keyring.c:2039
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3065,59 +3686,237 @@ msgstr ""
 "del KeyRing"
 
 #. Clist
-#: ../KeyRing/keyring.c:2124
+#: ../KeyRing/keyring.c:2564
 msgid "Changed"
 msgstr "Cambiato"
 
-#: ../KeyRing/keyring.c:2126
+#: ../KeyRing/keyring.c:2566
 msgid "Account"
 msgstr "Conto"
 
 #. Name entry
-#: ../KeyRing/keyring.c:2219
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "nome: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2226
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "conto: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2233
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "password: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2240
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr "ultima modifica: "
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2250
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Genera la password"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 msgid "SyncTime"
 msgstr ""
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 msgid "Done\n"
 msgstr "Fatto\n"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Sovrascrivi file"
+
+#~ msgid "Field"
+#~ msgstr "Campo"
+
+#, fuzzy
+#~ msgid "email command empty\n"
+#~ msgstr "Comando di posta"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Impossibile aprire il file %s%s\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Impossibile aprire il file %s.alarms\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "Impossibile modificare la categoria %s.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "Impossibile eliminare la categoria %s.\n"
+
+# NdT: è l'intestazione di una colonna, sta meglio con la maiuscola
+#~ msgid "category name"
+#~ msgstr "Nome categoria"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#~ msgid "Close"
+#~ msgstr "Chiudi"
+
+#~ msgid "none"
+#~ msgstr "nessuno"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "repeatType sconosciuto trovato in DatebookDB\n"
+
+#~ msgid "W"
+#~ msgstr "S"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Questo evento non ha un orario particolare"
+
+#~ msgid "Start Time"
+#~ msgstr "Ora di inizio"
+
+#~ msgid "End Time"
+#~ msgstr "Ora di fine"
+
+#~ msgid "Dismiss"
+#~ msgstr "Chiudi"
+
+#~ msgid "Done"
+#~ msgstr "Fatto"
+
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Remove"
+#~ msgstr "Rimuovi"
+
+#~ msgid "User name"
+#~ msgstr "Nome utente"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = versione\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = aiuto\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = esegue in modalità di debug\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = non carica i plugin.\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr ""
+#~ " -b = sincronizza e poi fa un backup, altrimenti sincronizza solamente.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Specificazione della geometria non valida: \"%s\"\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Aiuto/Payback program"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "Finestra di selezione carattere"
+
+#~ msgid "Clear"
+#~ msgstr "Pulisci"
+
+#~ msgid "Show private records"
+#~ msgstr "Mostra le voci private"
+
+#~ msgid "Hide private records"
+#~ msgstr "Nascondi le voci private"
+
+#~ msgid "Mask private records"
+#~ msgstr "Maschera le voci private"
+
+#~ msgid "Font"
+#~ msgstr "Carattere"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "Vai al menù \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" e cambia il \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "The first day of the week is "
+#~ msgstr "Il primo giorno della settimana è "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Porta seriale (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "One record"
+#~ msgstr "Una voce"
+
+#~ msgid "Finished\n"
+#~ msgstr "Completato\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Ultimo nome utente = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Ultimo ID utente = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Nome utente = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "ID utente = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "Palm: numero di voci: %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "Disco: numero di voci: %d\n"
+
+#, fuzzy
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i avvia jpilot iconificato\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s non sembra essere una directory.\n"
+#~ "Deve esserlo.\n"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "Spese: categoria sconosciuta\n"
+
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "La variabile d'ambiente HOME è troppo lunga (> 1024)\n"
+
 #~ msgid "kana("
 #~ msgstr "kana("
 
@@ -3148,9 +3947,6 @@ msgstr "Fatto\n"
 #~ msgid "Directory"
 #~ msgstr "Directory"
 
-#~ msgid "Overwrite File"
-#~ msgstr "Sovrascrivi file"
-
 #~ msgid "Filename"
 #~ msgstr "Nome del file"
 
diff --git a/po/ja.po b/po/ja.po
index ec05800d..7ede85bf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,40 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.9-pre1\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2006-01-29 01:43+0900\n"
 "Last-Translator: Hiroshi Miura <miura@da-cha.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "������­�Ǥ���"
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "���顼"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d ���ƥ������ %s���ɤ߹��ߥ��顼\n"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "�ե����� %s���ɤ߹��ߥ��顼\n"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "���顼"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -47,412 +59,558 @@ msgstr ""
 "���Υ쥳���ɤϺ������ޤ�����\n"
 "�ѹ�������ϡ�����μ��ä��ޤ��ϥ��ԡ���¹Ԥ��Ʋ�������\n"
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "�ե����� %s�򳫤��ޤ���\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "�ե����� %s�򳫤��ޤ���\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "�ե������address.dat�ե����ޥåȤǤ�̵���褦�Ǥ�\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "ʬ��̵��"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "OK"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "No"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Yes"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s �ϥǥ��쥯�ȥ�Ǥ�"
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "�ե�����򳫤��Ȥ��Υ��顼"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "�ե����� %s ���񤭤��ޤ�����"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "�ե�������񤭤��ޤ�����"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "�ե����� %s �򳫤��Ȥ��Υ��顼"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "%d �Υ��ɥ쥹�򥨥����ݡ��ȤǤ��ޤ���\n"
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-msgid "Field"
-msgstr "�ե������"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "���ƥ��ꡧ"
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "�ץ饤�١���"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "E-mail"
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "�����ʥ������ݡ��ȥ�����\n"
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "���̾/̾��"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "̾��/���̾"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "̾��/���̾"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "���̾/̾��"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "����ѤߤΥ쥳���ɤ��ѹ��Ǥ��ޤ���\n"
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "���ƥ��꤬ͭ���ǤϤ���ޤ���\n"
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "�¹Ԥ��륳�ޥ�� = [%s]\n"
 
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
+
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "���å��μ���\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
 #. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "���ƥ��ꡧ"
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
-msgstr "�ɤ�("
-
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "�᡼��"
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "��������"
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "̤����"
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 �쥳����"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d/%d�쥳����"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
-msgstr "���ƥ����Խ�"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "̾��"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "���ɥ쥹Ģ"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "����¾"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "����"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "�����ֹ�"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "���������: "
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "�ѹ��򥭥�󥻥�"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "���"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "���򤷤��쥳���ɤ���"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "������᤹"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "���򤷤��쥳���ɤκ������ä�"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "���ԡ�"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "���򤷤��쥳���ɤ򥳥ԡ�"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "�����쥳����"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "�����쥳���ɤ��ɲ�"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "�쥳���ɤ��ɲ�"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "�����쥳���ɤ��ɲ�"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "�ѹ���Ŭ��"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "�ѹ���ȿ��"
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "�ץ饤�١���"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "̾��"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "���ɥ쥹Ģ"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "����¾"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "����󥻥�"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "����"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "���"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "�ꥹ�Ȥ�\n"
 "ɽ��"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "����"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "���顼��"
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "��"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "����"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "ʬ"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "��"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "���顼��"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "�ե����� %s%s �򳫤��ޤ���\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "%s/%s �򳫤��ޤ���\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "ͽ�������"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "��λ����ͽ��"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "��α���줿ͽ��"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "ͽ��"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "J-Pilot ���顼��"
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr "̵�¥롼�פ������\n"
-
-#: ../alarms.c:1531
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "%s �Υ��顼��ե�����򳫤��ޤ���\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-msgid "rename failed"
-msgstr "̾�����ѹ��˼��Ԥ��ޤ���"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "PC�ե����뤬���ؤäƤ��ޤ���\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek�����Ԥ��ޤ��� - ������ǽ�ʥ��顼�Ǥ�\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "̾�����ѹ��˼��Ԥ��ޤ���"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "��ư"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "���ƥ����Խ�"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "���ƥ���κ����(16)����˻ȤäƤ��ޤ���"
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "���������ƥ��������"
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr "���ƥ��ꥨ�顼�Խ�"
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "̾�����ѹ����륫�ƥ��������ɬ�פǤ�"
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "���ƥ��� %s ���Խ��ϤǤ��ޤ���\n"
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "���������ƥ���̾������"
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "������륫�ƥ��������ɬ�פǤ�"
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr "���ƥ��� %s �����Ǥ��ޤ���\n"
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
@@ -460,202 +618,339 @@ msgstr ""
 "%d �쥳���ɤ� %s ��ˤ���ޤ���\n"
 "%s �˰�ư���ޤ���������Ȥ������ޤ�����"
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "�ե����� %s �� %d ��̵���Ǥ���\n"
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "���ƥ���̾ %s �ϰ��ʾ�Ȥ��ޤ���"
 
-#. correctly translate title
-#: ../category.c:813
-msgid "category name"
-msgstr "���ƥ���̾"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "���ƥ��ꡧ"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "����"
 
-#: ../category.c:845
+#: ../category.c:841
 msgid "Rename"
 msgstr "̾�����ѹ�"
 
-#: ../category.c:960
-msgid "debug"
-msgstr "�ǥХå�"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "�����ʥ����� ="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr ""
 "������Υե�����ɿ��� %d ������������ޤ��������ʥե����ޥåȤǤ���\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "�ե�����ɿ��� %d ������������ޤ��������ʥե����ޥåȤǤ���\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "�����ʥե����ޥåȤǤ����ե�����Υ������ޤ��ְ�äƤ��ޤ���\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "�ե����륹�����ޡ�"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "��������٤��Ǥ��� "
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
-"%s:%d %d�쥳���ɤ� %d �ե�����ɡ������ʥ����ס����餯 %d, ���Ĥ��ä��Τ� %"
-"d\n"
+"%s:%d %d�쥳���ɤ� %d �ե�����ɡ������ʥ����ס����餯 %d, ���Ĥ��ä��Τ� "
+"%d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "�ե�������ɤ߹��ߤ���λ���ޤ�����\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "DatebookDB ��������ʷ����֤������� (%d) �����Ĥ���ޤ�����\n"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "�����֤����ꡧ"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "�����֤�������"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "�����֤����ꡧ"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "�����֤�������"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "�����֤�������"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "�����֤�������"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "��"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "��"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "��"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "��"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "��"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "��"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "��"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "1�����"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "�����֤�������"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "�쥳���ɿ� = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "����"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "���顼��"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "�����֤����ꡧ"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "����"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "ToDoɽ���� %d ���Ĺ�����ޤ��� %d ���ڤ�ͤ�ޤ���\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "���顼"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "�ե������datebook.dat�ե����ޥåȤǤ�̵���褦�Ǥ�\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "�����ʥ������ݡ��ȥ�����"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "�������ݡ���"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "���Ƥ�ͽ��쥳���ɤ����"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "̾����Ĥ�����¸"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "�ե��������"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "ͽ��Υ��ƥ���"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "�Ĥ���"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "�ʤ�"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "1���λϤޤ�"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "1�����"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "������"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "������"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "������"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "������"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "������"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "������"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "������"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "��4"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "�ǽ�"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -669,18 +964,18 @@ msgstr ""
 "�����Ǥ��ޤ���\n"
 "�ɤ�����˾���ޤ���?"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "�����?"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "��������Ū��ͽ��Ǥ���\n"
 "�����ѹ���ָ��ߡפ�ͽ�����\n"
@@ -688,53 +983,58 @@ msgstr ""
 "���Ƥ����Ū��ͽ���Ŭ��\n"
 "���ޤ�����"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "����"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "�ʤ�"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "��"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "��"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "��"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "ǯ"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "%d�����Ȥ�%s�Ȥ���ͽ������ꤹ�뤳�ȤϤǤ��ޤ���\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
+#, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr ""
 "���Τɤ����ˤ����Ƥⷫ���ؤ�����ͽ��Ǥϡ�����˷����֤�ͽ�������Ǥ��ޤ�"
 "��"
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "����ʤ�"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "������ͽ��"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -742,182 +1042,162 @@ msgstr ""
 "����ͽ��ν�λ���ϡ�������\n"
 "�����Ǥʤ��Фʤ�ޤ���"
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "��������ʤ�"
 
-#: ../datebook_gui.c:3021
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "DateBookDB ��� �����֤�ñ�̤˥��顼 = %d\n"
 
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "DatebookDB ��������ʷ����֤������פ����Ĥ���ޤ�����\n"
-
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%A., %s"
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (����)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "��"
 
-#: ../datebook_gui.c:4206
-msgid "W"
-msgstr "��"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "ͽ���ɽ��"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "��"
 
-#: ../datebook_gui.c:4218
-msgid "M"
-msgstr "��"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "ͽ����ɽ��"
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "���ƥ���"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "����"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "ToDo��ɽ��"
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "������"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "����"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "���顼��"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "��"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "�������ʤ�"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "����"
 
-#: ../datebook_gui.c:4493
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "������"
 
-#: ../datebook_gui.c:4507
-msgid "Start Time"
-msgstr "���ϻ���"
-
-#: ../datebook_gui.c:4525
-msgid "End Time"
-msgstr "�����"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "������"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "DateBk����"
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "��"
 
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "ǯ"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "�����֤��ʤ�"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "�����֤�����"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "����"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "������"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "����"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "�����֤�������"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "����"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "�����֤����ꡧ"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "����"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "����"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "ǯ��"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "���äΥ������"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "�ץ�ե��å��� 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "�ץ�ե��å��� 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "�ץ�ե��å��� 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "�����ֹ桧"
 
@@ -925,228 +1205,138 @@ msgstr "
 msgid "Extension"
 msgstr "����"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "������륳�ޥ��"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "�"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "�ե�����֥饦��"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "�������ݡ��Ȥ���쥳���ɤ�����"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "����ȥ�����ȥ��եȥ��������"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "����ݡ���"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "�����ե�����ϥե�����̾�����Ϥ��� TAB ������ɽ��"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "��λ"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "����ݡ��ȥե����륿����"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "�쥳���ɤϥץ饤�١��Ȥ����ꤵ��Ƥ��ޤ�"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "�쥳���ɤϥץ饤�١��Ȥ����ꤵ��Ƥ��ʤ�"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "����ݡ������Υ��ƥ��ꡧ[%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "�쥳���ɤϥ��ƥ��� [%s] �˥���ݡ��Ȥ���ޤ���"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "���Ƥ򥤥�ݡ���"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "�����å�"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "���󥹥ȡ���"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "�����ե�����ϥե�����̾�����Ϥ��� TAB ������ɽ��"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "���󥹥ȡ��뤹��ե�����"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "����ݡ��ȥե����륿����"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "�ɲ�"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "���󥹥ȡ��뤹��ե�����"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "���"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "���󥹥ȡ���"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/�ե�����(_F)/�桼�����Υ��󥹥ȡ���(_U)"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "�桼����̾"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "�桼����ID"
 
-#: ../jpilot-dump.c:95
-msgid " +D +A +T +M format like date +format.\n"
-msgstr " +D +A +T  +M�� date +format ��Ʊ�͡�\n"
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr " -v �С����������ɽ�����ƽ�λ\n"
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr " -h �إ�פ�ɽ�����ƽ�λ\n"
-
-#: ../jpilot-dump.c:98
-msgid " -f displays help for format codes.\n"
-msgstr " -f �ե����ޥåȥ����ɤΥإ�פ�ɽ����\n"
-
-#: ../jpilot-dump.c:99
-msgid " -D dump DateBook.\n"
-msgstr " -D ͽ��ɽ�����פ���\n"
-
-#: ../jpilot-dump.c:100
-msgid " -N dump appts for today in DateBook.\n"
-msgstr " -N ͽ��ɽ��κ�����ͽ������פ���\n"
-
-#: ../jpilot-dump.c:101
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr " -NYYYY/MM/DD ͽ��ɽ��� YYYY/MM/DD ��ͽ������פ���\n"
-
-#: ../jpilot-dump.c:102
-msgid " -A dump Address book.\n"
-msgstr " -A ���ɥ쥹Ģ�����פ���\n"
-
-#: ../jpilot-dump.c:103
-msgid " -T dump ToDo list as CSV.\n"
-msgstr " -T Todo��CSV�Ȥ��ƥ���פ��롣\n"
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr " -M ���Ģ�����פ���\n"
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-" J-Pilot ������ϡ��ݡ��Ȥ�ž��®�١��Хå����åפθĿ��ʤɤ��������٤��ɤ�"
-"���ޤ�ޤ���\n"
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr "-v = ����������\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr " -h = �إ��\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = �ǥХå��⡼�ɤǼ¹Ԥ���\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = �ץ饰������ɤ߹��ޤʤ�\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = Ʊ����˥Хå����åפ��롢�����Ǥʤ����ñ��Ʊ���������롣\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l = �����֤��������Ǥʤ���а���Ʊ�����ƽ�λ\n"
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr " -p {port} = ���ꤵ�줿�ݡ��Ȥ�����ˡ����Υݡ��Ȥ�Ʊ������\n"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "̵���� ����/�����������ꤵ��Ƥ��ޤ��� \"%s\"\n"
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "����"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "���Υ��󥸥åȤǤϰ����ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "���Υ��󥸥åȤǤϥ���ݡ��Ȥϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "���Υ��󥸥åȤǤϥ������ݡ��Ȥϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Ʊ���Υ���󥻥�"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "���� Palm �ǥХ����ϡ������Ʊ�����Ȥϰۤʤ�\n"
@@ -1155,14 +1345,16 @@ msgstr ""
 "�褯ʬ����ʤ����ϥ桼�����ޥ˥奢����ɤ�Ǥ���������"
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "���� Palm �ǥХ����ˤϥ桼���� ID ������ޤ���\n"
@@ -1174,247 +1366,226 @@ msgstr ""
 "install-user \"�桼����̾\" 12345 �Τ褦�˼¹Ԥ��Ʋ�������\n"
 "�褯ʬ����ʤ����ϥ桼�����ޥ˥奢����ɤ�Ǥ���������"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Ʊ���Υ���󥻥�"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "���Ȥ�����Ʊ������"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Ʊ��������"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr "�桼����:"
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "Unknown command from sync process\n"
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "%s �ˤĤ���"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/�ե�����(_F)"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/�ե�����(_F)/ʬΥ(_T)"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/�ե�����(_F)/����(_F)"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/�ե�����(_F)/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/�ե�����(_F)/���󥹥ȡ���(_I)"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/�ե�����(_F)/����ݡ���(_N)"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/�ե�����(_F)/�������ݡ���(_E)"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/�ե�����(_F)/�Ķ�����(_O)"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/�ե�����(_F)/����(_P)"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/�ե�����(_F)/�桼�����Υ��󥹥ȡ���(_U)"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/�ե�����(_F)/�ꥹ�ȥ�(_R)"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/�ե�����(_F)/��λ(_Q)"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/ɽ��(_V)"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/ɽ��(_V)/�ץ饤�١��ȥ쥳���ɤ���ɽ��(_H)"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/ɽ��(_V)/�ץ饤�١��ȥ쥳���ɤ�ɽ��(_S)"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/ɽ��(_V)/�ץ饤�١��ȥ쥳���ɤ�ޥ���(_U)"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/ɽ��(_V)/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/ɽ��(_V)/ͽ��ɽ(_S)"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/ɽ��(_V)/���ɥ쥹Ģ(_A)"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/ɽ��(_V)/Todo�ꥹ��(_T)"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/ɽ��(_V)/���Ģ(_M)"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/�ץ饰����(_P)"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/������(_W)"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/������(_W)/Netscape(_N)"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/������(_W)/Mozilla(_M)"
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/������(_W)/Galeon(_G)"
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/������(_W)/Opera(_O)"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/������(_W)/GnomeUrl(_U)"
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/������(_W)/Lynx(_X)"
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/������(_W)/Links(_L)"
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/������(_W)/W3M(_W)"
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/������(_W)/Konqueror(_K)"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/�إ��(_H)"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/�إ��(_H)/�ڥ��Хå� �ץ������"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/�إ��(_H)/J-Pilot�ˤĤ���(_A)"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/�ץ饰����(_P)/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/�إ��(_H)/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr "�ե�����������������"
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "��������:���λϤޤ�:0"
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "�ץ饰������ɤ߹���Ǥ��ޤ���\n"
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "���ƤΥ��顼���̵�뤷�ޤ���\n"
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "���Υ��顼���̵�뤷�ޤ���\n"
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "pipe�򳫤��ޤ���\n"
 
-#: ../jpilot.c:2422
-msgid " User: "
-msgstr "�桼����:"
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "�õ�"
-
-#: ../jpilot.c:2649
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "�ץ饤�١��ȥ쥳���ɤ�ɽ�� Ctrl-Z"
 
-#: ../jpilot.c:2654
-msgid "Show private records"
-msgstr "�ץ饤�١��ȥ쥳���ɤ�ɽ��"
-
-#: ../jpilot.c:2659
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "�ץ饤�١��ȥ쥳���ɤ��� Ctrl-Z"
 
-#: ../jpilot.c:2664
-msgid "Hide private records"
-msgstr "�ץ饤�١��ȥ쥳���ɤ���"
-
 # jpilot.c: old version
-#: ../jpilot.c:2669
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "�ץ饤�١��ȥ쥳���ɤΥޥ��� Ctrl-Z"
 
-# jpilot.c: old version
-#: ../jpilot.c:2674
-msgid "Mask private records"
-msgstr "�ץ饤�١��ȥ쥳���ɤΥޥ���"
-
-#: ../jpilot.c:2684
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "�ǥ����ȥåפ�Palm��Ʊ�������� Ctrl-Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
-msgid "Font"
-msgstr "�ե����"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "���ɥ쥹Ģ��Ʊ��"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1422,793 +1593,1252 @@ msgstr ""
 "�ǥ����ȥåפ� Palm �ǥХ�����Ʊ��\n"
 "��������˥Хå����åפ���"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "ͽ��ɽ/������ɽ��"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "���ɥ쥹Ģ"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Todo�ꥹ��"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "���Ģ"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "�������¹�"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "��ǻפ��Ф�����"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "��ɽ�����ʤ���"
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 "J-Pilot �� GTK2 �ġ��륭�åȤ���Ѥ��Ƥ��ޤ������Υġ��륭�åȤǤ�ʸ���Υ���"
 "�����ɤ� UTF-8 ����Ѥ��Ƥ��ޤ���\n"
 "���ܸ��ɽ������٤ˤϺǽ�� UTF-8��ʸ�����åȤ����򤷤Ʋ�������\n"
 "\n"
 
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr "��˥塼�� \""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
-msgstr "\" �˰�ư���� \""
-
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "ʸ�����å� "
 
-#: ../jpilot.c:2898
-msgid "\"."
-msgstr "\" ���ѹ����Ʋ�������."
-
-#: ../jpilot.c:2900
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "UTF-8 ���󥳡��ɤ����򤷤Ʋ�������"
 
-#: ../libplugin.c:153
-#, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "������ PC �إå��С������ = %d\n"
-
-#: ../libplugin.c:416
+#: ../jpilot-dump.c:92
 #, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d %s���ɤ߹��ߥ��顼\n"
+msgid " +D +A +T +M format like date +format.\n"
+msgstr " +D +A +T  +M�� date +format ��Ʊ�͡�\n"
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d %s���ɤ߹��ߥ��顼\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v �С����������ɽ�����ƽ�λ\n"
 
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
-msgstr ""
-"���Υ쥳���ɤϺ���ѤߤǤ���\n"
-"�����Ʊ������ Palm �ǥХ��������������ͽ��Ǥ���\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h �إ�פ�ɽ�����ƽ�λ\n"
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-msgid "Unable to open PC records file\n"
-msgstr "PC �Υ쥳���ɥե�����򳫤��ޤ���\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -f �ե����ޥåȥ����ɤΥإ�פ�ɽ����\n"
 
-#: ../libplugin.c:493 ../utils.c:1959
-msgid "Couldn't find record to delete\n"
-msgstr "�������쥳���ɤ����դ���ޤ���Ǥ�����\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -D ͽ��ɽ�����פ���\n"
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "Unknown header version %d\n"
-msgstr "�����ʥإå��С������ %d �Ǥ���\n"
-
-#: ../libplugin.c:524
-msgid "Couldn't open PC records file\n"
-msgstr "PC�Υ쥳���ɥե�����򳫤��ޤ���\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
-#, c-format
-msgid "Error opening file: %s\n"
-msgstr "%s �ե�����򳫤��Ȥ��Υ��顼\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N ͽ��ɽ��κ�����ͽ������פ���\n"
 
-#: ../libplugin.c:714
-msgid "Error reading PC file 1\n"
-msgstr "PC �ե����� 1 ���ɤ߹��ߥ��顼\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr " -NYYYY/MM/DD ͽ��ɽ��� YYYY/MM/DD ��ͽ������פ���\n"
 
-#: ../libplugin.c:730
-msgid "Error reading PC file 2\n"
-msgstr "PC �ե����� 2 ���ɤ߹��ߥ��顼\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr " -A ���ɥ쥹Ģ�����פ���\n"
 
-#: ../libplugin.c:903
-#, c-format
-msgid "Error reading %s 5\n"
-msgstr "%s 5 ���ɤ߹��ߥ��顼\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -T Todo��CSV�Ȥ��ƥ���פ��롣\n"
 
-#: ../log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "�����ե�����򳫤��ޤ���Τǽ�λ���ޤ���\n"
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M ���Ģ�����פ���\n"
 
-#: ../log.c:102
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "�����ե�����򳫤��ޤ���\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "���Ģ�Υƥ����Ȥ� 65535 ��ۤ��ޤ�����������ڤ�ΤƤޤ���\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "�ե����� %s�򳫤��ޤ���\n"
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "���Ģ %s �򥤥�ݡ��Ȥ��ޤ�����\n"
-
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "�ե������memopad.dat �ե����ޥåȤǤ�̵���褦�Ǥ�\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "���Ģ %d �򥨥����ݡ��ȤǤ��ޤ���\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-# msgid "WeekView"
-# msgstr "�콵�֤�ͽ��"
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "��ɽ��"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Palm�Υѥ����"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "����������ޤ���PalmOS �Υѥ���ɤ�����Ϥ��Ƥ�������"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "PalmOS �Υѥ��������"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "̵�¥롼��"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "%s%s ���ɤ߹����� line 1:[%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
-msgstr "�С�����󤬰㤤�ޤ���\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
-msgstr "���� -> ���󥸥åȤ��ǧ���Ʋ�������\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
-"�ץ饰���� [%s] �Υ����ץ�˼��ԡ�\n"
-"���顼 [%s] ��\n"
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr "̵���ʥץ饰����: [%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: ../plugins.c:296
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "�ץ饰����:[%s]\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../plugins.c:297
+#: ../jpilot-merge.c:299
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "���Υץ饰����ΥС������� (%d.%d) �Ǥ���\n"
-
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "���ΥС������� J-Pilot ��ư�����ˤϸŲ᤮�ޤ���\n"
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
-msgstr "%Yǯ%m��%d��"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: ../prefs.c:394
-msgid "%d %B %Y"
-msgstr "%Yǯ%b%e��"
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+" J-Pilot ������ϡ��ݡ��Ȥ�ž��®�١��Хå����åפθĿ��ʤɤ��������٤��ɤ�"
+"���ޤ�ޤ���\n"
+
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v �С�������ֹ�ȥ���ѥ��륪�ץ�����ɽ�����ƽ�λ��\n"
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d ɸ����Ϥ˥ǥХå��������ϡ�\n"
+
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr "-p �ץ饰�����ɹ��ߤ򥹥��åס�\n"
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l = �����֤��������Ǥʤ���а���Ʊ�����ƽ�λ\n"
+
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr " -p {port} = ���ꤵ�줿�ݡ��Ȥ�����ˡ����Υݡ��Ȥ�Ʊ������\n"
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "%s �ե�����򳫤��Ȥ��Υ��顼\n"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "�ե����륪���ץ󥨥顼: next_id\n"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "���顼"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "�Ķ��ѿ� HOME ��Ĺ�᤮�ޤ���\n"
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"���Υ쥳���ɤϺ���ѤߤǤ���\n"
+"�����Ʊ������ Palm �ǥХ��������������ͽ��Ǥ���\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "PC �Υ쥳���ɥե�����򳫤��ޤ���\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "�������쥳���ɤ����դ���ޤ���Ǥ�����\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "�����ʥإå��С������ %d �Ǥ���\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d %s���ɤ߹��ߥ��顼\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d %s���ɤ߹��ߥ��顼\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "%s �ե�����򳫤��Ȥ��Υ��顼\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "%s 5 ���ɤ߹��ߥ��顼\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "PC �ե����� 1 ���ɤ߹��ߥ��顼\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "PC �ե����� 2 ���ɤ߹��ߥ��顼\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "������ PC �إå��С������ = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "�����ե�����򳫤��ޤ���Τǽ�λ���ޤ���\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "�����ե�����򳫤��ޤ���\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "���Ģ�Υƥ����Ȥ� 65535 ��ۤ��ޤ�����������ڤ�ΤƤޤ���\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "���Ģ %s �򥤥�ݡ��Ȥ��ޤ�����\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "�ե������memopad.dat �ե����ޥåȤǤ�̵���褦�Ǥ�\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "���Ģ %d �򥨥����ݡ��ȤǤ��ޤ���\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "���Ģ"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+# msgid "WeekView"
+# msgstr "�콵�֤�ͽ��"
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "��ɽ��"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+#, fuzzy
+msgid "last char truncated"
+msgstr "�ǽ�������: "
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
 
-#: ../prefs.c:395
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Palm�Υѥ����"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "����������ޤ���PalmOS �Υѥ���ɤ�����Ϥ��Ƥ�������"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "PalmOS �Υѥ��������"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "�ե����� %s���ɤ߹��ߥ��顼\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "̵�¥롼��"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "%s%s ���ɤ߹����� line 1:[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "�С�����󤬰㤤�ޤ���\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "���� -> ���󥸥åȤ��ǧ���Ʋ�������\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"�ץ饰���� [%s] �Υ����ץ�˼��ԡ�\n"
+"���顼 [%s] ��\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr "̵���ʥץ饰����: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "�ץ饰����:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "���Υץ饰����ΥС������� (%d.%d) �Ǥ���\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "���ΥС������� J-Pilot ��ư�����ˤϸŲ᤮�ޤ���\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr "%Yǯ%m��%d��"
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr "%Yǯ%b%e��"
+
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr "%yǯ%m��%d��"
 
-#: ../prefs.c:396
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr "%yǯ%b%e��"
 
-#: ../prefs.c:397
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr "%EY%m��%d��"
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr "%EY%b%e��"
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "����"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "�ϰ�"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "����"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr "ͽ��ɽ"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "Todo�ꥹ��"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "���Ģ"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "���顼��"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "���󥸥å�"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "û�����շ��� "
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "Ĺ�����շ��� "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "������� "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "���λϤޤ� "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "GTK ���顼�ե���������� "
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "�ݡ���(/dev/ttyS0, /dev/pilot) "
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Ʊ��������"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr "���ꥢ����³��ž��®��(USB�ˤ�̵�ط�) "
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "��¸����Хå����åפθĿ� "
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "������줿�쥳���ɤ�ɽ��(�ǥե���� NO)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "���������쥳���ɤ�ɽ��(�ǥե���� NO)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "�ե�����Υ��󥹡�����˳�ǧ (J-Pilot -> PDA) (�ǥե���� YES)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "�ݥåץ��åס��ġ�����åפ�ɽ�� (�ǥե���� YES)"
 
-#. ********************************************************************
-#. Datebook preference tab
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "ͽ��Τ�������ϥ��饤��ɽ������"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr "����������ɽ����(����)��ɽ������"
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr "����������ɽ���ǡ���ǰ����ǯ��ɽ������"
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "DateBk �ΥΡ��ȥ�����Ȥ�"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "DataBk���ݡ��ȤϤ��Υӥ�ɤǤ�̵���Ǥ�"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
-msgstr "����������ɽ����(����)��ɽ������"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
+msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
-msgstr "����������ɽ���ǡ���ǰ����ǯ��ɽ������"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
+msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "�᡼�륳�ޥ��"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s ��e-mail���ɥ쥹���֤��������ޤ�"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "��λ����ToDo��ɽ�����ʤ�"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "���¤���Ƥ��ʤ�ToDo�򱣤� "
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "��λ����Ͽ����"
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Manana �ǡ����١�����Ȥ�"
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "���¤������Υǥե������"
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Memo32(pedit32)��Ȥ�"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "ͽ���פ��Ф����뤿��˥��顼�०����ɥ���ɽ������"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "���ޥ�ɤ�¹Ԥ���"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "�ٹ�: �����륳�ޥ�ɤμ¹Ԥˤ����դ��뤳�ȡ�"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "���顼�ॳ�ޥ��"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t �򥢥顼�������֤������ޤ�"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d �򥢥顼�������֤������ޤ�"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D �򥢥顼��ε��Ҥ��֤������ޤ�"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N �򥢥顼��Ρ��Ȥ��֤������ޤ�"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D �ʵ����֤������ˤϤ��Υӥ�ɤǤ�̵���Ǥ�"
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (�Ρ����֤�����)�Ϥ��Υӥ�ɤǤ�̵���Ǥ�"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "ͽ��ɽ��Ʊ��"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "���ɥ쥹Ģ��Ʊ��"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Todo��Ʊ��"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "���Ģ��Ʊ��"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "���Ģ (memo32/pedit32) ��Ʊ��"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Manana ��Ʊ��"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "J-OS (���ܸ� OS �� Palm / WorkPad / CLIE �ʳ�) ��Ȥ�"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "%s (%s) ��Ʊ��"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "�������ץ����"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "�ѻ極����"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "��������"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "���ְ���"
 
 # msgid "WeekView"
 # msgstr "�콵�֤�ͽ��"
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "��ְ���"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "1 �쥳����"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "%s�Υ쥳���ɤ������ޤ�����"
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "���Υ��ƥ�������ƤΥ쥳����"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "���ƤΥ쥳���ɤ��������"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "1 �ڡ����� 1 �쥳����"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr "�쥳���ɴ֤ζ����"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "�������ޥ��(��:lpr, cat >file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "�ϥ�ɥإ�ɤإꥹ�ȥ�"
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "���󥹥ȡ��뤹��ե�����"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "�ϥ�ɥإ�ɤإꥹ�ȥ�����ˤ�"
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr ""
 "1. �ꥹ�ȥ����������ץꥱ�����������Ƥ����򤷤Ƥ��������������ͤ����ƤǤ���"
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. �桼��̾�ȥ桼��ID�򤤤�Ƥ���������"
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. OK�ܥ���򲡤��Ƥ�������"
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "�������ϡ����� Palm �ǥХ�����ˤ���ǡ������񤭤��ޤ���"
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "�桼����̾"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "ͽ��ɽ"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "���ɥ쥹Ģ"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "Todo"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "���Ģ"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "���Ģ"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "�ץ饰���� ?"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "�쥳���ɤ����դ���ޤ���"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "����"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "����ʸ����: "
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "��ʸ��/��ʸ�������"
 
-#: ../sync.c:139
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "�����ե�����򳫤��ޤ���\n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "���å��μ���\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "sync �ե������ pid %d �ˤ�äƥ��å�����Ƥ��ޤ���\n"
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "������å��˼��Ԥ��ޤ�����\n"
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "Ʊ���� pid %d �ˤ����å�����Ƥ��ޤ���\n"
 
-#: ../sync.c:244
-#, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s: HotSync�ܥ���򲡤��� \"kill %d\" ��¹Ԥ��Ʋ�������\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "���ꥢ��ݡ��Ȥ�������ǧ���Ƥ�������\n"
 
-#: ../sync.c:297
-#, c-format
-msgid "Exiting with status %s\n"
-msgstr "���� %s �ǽ�λ���ޤ���\n"
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "�ۡ���ǥ��쥯�ȥ�򳫤��ޤ���\n"
 
-#: ../sync.c:298
-msgid "Finished\n"
-msgstr "��λ\n"
+#: ../sync.c:1085 ../sync.c:1423
+#, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (���ꥨ����ID '%s')�Ϻǿ��ʤΤǥ����åפ��ޤ���\n"
 
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
-msgstr "�桼��������Υ��󥹥ȡ��뤬��λ���ޤ�����\n"
+#: ../sync.c:1089 ../sync.c:1427
+#, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "'%s'(���ꥨ����ID '%s') �������..."
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "���ꥢ��ݡ��Ȥ�������ǧ���Ƥ�������\n"
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "���Ԥ��ޤ������ե����� %s ������Ǥ��ޤ���\n"
 
-#: ../sync.c:674
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
-msgid " Syncing on device %s\n"
-msgstr "�ǥХ���%s��Ʊ�����ޤ���\n"
+msgid "Failed, unable to back up database %s\n"
+msgstr "���Ԥ��ޤ������ǡ����١��� %s �ΥХå����åפ��Ǥ��ޤ���\n"
 
-#: ../sync.c:675
-msgid " Press the HotSync button now\n"
-msgstr "HotSync �ܥ���򲡤��Ƥ���������\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "OK\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:1304
 #, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "�Ǹ��Ʊ�������桼��̾-->\"%s\"\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "%s (���ꥨ����ID '%s')�Υ����å�\n"
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:1498
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "�Ǹ��Ʊ�������桼��ID-->\"%d\"\n"
+msgid "Installing %s "
+msgstr "%s �Υ��󥹥ȡ���"
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr "���Υ桼��̾-->\"%s\"\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"'�ե�����򳫤��ޤ���: '%s': %s!\n"
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:1508
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr "���Υ桼��ID-->%d\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"�ե������Ʊ�����Ǥ��ޤ���: '%s': �ե��������»?\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(���ꥨ����ID��'%s')..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(���ꥨ����ID��'%s')..."
 
-#: ../sync.c:795
+#: ../sync.c:1530
 #, c-format
-msgid "Username is \"%s\"\n"
-msgstr "�桼��̾��\"%s\"�Ǥ�\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:796
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid "User ID is %d\n"
-msgstr "�桼��ID��%d�Ǥ�.\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"%s�򳫤��ޤ���\n"
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:1615
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "�Ǹ��Ʊ������PC = %d\n"
+msgid "Install %s failed"
+msgstr "%s �Υ��󥹥ȡ���˼��Ԥ��ޤ���"
 
-#: ../sync.c:799
-#, c-format
-msgid "This PC = %lu\n"
-msgstr "����PC = %lu\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "����\n"
 
-#: ../sync.c:800
-#, c-format
-msgid "Last Username = [%s]\n"
-msgstr "�Ǹ�Υ桼��̾��[%s]�Ǥ�\n"
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s �򥤥󥹥ȡ��뤷�ޤ��� "
 
-#: ../sync.c:801
+#: ../sync.c:1736
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "�Ǹ�Υ桼��ID��%d�Ǥ�.\n"
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d ���ץꥱ���������� %s �������顼\n"
 
-#: ../sync.c:802
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "�桼��̾��[%s]�Ǥ�\n"
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d ���ץꥱ���������� %s ���Ф����顼\n"
 
-#: ../sync.c:803
+#: ../sync.c:1763
 #, c-format
-msgid "userID = %d\n"
-msgstr "�桼��ID��%d�Ǥ�.\n"
-
-#: ../sync.c:821
-msgid "Sync canceled\n"
-msgstr "Ʊ��������󥻥뤵��ޤ���\n"
-
-#: ../sync.c:843
-msgid "Finished restoring handheld.\n"
-msgstr "�ϥ�ɥإ�ɤؤΥꥹ�ȥ���λ\n"
-
-#: ../sync.c:844
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "Ʊ���ˤϡ�J-Pilot�Υ��åץǡ��Ȥ�ɬ�פǤ�.\n"
-
-#: ../sync.c:874
-msgid "Doing a fast sync.\n"
-msgstr "��®Ʊ���档\n"
+msgid "Error reading appinfo block for %s\n"
+msgstr "%s �Υ��ץꥱ����������֥��å��ɤ߹��ߥ��顼\n"
 
-#: ../sync.c:913
-msgid "Doing a slow sync.\n"
-msgstr "��®Ʊ���档\n"
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "��⡼�ȤΥ��ƥ��� %s ���ɲäǤ��ޤ���Ǥ�����\n"
 
-#: ../sync.c:1014
-msgid "Thank you for using J-Pilot."
-msgstr "J-Pilot��ȤäƤ���Ƥ��꤬�Ȥ�!"
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "��⡼�Ȥˤϥ��ƥ��꤬¿�����ޤ���\n"
 
-#: ../sync.c:1056
-msgid "Finished.\n"
-msgstr "��λ\n"
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "%s �Υǥ����ȥåפ����ƤΥ쥳���ɤϡ� %s �ذ�ư���ޤ���\n"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "%s ��Ʊ�����Ƥ��ޤ�\n"
 
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "%s�Υ쥳���ɤ�񤭹��ߤޤ�����"
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "%s�Υ쥳���ɤν񤭹��ߤ����Ԥ��ޤ�����"
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "%s�Υ쥳���ɤκ�������Ԥ��ޤ�����"
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "%s�Υ쥳���ɤ������ޤ�����"
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "%s�Υ쥳���ɤ������ޤ�����"
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "%s�Υ쥳���ɤ�񤭹��ߤޤ�����"
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "%s�Υ쥳���ɤν񤭹��ߤ����Ԥ��ޤ�����"
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "%s�Υ쥳���ɤκ�������Ԥ��ޤ�����"
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "%s�Υ쥳���ɤ������ޤ�����"
 
-#: ../sync.c:1133
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "number of records = %d\n"
-msgstr "�쥳���ɿ� = %d\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
+
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:1260 ../sync.c:2435
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2216,781 +2846,837 @@ msgstr ""
 "dlp_DeleteRecord�����Ԥ��ޤ�����\n"
 "Palm��Ǵ��˥쥳���ɤ��������Ƥ��뤳�Ȥ������Ȥ��ƹͤ����ޤ���\n"
 
-#: ../sync.c:1358 ../sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (���ꥨ����ID '%s')�Ϻǿ��ʤΤǥ����åפ��ޤ���\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "�桼��������Υ��󥹥ȡ��뤬��λ���ޤ�����\n"
 
-#: ../sync.c:1362 ../sync.c:1774
+#: ../sync.c:3094
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "'%s'(���ꥨ����ID '%s') �������..."
+msgid " Syncing on device %s\n"
+msgstr "�ǥХ���%s��Ʊ�����ޤ���\n"
 
-#: ../sync.c:1369 ../sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "���Ԥ��ޤ������ե����� %s ������Ǥ��ޤ���\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr "HotSync �ܥ���򲡤��Ƥ���������\n"
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "���Ԥ��ޤ������ǡ����١��� %s �ΥХå����åפ��Ǥ��ޤ���\n"
-
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "OK\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "�Ǹ��Ʊ�������桼��̾-->\"%s\"\n"
 
-#: ../sync.c:1687
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "%s (���ꥨ����ID '%s')�Υ����å�\n"
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "�Ǹ��Ʊ�������桼��ID-->\"%d\"\n"
 
-#: ../sync.c:1861
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid "Installing %s "
-msgstr "%s �Υ��󥹥ȡ���"
+msgid " This Username-->\"%s\"\n"
+msgstr "���Υ桼��̾-->\"%s\"\n"
 
-#: ../sync.c:1867
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"'�ե�����򳫤��ޤ���: '%s': %s!\n"
+msgid " This User ID-->%d\n"
+msgstr "���Υ桼��ID-->%d\n"
 
-#: ../sync.c:1871
+#: ../sync.c:3204
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"�ե������Ʊ�����Ǥ��ޤ���: '%s': �ե��������»?\n"
+msgid "Username is \"%s\"\n"
+msgstr "�桼��̾��\"%s\"�Ǥ�\n"
 
-#: ../sync.c:1883
+#: ../sync.c:3205
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(���ꥨ����ID��'%s')..."
+msgid "User ID is %d\n"
+msgstr "�桼��ID��%d�Ǥ�.\n"
 
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
+#: ../sync.c:3207
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"%s�򳫤��ޤ���\n"
+msgid "lastSyncPC = %d\n"
+msgstr "�Ǹ��Ʊ������PC = %d\n"
 
-#: ../sync.c:1960
+#: ../sync.c:3208
 #, c-format
-msgid "Install %s failed"
-msgstr "%s �Υ��󥹥ȡ���˼��Ԥ��ޤ���"
-
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "����\n"
+msgid "This PC = %lu\n"
+msgstr "����PC = %lu\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
-#, c-format
-msgid "Installed %s "
-msgstr "%s �򥤥󥹥ȡ��뤷�ޤ��� "
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "Ʊ��������󥻥뤵��ޤ���\n"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "%s/%s �򳫤��ޤ���\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "�ϥ�ɥإ�ɤؤΥꥹ�ȥ���λ\n"
 
-#: ../sync.c:2180
-msgid "Unable to read home dir\n"
-msgstr "�ۡ���ǥ��쥯�ȥ�򳫤��ޤ���\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "Ʊ���ˤϡ�J-Pilot�Υ��åץǡ��Ȥ�ɬ�פǤ�.\n"
 
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: �쥳���ɿ� = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "��®Ʊ���档\n"
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "disk: �쥳���ɿ� = %d\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "��®Ʊ���档\n"
 
-#: ../sync.c:2888
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d ���ץꥱ���������� %s �������顼\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "J-Pilot��ȤäƤ���Ƥ��꤬�Ȥ�!"
 
-#: ../sync.c:2894 ../sync.c:2936
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d ���ץꥱ���������� %s ���Ф����顼\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "��λ\n"
 
-#: ../sync.c:2916 ../sync.c:2928
+#: ../sync.c:3446
 #, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "%s �Υ��ץꥱ����������֥��å��ɤ߹��ߥ��顼\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
+#: ../sync.c:3447
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "��⡼�ȤΥ��ƥ��� %s ���ɲäǤ��ޤ���Ǥ�����\n"
-
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
-msgstr "��⡼�Ȥˤϥ��ƥ��꤬¿�����ޤ���\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "%s �Υǥ����ȥåפ����ƤΥ쥳���ɤϡ� %s �ذ�ư���ޤ���\n"
+msgid "Exiting with status %s\n"
+msgstr "���� %s �ǽ�λ���ޤ���\n"
 
-#: ../todo.c:248
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "ToDoɽ���� %d ���Ĺ�᤮�ޤ��� %d ���ڤ�ͤ�ޤ���\n"
 
-#: ../todo.c:255
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "ToDo�ΥΡ��Ȥ� %d ���Ĺ�����ޤ��� %d ���ڤ�ͤ�ޤ���\n"
 
-#: ../todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d ���ƥ������ %s���ɤ߹��ߥ��顼\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "�����ڤ�"
 
-#: ../todo_gui.c:535
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "�ե�����ϡ� todo.dat �ե����ޥåȤǤ�̵���褦�Ǥ�\n"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "todo %d ���������ݡ��ȤǤ��ޤ���\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "�����ڤ�"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "�����ڤ�"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "ͥ���١�"
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "��λ"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "ͥ���̤��ϰϳ��Ǥ���\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "�����ڤ�ʤ�"
 
-#. The completed check box
-#: ../todo_gui.c:2206
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "��λ"
 
-#: ../todo_gui.c:2214
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "ͥ���١�"
 
-#: ../todo_gui.c:2234
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "��������"
 
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "����"
+#: ../utils.c:330
+msgid "Today"
+msgstr "����"
 
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v �С�������ֹ�ȥ���ѥ��륪�ץ�����ɽ�����ƽ�λ��\n"
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "���� %s DB�ե����� %s �򸫤Ĥ����ޤ���\n"
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d ɸ����Ϥ˥ǥХå��������ϡ�\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr "�ϥ��󥹥ȡ��뤵��ޤ���\n"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "�ǥ��쥯�ȥ� %s ������Ǥ��ޤ���\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s �ϥǥ��쥯�ȥ�Ǥ�"
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "�ǥ��쥯�ȥ� %s �˥ե������񤭹���ޤ���\n"
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "�ѹ����줿�쥳���ɤ���¸���ޤ�����"
 
-#: ../utils.c:75
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "���Υ쥳���ɤ��ѹ�����¸���ޤ�����"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "�����쥳���ɤ���¸���ޤ�����"
+
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "�������쥳���ɤ���¸���ޤ�����"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "̵�¥롼�פ������\n"
+
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr "-p �ץ饰�����ɹ��ߤ򥹥��åס�\n"
 
-#: ../utils.c:76
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr " -a ����ư�������μ��Ԥ������顼���̵�뤹�롣\n"
 
-#: ../utils.c:77
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A ���ƤΥ��顼���̵�뤹��(�����̤���)��\n"
 
-#: ../utils.c:78
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i ��ư����jpilot��Ǿ������롣\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " �Ķ��ѿ� PILOTPORT �ڤ� PILOTRATE ��Ʊ������\n"
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " �ݡ��ȵڤӥ��ԡ��ɤ���ꤹ��Τ˻��Ѥ���ޤ���\n"
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr ""
 " PILOTPORT �����ꤵ��Ƥ��ʤ����� /dev/pilot ���ǥե���Ȥǻ��Ѥ���ޤ���\n"
 
-#: ../utils.c:107
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "�ե�������ɤ߹��ߥ��顼"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "����ѥ�����"
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "���Υ��ץ����ǥ���ѥ��뤵��ޤ�����"
 
-#: ../utils.c:110
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "���󥹥ȡ���ѥ�"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link �������"
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "USB ���ݡ���"
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "�Ϥ�"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-msgid "no"
-msgstr "������"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "�ץ饤�١��ȥ쥳���ɤΥ��ݡ���"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "������"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Databk �Υ��ݡ���"
 
-#: ../utils.c:134
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "�ץ饰���󥵥ݡ���"
 
-#: ../utils.c:140
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Manana ���ݡ���"
 
-#: ../utils.c:146
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "NLS ���ݡ��ȡʳ�����"
 
-#: ../utils.c:152
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "GTK2 ���ݡ���"
 
-#: ../utils.c:207
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "������ %A, %x %X"
-
-#: ../utils.c:209
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "������ %%A, %s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "����"
+msgid "Can't get HOME environment variable\n"
+msgstr "�Ķ��ѿ� HOME �������Ǥ��ޤ���\n"
 
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "�ѹ����줿�쥳���ɤ���¸���ޤ�����"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
+msgstr "�Ķ��ѿ� HOME ��Ĺ�᤮�ޤ���\n"
 
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "���Υ쥳���ɤ��ѹ�����¸���ޤ�����"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "���ƥ����Խ�"
 
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "�����쥳���ɤ���¸���ޤ�����"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC��ID��0�Ǥ���\n"
 
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "�������쥳���ɤ���¸���ޤ�����"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "������ %lu �Ȥ��� PC ID ���������ޤ���\n"
 
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
-msgid "Can't get HOME environment variable\n"
-msgstr "�Ķ��ѿ� HOME �������Ǥ��ޤ���\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "�Ķ��ѿ� HOME ��Ĺ�᤮�ޤ���\n"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "������ %A, %x %X"
 
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
+#: ../utils.c:3539
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr "�ǥ��쥯�ȥ� %s ������Ǥ��ޤ���\n"
+msgid "Today is %%A, %s %s"
+msgstr "������ %%A, %s %s"
 
-#: ../utils.c:1399
+#: ../utils.c:3768
 #, c-format
 msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
-"%s �ϥǥ��쥯�ȥ�Ǥ�̵���褦�Ǥ���\n"
-"����ϥǥ��쥯�ȥ�Ǥʤ���Фʤ�ޤ���\n"
-
-#: ../utils.c:1405
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "�ǥ��쥯�ȥ� %s �˥ե������񤭹���ޤ���\n"
 
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "PC �إå���ե�����˽񤭹�����˥��顼 : next_id\n"
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
 msgstr "next id ��ե�����˽񤭹�����˥��顼 : next_id\n"
 
-#: ../utils.c:1483
-msgid "Error opening file: next_id\n"
-msgstr "�ե����륪���ץ󥨥顼: next_id\n"
-
-#: ../utils.c:1657
-#, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "���� %s DB�ե����� %s �򸫤Ĥ����ޤ���\n"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-msgid " may not be installed.\n"
-msgstr "�ϥ��󥹥ȡ��뤵��ޤ���\n"
-
-#: ../utils.c:1839
-msgid "Error reading file"
-msgstr "�ե�������ɤ߹��ߥ��顼"
-
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC��ID��0�Ǥ���\n"
-
-#: ../utils.c:2517
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "������ %lu �Ȥ��� PC ID ���������ޤ���\n"
-
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "����ɽ��"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "�������ȥ�ꥢ�ɥ�"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "�������ȥꥢ"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "�٥륮��"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "�֥饸��"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "���ʥ��ɥ�"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "�ǥ�ޡ���"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "�桼��"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "�ե������"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "�ե��"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "�ɥ��ĥޥ륯"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "����ɥ�"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "����������"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "��ԡ�"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "��ԥ�"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "���������"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "�����ꥢ���"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "���ܱ�"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "������"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "�륯����֥륰"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "��󥮥å�"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "�ᥭ����"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "�������"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "�˥塼�������ɥɥ�"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "�Υ륦����"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "��̱��"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "�ե���ԥ󡦥ڥ�"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "���󥬥ݡݥ뎥�ɥ�"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "���ڥ���"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "�������ǥ�"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "�������ե��"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "�˥塼���ѥɥ�"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "����"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "�ݥ��"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "�ƥɥ�"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "��ʧ��Ģ"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "�Ҷ�����"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "ī��"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "�Х�"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "�ӥ��ͥ�����"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "��ư�֥�󥿥�"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "ͼ��"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "���󥿡��ƥ�����"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "�ե��å���"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "����"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "£��ʪ"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "�ۥƥ�"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "����"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "����"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "��ॸ��"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "�ɤ߹�����"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "�뿩"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "�ޥ��졼��"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "���"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "͹��"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "�ۻ�"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "�ϲ�Ŵ"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "������"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "��������"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "����"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "���å�"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "�̹���"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "�ż�"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
-msgstr "AMEX"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr "Expense: �����ʻٽХ����פǤ���\n"
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr "Expense: �����ʻ�ʧ�������פǤ���\n"
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "����ꥫ�󥨥����ץ쥹"
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "����"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "���ڼ�"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
-msgstr "���쥸�å�"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
+msgstr "���쥸�åȥ�����"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
 msgstr "�ޥ�����������"
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "�ץ�ڥ��ɥ�����"
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr "Expense: �����ʥ��ƥ���Ǥ���\n"
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr "Expense: �����ʻٽХ����פǤ���\n"
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr "Expense: �����ʻ�ʧ�������פǤ���\n"
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr "����ꥫ�󥨥����ץ쥹"
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "���쥸�åȥ�����"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "�����ס�"
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr "�ޥ�����������"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "��ס�"
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "���ƥ��ꡧ"
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "�����ס�"
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "��ʧ����"
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "�̲ߡ�"
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-msgid "Date:"
-msgstr "����"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "�"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "����"
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "ǯ��"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "��ס�"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "�٥������"
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "�Իԡ�"
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "��Լ�"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "KeyRing: pack_KeyRing(): buf_size �������᤮�ޤ���\n"
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "�ѥ���ɤ��㤤�ޤ����⤦��������Ƥ���������"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "������KeyRing�ѥ���ɤ�����"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "KeyRing�ѥ��������"
 
-#: ../KeyRing/keyring.c:1636
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "�Ķ��ѿ� HOME ��Ĺ�᤮(>1024)�ޤ���\n"
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "KeyRing: �ե����� %s �����դ���ޤ���\n"
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "KeyRing: Ʊ��������.\n"
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "KeyRing"
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "����󥻥�"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "���������"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "���Ģ %d �򥨥����ݡ��ȤǤ��ޤ���\n"
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -2999,49 +3685,256 @@ msgstr ""
 "KeyRing\n"
 "�ѥ���ɤ��ѹ�"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "����󥻥�"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "���������"
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "̾����"
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "��������ȡ�"
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "�ѥ���ɡ�"
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr "�ǽ�������: "
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "�ѥ��������"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "���Ģ��Ʊ��"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "��λ"
+
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "�ե�������񤭤��ޤ�����"
+
+#~ msgid "Field"
+#~ msgstr "�ե������"
+
+#~ msgid "kana("
+#~ msgstr "�ɤ�("
+
+#~ msgid "Quick View"
+#~ msgstr "����"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "�ե����� %s%s �򳫤��ޤ���\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "%s �Υ��顼��ե�����򳫤��ޤ���\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "���ƥ��� %s ���Խ��ϤǤ��ޤ���\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "���ƥ��� %s �����Ǥ��ޤ���\n"
+
+#~ msgid "category name"
+#~ msgstr "���ƥ���̾"
+
+#~ msgid "debug"
+#~ msgstr "�ǥХå�"
+
+#~ msgid "Close"
+#~ msgstr "�Ĥ���"
+
+#~ msgid "none"
+#~ msgstr "�ʤ�"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "DatebookDB ��������ʷ����֤������פ����Ĥ���ޤ�����\n"
+
+#~ msgid "W"
+#~ msgstr "��"
+
+#~ msgid "M"
+#~ msgstr "��"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "�������ʤ�"
+
+#~ msgid "Start Time"
+#~ msgstr "���ϻ���"
+
+#~ msgid "End Time"
+#~ msgstr "�����"
+
+#~ msgid "Dismiss"
+#~ msgstr "�"
+
+#~ msgid "Done"
+#~ msgstr "��λ"
+
+#~ msgid "Add"
+#~ msgstr "�ɲ�"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "�桼����̾"
+
+#~ msgid " -v = version\n"
+#~ msgstr "-v = ����������\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = �إ��\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = �ǥХå��⡼�ɤǼ¹Ԥ���\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = �ץ饰������ɤ߹��ޤʤ�\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr " -b = Ʊ����˥Хå����åפ��롢�����Ǥʤ����ñ��Ʊ���������롣\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "̵���� ����/�����������ꤵ��Ƥ��ޤ��� \"%s\"\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/�إ��(_H)/�ڥ��Хå� �ץ������"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "�ե�����������������"
+
+#~ msgid "Clear"
+#~ msgstr "�õ�"
+
+#~ msgid "Show private records"
+#~ msgstr "�ץ饤�١��ȥ쥳���ɤ�ɽ��"
+
+#~ msgid "Hide private records"
+#~ msgstr "�ץ饤�١��ȥ쥳���ɤ���"
+
+# jpilot.c: old version
+#~ msgid "Mask private records"
+#~ msgstr "�ץ饤�١��ȥ쥳���ɤΥޥ���"
+
+#~ msgid "Font"
+#~ msgstr "�ե����"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "��˥塼�� \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" �˰�ư���� \""
+
+#~ msgid "\"."
+#~ msgstr "\" ���ѹ����Ʋ�������."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "PC�Υ쥳���ɥե�����򳫤��ޤ���\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "���λϤޤ� "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "�ݡ���(/dev/ttyS0, /dev/pilot) "
+
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "���ꥢ����³��ž��®��(USB�ˤ�̵�ط�) "
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "���Ģ (memo32/pedit32) ��Ʊ��"
+
+#~ msgid "One record"
+#~ msgstr "1 �쥳����"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s: HotSync�ܥ���򲡤��� \"kill %d\" ��¹Ԥ��Ʋ�������\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "��λ\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "�Ǹ�Υ桼��̾��[%s]�Ǥ�\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "�Ǹ�Υ桼��ID��%d�Ǥ�.\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "�桼��̾��[%s]�Ǥ�\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "�桼��ID��%d�Ǥ�.\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: �쥳���ɿ� = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "disk: �쥳���ɿ� = %d\n"
+
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i ��ư����jpilot��Ǿ������롣\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s �ϥǥ��쥯�ȥ�Ǥ�̵���褦�Ǥ���\n"
+#~ "����ϥǥ��쥯�ȥ�Ǥʤ���Фʤ�ޤ���\n"
+
+#~ msgid "AmEx"
+#~ msgstr "AMEX"
+
+#~ msgid "CreditCard"
+#~ msgstr "���쥸�å�"
+
+#~ msgid "MasterCard"
+#~ msgstr "�ޥ�����������"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "Expense: �����ʥ��ƥ���Ǥ���\n"
+
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "�Ķ��ѿ� HOME ��Ĺ�᤮(>1024)�ޤ���\n"
diff --git a/po/jpilot.pot b/po/jpilot.pot
index b87fe9dc..3e503886 100644
--- a/po/jpilot.pot
+++ b/po/jpilot.pot
@@ -8,83 +8,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2011-04-11 22:35-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../address.c:276 ../address.c:448 ../alarms.c:332 ../calendar.c:309
-#: ../calendar.c:547 ../contact.c:324 ../contact.c:738 ../dat.c:189
-#: ../dat.c:655 ../dat.c:859 ../dat.c:993 ../dat.c:1132 ../datebook.c:130
-#: ../datebook.c:165 ../datebook.c:172 ../datebook.c:231 ../jpilot.c:1254
-#: ../jpilot-merge.c:95 ../libplugin.c:208 ../libplugin.c:455
-#: ../libplugin.c:534 ../libplugin.c:563 ../libplugin.c:811 ../memo.c:214
-#: ../memo.c:287 ../otherconv.c:280 ../plugins.c:112 ../prefs.c:350
-#: ../prefs.c:375 ../prefs.c:906 ../sync.c:2170 ../sync.c:2187 ../sync.c:2296
-#: ../sync.c:2310 ../sync.c:2507 ../sync.c:2646 ../todo.c:236 ../todo.c:490
-#: ../utils.c:748
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
 #, c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../address.c:332 ../calendar.c:230 ../contact.c:580 ../datebook.c:494
-#: ../memo.c:87 ../todo.c:90
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
 #, c-format
 msgid "%s:%d Error reading application info %s\n"
 msgstr ""
 
-#: ../address.c:344 ../address_gui.c:2279 ../address_gui.c:2318
-#: ../calendar.c:246 ../contact.c:596 ../datebook.c:514 ../datebook_gui.c:3737
-#: ../libplugin.c:405 ../libplugin.c:431 ../memo.c:99 ../memo_gui.c:839
-#: ../todo_gui.c:1070 ../Expense/expense.c:1105
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr ""
 
-#: ../address.c:492 ../calendar.c:598 ../calendar.c:607 ../contact.c:780
-#: ../libplugin.c:846 ../memo.c:353 ../todo.c:302 ../utils.c:1124
-#: ../utils.c:1131 ../utils.c:1138 ../utils.c:1145 ../utils.c:1152
-#: ../utils.c:1159
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
 msgid "error"
 msgstr ""
 
-#: ../address_gui.c:325 ../datebook_gui.c:2844 ../memo_gui.c:176
-#: ../todo_gui.c:292 ../KeyRing/keyring.c:834
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
 msgstr ""
 
-#: ../address_gui.c:452 ../address_gui.c:458 ../address_gui.c:469
-#: ../address_gui.c:481 ../address_gui.c:493 ../address_gui.c:506
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
 #, c-format
 msgid "%s%s: %s"
 msgstr ""
 
-#: ../address_gui.c:542 ../category.c:118 ../category.c:176 ../category.c:330
-#: ../category.c:336 ../datebook_gui.c:430 ../jpilot-merge.c:88
-#: ../jpilot-merge.c:146 ../jpilot-merge.c:151 ../memo_gui.c:280
-#: ../sync.c:2129 ../sync.c:2135 ../sync.c:2481 ../sync.c:2842
-#: ../todo_gui.c:416 ../utils.c:2674 ../utils.c:2711 ../utils.c:2717
-#: ../utils.c:2776 ../utils.c:2782 ../utils.c:2836 ../utils.c:2890
-#: ../utils.c:2896 ../utils.c:2954 ../utils.c:2961
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr ""
 
+#: ../address_gui.c:559
+#, c-format
+msgid "Unable to read file: %s\n"
+msgstr ""
+
 #: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr ""
 
 #: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
-#: ../memo_gui.c:417 ../todo_gui.c:542 ../Expense/expense.c:1384
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr ""
 
-#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:470
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
 #: ../todo_gui.c:595
 msgid "CSV (Comma Separated Values)"
 msgstr ""
@@ -96,52 +102,52 @@ msgstr ""
 #. current category name
 #. previous category name
 #. entry text, in Pilot character set
-#: ../address_gui.c:866 ../category.c:408 ../datebook_gui.c:729
-#: ../jpilot.c:234 ../jpilot.c:278 ../jpilot.c:352 ../jpilot.c:396
-#: ../jpilot.c:953 ../memo_gui.c:506 ../todo_gui.c:635 ../utils.c:1305
-#: ../KeyRing/keyring.c:2090
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr ""
 
-#: ../address_gui.c:867 ../address_gui.c:1008 ../datebook_gui.c:362
-#: ../datebook_gui.c:390 ../datebook_gui.c:730 ../memo_gui.c:507
-#: ../memo_gui.c:610 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
-#: ../utils.c:1322 ../utils.c:1346 ../KeyRing/keyring.c:2091
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr ""
 
-#: ../address_gui.c:867 ../address_gui.c:1008 ../datebook_gui.c:362
-#: ../datebook_gui.c:390 ../datebook_gui.c:730 ../memo_gui.c:507
-#: ../memo_gui.c:610 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
-#: ../utils.c:1322 ../utils.c:1346 ../KeyRing/keyring.c:2091
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr ""
 
-#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:520
-#: ../todo_gui.c:655 ../KeyRing/keyring.c:2104
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr ""
 
 #: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
-#: ../datebook_gui.c:772 ../memo_gui.c:522 ../memo_gui.c:539 ../todo_gui.c:657
-#: ../todo_gui.c:674 ../KeyRing/keyring.c:2106 ../KeyRing/keyring.c:2123
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr ""
 
-#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:526
-#: ../todo_gui.c:661 ../KeyRing/keyring.c:2110
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr ""
 
-#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:528
-#: ../todo_gui.c:663 ../KeyRing/keyring.c:2112
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr ""
 
-#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:537
-#: ../todo_gui.c:672 ../KeyRing/keyring.c:2121
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr ""
@@ -160,222 +166,235 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../address_gui.c:986
+#: ../address_gui.c:998
 msgid ""
 "Host character encoding is not UTF-8 based.\n"
 " Exported ldif file may not be standards-compliant\n"
 msgstr ""
 
-#: ../address_gui.c:999
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr ""
 
-#: ../address_gui.c:1005 ../memo_gui.c:607 ../todo_gui.c:760
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
 #, c-format
 msgid "Category: %s\n"
 msgstr ""
 
-#: ../address_gui.c:1007 ../memo_gui.c:609 ../todo_gui.c:763
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
 #, c-format
 msgid "Private: %s\n"
 msgstr ""
 
-#: ../address_gui.c:1015 ../address_gui.c:1029 ../address_gui.c:1033
-#: ../address_gui.c:1042 ../address_gui.c:1045
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: ../address_gui.c:1019
+#: ../address_gui.c:1031
 #, c-format
 msgid "%s\n"
 msgstr ""
 
 #. E-mail should be the Palm dropdown menu item for email
 #. Set dial/email button text and callback data
-#: ../address_gui.c:1193 ../address_gui.c:2838 ../address_gui.c:4177
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
 msgid "E-mail"
 msgstr ""
 
-#: ../address_gui.c:1479 ../datebook_gui.c:1147 ../memo_gui.c:617
-#: ../todo_gui.c:844 ../KeyRing/keyring.c:2179
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr ""
 
-#: ../address_gui.c:1505 ../datebook_gui.c:1226 ../memo_gui.c:469
-#: ../memo_gui.c:643 ../todo_gui.c:870 ../KeyRing/keyring.c:2194
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
 msgid "Text"
 msgstr ""
 
-#: ../address_gui.c:1506 ../datebook_gui.c:1227 ../memo_gui.c:644
-#: ../todo_gui.c:871 ../KeyRing/keyring.c:2194
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
 msgid "CSV"
 msgstr ""
 
-#: ../address_gui.c:1507
+#: ../address_gui.c:1562
 msgid "vCard"
 msgstr ""
 
-#: ../address_gui.c:1508
-msgid "vCard (Optimized for GMail/Android Import)"
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
 msgstr ""
 
-#: ../address_gui.c:1509
+#: ../address_gui.c:1564
 msgid "ldif"
 msgstr ""
 
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
 #. Initialize variable if default case taken
-#: ../address_gui.c:1774 ../address_gui.c:3894
+#: ../address_gui.c:1831 ../address_gui.c:3953
 msgid "Last Name/Company"
 msgstr ""
 
-#: ../address_gui.c:1777 ../address_gui.c:3897
+#: ../address_gui.c:1834 ../address_gui.c:3956
 msgid "First Name/Company"
 msgstr ""
 
-#: ../address_gui.c:1780 ../address_gui.c:3900
+#: ../address_gui.c:1837 ../address_gui.c:3959
 msgid "Company/Last Name"
 msgstr ""
 
-#: ../address_gui.c:1917 ../datebook_gui.c:2907 ../memo_gui.c:1012
-#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1181
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr ""
 
 #. Illegal category, Assume that category 0 is Unfiled and valid
-#: ../address_gui.c:2116 ../address_gui.c:2364 ../address_gui.c:2795
-#: ../address_gui.c:2801 ../address_gui.c:3593 ../datebook_gui.c:1994
-#: ../datebook_gui.c:3434 ../datebook_gui.c:3783 ../datebook_gui.c:4074
-#: ../memo_gui.c:876 ../memo_gui.c:922 ../memo_gui.c:1137 ../memo_gui.c:1524
-#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2141
-#: ../Expense/expense.c:689 ../Expense/expense.c:1143
-#: ../Expense/expense.c:1227 ../Expense/expense.c:1887
-#: ../KeyRing/keyring.c:1070 ../KeyRing/keyring.c:1512
-#: ../KeyRing/keyring.c:1574 ../KeyRing/keyring.c:2653
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr ""
 
-#: ../address_gui.c:2176 ../alarms.c:598 ../dialer.c:164
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr ""
 
-#: ../address_gui.c:2419
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
 msgid "Birthday"
 msgstr ""
 
-#: ../address_gui.c:2515
+#: ../address_gui.c:2575
 msgid "External program not found, or other error"
 msgstr ""
 
-#: ../address_gui.c:2517
+#: ../address_gui.c:2577
 msgid ""
 "J-Pilot can not find the external program \"convert\"\n"
 "or an error occurred while executing convert.\n"
 "You may need to install package ImageMagick"
 msgstr ""
 
-#: ../address_gui.c:2518
+#: ../address_gui.c:2578
 #, c-format
 msgid "Command executed was \"%s\"\n"
 msgstr ""
 
-#: ../address_gui.c:2519
+#: ../address_gui.c:2579
 #, c-format
 msgid "return code was %d\n"
 msgstr ""
 
-#: ../address_gui.c:2598
+#: ../address_gui.c:2657
+msgid "chdir() failed\n"
+msgstr ""
+
+#: ../address_gui.c:2660
 msgid "Add Photo"
 msgstr ""
 
 #. Category menu
-#: ../address_gui.c:2820 ../KeyRing/keyring.c:2550
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr ""
 
-#: ../address_gui.c:2840 ../address_gui.c:4178
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr ""
 
 #. Dial Phone Button
-#: ../address_gui.c:2843 ../address_gui.c:4181 ../dialer.c:307 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr ""
 
-#: ../address_gui.c:3033 ../datebook_gui.c:2757 ../memo_gui.c:1204
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
 #: ../todo_gui.c:1697
 msgid "Could not get temporary file name\n"
 msgstr ""
 
-#: ../address_gui.c:3041 ../datebook_gui.c:2765 ../memo_gui.c:1212
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
 #: ../todo_gui.c:1705
 msgid "Could not open temporary file for external editor\n"
 msgstr ""
 
-#: ../address_gui.c:3081 ../datebook_gui.c:2806 ../memo_gui.c:1253
-#: ../todo_gui.c:1746
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
 msgid "Could not open temporary file from external editor\n"
 msgstr ""
 
-#: ../address_gui.c:3253 ../address_gui.c:3284
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr ""
 
-#: ../address_gui.c:3366 ../memo_gui.c:1430 ../todo_gui.c:2019
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr ""
 
-#: ../address_gui.c:3369 ../datebook_gui.c:2637 ../memo_gui.c:1433
-#: ../todo_gui.c:2022
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr ""
 
-#: ../address_gui.c:3764 ../address_gui.c:3772 ../KeyRing/keyring.c:2463
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
 msgid "Name"
 msgstr ""
 
-#: ../address_gui.c:3765 ../address_gui.c:3766 ../address_gui.c:3767
-#: ../address_gui.c:3773
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
 msgid "Address"
 msgstr ""
 
-#: ../address_gui.c:3768 ../address_gui.c:3774 ../Expense/expense.c:584
-#: ../Expense/expense.c:1405
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
 msgid "Other"
 msgstr ""
 
 #. Note textbox
-#: ../address_gui.c:3769 ../address_gui.c:3775 ../todo_gui.c:2484
-#: ../Expense/expense.c:1836 ../KeyRing/keyring.c:2597
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
 msgid "Note"
 msgstr ""
 
-#: ../address_gui.c:3785
+#: ../address_gui.c:3844
 msgid "Reverting to Address database\n"
 msgstr ""
 
-#: ../address_gui.c:3906
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr ""
 
-#: ../address_gui.c:3938
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr ""
 
 #. Cancel button
 #. Add record modification buttons
 #. Cancel button
-#: ../address_gui.c:3956 ../category.c:409 ../datebook_gui.c:1782
-#: ../datebook_gui.c:5124 ../memo_gui.c:1668 ../todo_gui.c:2345
-#: ../utils.c:1346 ../KeyRing/keyring.c:2493
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr ""
 
-#: ../address_gui.c:3956 ../datebook_gui.c:5124 ../memo_gui.c:1668
-#: ../todo_gui.c:2345 ../KeyRing/keyring.c:2493
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr ""
 
@@ -385,14 +404,14 @@ msgstr ""
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:3961 ../category.c:409 ../category.c:852
-#: ../datebook_gui.c:5129 ../memo_gui.c:1673 ../todo_gui.c:2350
-#: ../Expense/expense.c:1663 ../KeyRing/keyring.c:2498
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr ""
 
-#: ../address_gui.c:3961 ../datebook_gui.c:5129 ../memo_gui.c:1673
-#: ../todo_gui.c:2350 ../Expense/expense.c:1663 ../KeyRing/keyring.c:2498
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr ""
 
@@ -400,131 +419,131 @@ msgstr ""
 #. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:3967 ../datebook_gui.c:5135 ../memo_gui.c:1679
-#: ../todo_gui.c:2356 ../KeyRing/keyring.c:2504
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr ""
 
-#: ../address_gui.c:3967 ../datebook_gui.c:5135 ../memo_gui.c:1679
-#: ../todo_gui.c:2356 ../KeyRing/keyring.c:2504
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr ""
 
 #. Copy button
-#: ../address_gui.c:3973 ../datebook_gui.c:5141 ../memo_gui.c:1685
-#: ../todo_gui.c:2362 ../Expense/expense.c:1668 ../KeyRing/keyring.c:2510
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr ""
 
-#: ../address_gui.c:3973 ../datebook_gui.c:5141 ../memo_gui.c:1685
-#: ../todo_gui.c:2362 ../Expense/expense.c:1668 ../KeyRing/keyring.c:2510
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr ""
 
 #. New button
 #. New Record button
-#: ../address_gui.c:3979 ../datebook_gui.c:5147 ../memo_gui.c:1691
-#: ../todo_gui.c:2368 ../Expense/expense.c:1673 ../KeyRing/keyring.c:2516
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr ""
 
-#: ../address_gui.c:3979 ../datebook_gui.c:5147 ../memo_gui.c:1691
-#: ../todo_gui.c:2368 ../Expense/expense.c:1673 ../KeyRing/keyring.c:2516
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr ""
 
 #. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:3984 ../datebook_gui.c:5153 ../memo_gui.c:1697
-#: ../todo_gui.c:2374 ../Expense/expense.c:1678 ../KeyRing/keyring.c:2522
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr ""
 
-#: ../address_gui.c:3984 ../datebook_gui.c:5153 ../memo_gui.c:1697
-#: ../todo_gui.c:2374 ../Expense/expense.c:1678 ../KeyRing/keyring.c:2522
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr ""
 
 #. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:3994 ../datebook_gui.c:5163 ../memo_gui.c:1707
-#: ../todo_gui.c:2384 ../Expense/expense.c:1687 ../KeyRing/keyring.c:2531
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr ""
 
-#: ../address_gui.c:3994 ../datebook_gui.c:5163 ../memo_gui.c:1707
-#: ../todo_gui.c:2384 ../Expense/expense.c:1687 ../KeyRing/keyring.c:2531
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr ""
 
 #. Private check box
 #. Private checkbox
-#: ../address_gui.c:4025 ../datebook_gui.c:5191 ../datebook_gui.c:5233
-#: ../memo_gui.c:1723 ../todo_gui.c:2410
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr ""
 
-#: ../address_gui.c:4110
+#: ../address_gui.c:4169
 msgid "Change Photo"
 msgstr ""
 
-#: ../address_gui.c:4115
+#: ../address_gui.c:4174
 msgid "Remove Photo"
 msgstr ""
 
-#: ../address_gui.c:4187
+#: ../address_gui.c:4246
 msgid "Show In List"
 msgstr ""
 
-#: ../address_gui.c:4288
+#: ../address_gui.c:4347
 msgid "Reminder"
 msgstr ""
 
-#: ../address_gui.c:4304 ../datebook_gui.c:238 ../datebook_gui.c:5221
-#: ../datebook_gui.c:5378
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
 msgid "Days"
 msgstr ""
 
 #. The Quickview (ALL) page
 #. All button
-#: ../address_gui.c:4348 ../datebook_gui.c:1478 ../datebook_gui.c:1782
-#: ../utils.c:2528
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
 msgid "All"
 msgstr ""
 
-#: ../alarms.c:232 ../datebook_gui.c:236 ../datebook_gui.c:5215
-#: ../datebook_gui.c:5372
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr ""
 
-#: ../alarms.c:234 ../datebook_gui.c:237 ../datebook_gui.c:5219
-#: ../datebook_gui.c:5376
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr ""
 
-#: ../alarms.c:255
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr ""
 
-#: ../alarms.c:425 ../alarms.c:991 ../sync.c:1639 ../sync.c:1645
-#: ../utils.c:3717
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
 msgid "Unable to open file: %s%s\n"
 msgstr ""
 
-#: ../alarms.c:512
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr ""
 
-#: ../alarms.c:515
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr ""
 
-#: ../alarms.c:518
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr ""
 
-#: ../alarms.c:521 ../datebook_gui.c:5025
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr ""
 
@@ -532,256 +551,256 @@ msgstr ""
 msgid "J-Pilot Alarm"
 msgstr ""
 
-#: ../category.c:131 ../category.c:188 ../sync.c:2158 ../sync.c:2495
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr ""
 
-#: ../category.c:138 ../category.c:148 ../category.c:196 ../category.c:206
-#: ../category.c:216 ../sync.c:2280 ../sync.c:2334 ../sync.c:2371
-#: ../sync.c:2386 ../sync.c:2410 ../sync.c:2630 ../sync.c:2675 ../sync.c:2712
-#: ../sync.c:2725 ../sync.c:2750
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr ""
 
-#: ../category.c:364 ../utils.c:2738 ../utils.c:2812 ../utils.c:2916
-#: ../utils.c:2981
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
 msgid "rename failed"
 msgstr ""
 
-#: ../category.c:409
+#: ../category.c:407
 msgid "Move"
 msgstr ""
 
-#: ../category.c:438 ../category.c:500 ../category.c:580 ../category.c:769
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
 msgid "Edit Categories"
 msgstr ""
 
-#: ../category.c:439
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr ""
 
-#: ../category.c:442
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr ""
 
-#: ../category.c:453 ../category.c:477
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr ""
 
-#: ../category.c:454
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr ""
 
-#: ../category.c:463
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr ""
 
-#: ../category.c:478
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr ""
 
-#: ../category.c:496
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
 msgstr ""
 
-#: ../category.c:556
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr ""
 
-#: ../category.c:578
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr ""
 
 #. Category names in host character set
-#: ../category.c:735
+#: ../category.c:733
 msgid "Category"
 msgstr ""
 
-#: ../category.c:836
+#: ../category.c:834
 msgid "New"
 msgstr ""
 
-#: ../category.c:843
+#: ../category.c:841
 msgid "Rename"
 msgstr ""
 
-#: ../dat.c:456
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr ""
 
-#: ../dat.c:537
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:551
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:559
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr ""
 
-#: ../dat.c:560
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr ""
 
-#: ../dat.c:564
+#: ../dat.c:640
 msgid "It should be:"
 msgstr ""
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:876 ../dat.c:889 ../dat.c:1012
-#: ../dat.c:1025 ../dat.c:1149 ../dat.c:1162
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:877 ../dat.c:890 ../dat.c:994
-#: ../dat.c:1013 ../dat.c:1026 ../dat.c:1150 ../dat.c:1163
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr ""
 
-#: ../datebook.c:705 ../datebook_gui.c:3648
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr ""
 
-#: ../datebook_gui.c:241
+#: ../datebook_gui.c:239
 msgid "Repeat Never"
 msgstr ""
 
-#: ../datebook_gui.c:242
+#: ../datebook_gui.c:240
 msgid "Repeat Daily"
 msgstr ""
 
-#: ../datebook_gui.c:243
+#: ../datebook_gui.c:241
 msgid "Repeat Weekly"
 msgstr ""
 
-#: ../datebook_gui.c:244
+#: ../datebook_gui.c:242
 msgid "Repeat MonthlyByDay"
 msgstr ""
 
-#: ../datebook_gui.c:245
+#: ../datebook_gui.c:243
 msgid "Repeat MonthlyByDate"
 msgstr ""
 
-#: ../datebook_gui.c:246
+#: ../datebook_gui.c:244
 msgid "Repeat YearlyDate"
 msgstr ""
 
-#: ../datebook_gui.c:247
+#: ../datebook_gui.c:245
 msgid "Repeat YearlyDay"
 msgstr ""
 
-#: ../datebook_gui.c:250 ../datebook_gui.c:257 ../datebook_gui.c:4803
-#: ../datebook_gui.c:4810
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr ""
 
-#: ../datebook_gui.c:251 ../datebook_gui.c:4804
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr ""
 
-#: ../datebook_gui.c:252 ../datebook_gui.c:4805
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr ""
 
-#: ../datebook_gui.c:253 ../datebook_gui.c:4806
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr ""
 
-#: ../datebook_gui.c:254 ../datebook_gui.c:4807
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr ""
 
-#: ../datebook_gui.c:255 ../datebook_gui.c:4808
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr ""
 
-#: ../datebook_gui.c:256 ../datebook_gui.c:4809
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr ""
 
-#: ../datebook_gui.c:269
+#: ../datebook_gui.c:267
 #, c-format
 msgid ""
 "Start Date: %s\n"
 "Time: Event"
 msgstr ""
 
-#: ../datebook_gui.c:277
+#: ../datebook_gui.c:275
 #, c-format
 msgid ""
 "Start Date: %s\n"
 "Time: %s to %s"
 msgstr ""
 
-#: ../datebook_gui.c:287 ../datebook_gui.c:297
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
 msgid "Unknown"
 msgstr ""
 
 #. End Date
-#: ../datebook_gui.c:300
+#: ../datebook_gui.c:298
 msgid "End Date: "
 msgstr ""
 
-#: ../datebook_gui.c:302
+#: ../datebook_gui.c:300
 msgid "Never"
 msgstr ""
 
-#: ../datebook_gui.c:308
+#: ../datebook_gui.c:306
 #, c-format
 msgid "Repeat Frequency: %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:316
+#: ../datebook_gui.c:314
 #, c-format
 msgid "Monthly Repeat Day %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:321 ../datebook_gui.c:5520
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
 msgid "Repeat on Days:"
 msgstr ""
 
-#: ../datebook_gui.c:332
+#: ../datebook_gui.c:330
 #, c-format
 msgid "Number of exceptions: %d"
 msgstr ""
 
-#: ../datebook_gui.c:338
+#: ../datebook_gui.c:336
 msgid ""
 "\n"
 "more..."
 msgstr ""
 
-#: ../datebook_gui.c:359 ../datebook_gui.c:386
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
 msgid "Description:"
 msgstr ""
 
-#: ../datebook_gui.c:360 ../datebook_gui.c:387
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
 msgid "Note:"
 msgstr ""
 
-#: ../datebook_gui.c:362 ../datebook_gui.c:390
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
 msgid "Alarm:"
 msgstr ""
 
-#: ../datebook_gui.c:363 ../datebook_gui.c:391
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
 msgid "Repeat Type:"
 msgstr ""
 
-#: ../datebook_gui.c:366 ../datebook_gui.c:394
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
 msgid "Start of Week:"
 msgstr ""
 
-#: ../datebook_gui.c:388 ../datebook_gui.c:5343
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
 msgid "Location:"
 msgstr ""
 
@@ -831,7 +850,7 @@ msgstr ""
 msgid "iCalendar"
 msgstr ""
 
-#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:429
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr ""
 
@@ -855,7 +874,7 @@ msgstr ""
 
 #. None button
 #. Labels for notebook tabs
-#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5449
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr ""
 
@@ -867,11 +886,11 @@ msgstr ""
 msgid "End On Date"
 msgstr ""
 
-#: ../datebook_gui.c:1751 ../prefs.c:451
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr ""
 
-#: ../datebook_gui.c:1752 ../prefs.c:452
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr ""
 
@@ -962,156 +981,156 @@ msgid ""
 msgstr ""
 
 #. This is a timeless event
-#: ../datebook_gui.c:2516 ../datebook_gui.c:5264
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr ""
 
-#: ../datebook_gui.c:2788 ../memo_gui.c:1235 ../todo_gui.c:1728
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
 msgid "External editor command too long to execute\n"
 msgstr ""
 
-#: ../datebook_gui.c:2943
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr ""
 
-#: ../datebook_gui.c:2944
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
 msgstr ""
 
 #. "No Date" check box
-#: ../datebook_gui.c:3339 ../datebook_gui.c:5482 ../datebook_gui.c:5513
-#: ../datebook_gui.c:5565 ../datebook_gui.c:5613 ../todo_gui.c:142
-#: ../todo_gui.c:2454
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr ""
 
-#: ../datebook_gui.c:3494
+#: ../datebook_gui.c:3491
 #, c-format
 msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:3681
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3686
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr ""
 
 #. Weekview button
-#: ../datebook_gui.c:4934 ../datebook_gui.c:5451
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr ""
 
-#: ../datebook_gui.c:4943
+#: ../datebook_gui.c:4940
 msgid "View appointments by week   Ctrl+W"
 msgstr ""
 
 #. Monthview button
-#: ../datebook_gui.c:4946 ../datebook_gui.c:5452
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr ""
 
-#: ../datebook_gui.c:4955
+#: ../datebook_gui.c:4952
 msgid "View appointments by month   Ctrl+M"
 msgstr ""
 
 #. Make Category button
-#: ../datebook_gui.c:4960
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr ""
 
-#: ../datebook_gui.c:5024
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr ""
 
 #. "Show ToDos" button
-#: ../datebook_gui.c:5067
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr ""
 
-#: ../datebook_gui.c:5081 ../todo_gui.c:2285
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr ""
 
-#: ../datebook_gui.c:5082 ../todo_gui.c:2286
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr ""
 
-#: ../datebook_gui.c:5201 ../datebook_gui.c:5358
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr ""
 
 #. Date Spinners
-#: ../datebook_gui.c:5241 ../Expense/expense.c:1736
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
 msgid "Date:"
 msgstr ""
 
 #. Start date and time
-#: ../datebook_gui.c:5283
+#: ../datebook_gui.c:5280
 msgid "Start"
 msgstr ""
 
 #. End date and time
-#: ../datebook_gui.c:5300
+#: ../datebook_gui.c:5297
 msgid "End"
 msgstr ""
 
-#: ../datebook_gui.c:5433
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr ""
 
-#: ../datebook_gui.c:5450
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr ""
 
-#: ../datebook_gui.c:5453
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr ""
 
 #. "No Repeat" page for notebook
-#: ../datebook_gui.c:5456
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr ""
 
-#: ../datebook_gui.c:5465 ../datebook_gui.c:5498 ../datebook_gui.c:5550
-#: ../datebook_gui.c:5596
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr ""
 
-#: ../datebook_gui.c:5471
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr ""
 
-#: ../datebook_gui.c:5474 ../datebook_gui.c:5507 ../datebook_gui.c:5559
-#: ../datebook_gui.c:5605
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr ""
 
-#: ../datebook_gui.c:5504
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr ""
 
-#: ../datebook_gui.c:5556
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr ""
 
-#: ../datebook_gui.c:5573
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr ""
 
-#: ../datebook_gui.c:5577
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr ""
 
-#: ../datebook_gui.c:5586 ../Expense/expense.c:1618
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr ""
 
-#: ../datebook_gui.c:5602
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr ""
 
@@ -1158,7 +1177,7 @@ msgstr ""
 
 #. Import button
 #: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
-#: ../import_gui.c:471 ../jpilot.c:385
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr ""
 
@@ -1192,7 +1211,7 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: ../import_gui.c:457 ../install_gui.c:429
+#: ../import_gui.c:457 ../install_gui.c:427
 msgid "To change to a hidden directory type it below and hit TAB"
 msgstr ""
 
@@ -1200,68 +1219,68 @@ msgstr ""
 msgid "Import File Type"
 msgstr ""
 
-#: ../install_gui.c:366
+#: ../install_gui.c:364
 msgid "Files to install"
 msgstr ""
 
-#: ../install_gui.c:374
+#: ../install_gui.c:372
 msgid "Install"
 msgstr ""
 
-#: ../install_user.c:118 ../install_user.c:220
+#: ../install_user.c:116 ../install_user.c:218
 msgid "Install User"
 msgstr ""
 
-#: ../install_user.c:139
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:146
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
 #. Instruction label
-#: ../install_user.c:168
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:176 ../restore_gui.c:278
+#: ../install_user.c:174 ../restore_gui.c:276
 msgid "User Name"
 msgstr ""
 
-#: ../install_user.c:186
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:297
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr ""
 
-#: ../jpilot.c:319
+#: ../jpilot.c:317
 msgid "Print"
 msgstr ""
 
-#: ../jpilot.c:320
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr ""
 
-#: ../jpilot.c:386
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr ""
 
-#: ../jpilot.c:430
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr ""
 
-#: ../jpilot.c:659
+#: ../jpilot.c:657
 msgid " Cancelling HotSync\n"
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:675
+#: ../jpilot.c:673
 msgid ""
 "This handheld does not have the same user name or user ID\n"
 "as the one that was synced the last time.\n"
@@ -1271,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:682
+#: ../jpilot.c:680
 msgid ""
 "This handheld has a NULL user ID.\n"
 "Every handheld must have a unique user ID in order to sync properly.\n"
@@ -1283,19 +1302,19 @@ msgid ""
 "Read the user manual if you are uncertain."
 msgstr ""
 
-#: ../jpilot.c:690
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr ""
 
-#: ../jpilot.c:690
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr ""
 
-#: ../jpilot.c:699 ../jpilot.c:703
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr ""
 
-#: ../jpilot.c:932 ../jpilot.c:1785
+#: ../jpilot.c:932 ../jpilot.c:1787
 msgid " User: "
 msgstr ""
 
@@ -1303,234 +1322,234 @@ msgstr ""
 msgid "Unknown command from sync process\n"
 msgstr ""
 
-#: ../jpilot.c:963 ../Expense/expense.c:529 ../KeyRing/keyring.c:1872
-#: ../SyncTime/synctime.c:61
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: ../jpilot.c:1105
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr ""
 
-#: ../jpilot.c:1106
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr ""
 
-#: ../jpilot.c:1107
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr ""
 
-#: ../jpilot.c:1108 ../jpilot.c:1114 ../jpilot.c:1117
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr ""
 
-#: ../jpilot.c:1109
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr ""
 
-#: ../jpilot.c:1110
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr ""
 
-#: ../jpilot.c:1111
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr ""
 
-#: ../jpilot.c:1112 ../jpilot.c:2190
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr ""
 
-#: ../jpilot.c:1113
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr ""
 
-#: ../jpilot.c:1115
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr ""
 
-#: ../jpilot.c:1116
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr ""
 
-#: ../jpilot.c:1118
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr ""
 
-#: ../jpilot.c:1119
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr ""
 
-#: ../jpilot.c:1120 ../jpilot.c:1121 ../jpilot.c:1122 ../jpilot.c:1368
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr ""
 
-#: ../jpilot.c:1121 ../jpilot.c:1371
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr ""
 
-#: ../jpilot.c:1122 ../jpilot.c:1374
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr ""
 
-#: ../jpilot.c:1123
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr ""
 
-#: ../jpilot.c:1124
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr ""
 
-#: ../jpilot.c:1125
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr ""
 
-#: ../jpilot.c:1126
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr ""
 
-#: ../jpilot.c:1127
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr ""
 
-#: ../jpilot.c:1128 ../jpilot.c:1259
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr ""
 
-#: ../jpilot.c:1130
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr ""
 
 #. web
-#: ../jpilot.c:1131
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr ""
 
-#: ../jpilot.c:1135
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr ""
 
-#: ../jpilot.c:1140
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr ""
 
-#: ../jpilot.c:1145
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr ""
 
-#: ../jpilot.c:1149
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr ""
 
-#: ../jpilot.c:1151
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr ""
 
-#: ../jpilot.c:1153
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr ""
 
-#: ../jpilot.c:1155
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr ""
 
-#: ../jpilot.c:1157
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr ""
 
-#: ../jpilot.c:1160
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr ""
 
-#: ../jpilot.c:1161
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr ""
 
-#: ../jpilot.c:1227
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr ""
 
-#: ../jpilot.c:1237
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr ""
 
-#: ../jpilot.c:1591
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:1634 ../jpilot-sync.c:171
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr ""
 
-#: ../jpilot.c:1638
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:1642
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:1730 ../jpilot.c:1738
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr ""
 
-#: ../jpilot.c:1947
+#: ../jpilot.c:1949
 msgid "Show private records   Ctrl+Z"
 msgstr ""
 
-#: ../jpilot.c:1952
+#: ../jpilot.c:1954
 msgid "Hide private records   Ctrl+Z"
 msgstr ""
 
-#: ../jpilot.c:1957
+#: ../jpilot.c:1959
 msgid "Mask private records   Ctrl+Z"
 msgstr ""
 
-#: ../jpilot.c:1969
+#: ../jpilot.c:1971
 msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr ""
 
-#: ../jpilot.c:1981
+#: ../jpilot.c:1983
 msgid "Stop Sync process"
 msgstr ""
 
-#: ../jpilot.c:1993
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
 msgstr ""
 
-#: ../jpilot.c:2141
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr ""
 
-#: ../jpilot.c:2142
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr ""
 
-#: ../jpilot.c:2143
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr ""
 
-#: ../jpilot.c:2144
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr ""
 
-#: ../jpilot.c:2172
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr ""
 
-#: ../jpilot.c:2172
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr ""
 
-#: ../jpilot.c:2172
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr ""
 
-#: ../jpilot.c:2185
+#: ../jpilot.c:2187
 #, c-format
 msgid ""
 "J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
@@ -1542,362 +1561,362 @@ msgid ""
 msgstr ""
 
 #. Character Set
-#: ../jpilot.c:2190 ../prefs_gui.c:511
+#: ../jpilot.c:2192 ../prefs_gui.c:509
 msgid "Character Set"
 msgstr ""
 
-#: ../jpilot.c:2192
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr ""
 
-#: ../jpilot-dump.c:94
+#: ../jpilot-dump.c:92
 #, c-format
 msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
 
-#: ../jpilot-dump.c:95
+#: ../jpilot-dump.c:93
 #, c-format
 msgid " -v display version and exit\n"
 msgstr ""
 
-#: ../jpilot-dump.c:96 ../jpilot-sync.c:68 ../utils.c:1874
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
 #, c-format
 msgid " -h display help text\n"
 msgstr ""
 
-#: ../jpilot-dump.c:97
+#: ../jpilot-dump.c:95
 #, c-format
 msgid " -f display help for format codes\n"
 msgstr ""
 
-#: ../jpilot-dump.c:98
+#: ../jpilot-dump.c:96
 #, c-format
 msgid " -D dump DateBook\n"
 msgstr ""
 
-#: ../jpilot-dump.c:99
+#: ../jpilot-dump.c:97
 #, c-format
 msgid " -i dump DateBook in iCalendar format\n"
 msgstr ""
 
-#: ../jpilot-dump.c:100
+#: ../jpilot-dump.c:98
 #, c-format
 msgid " -N dump appts for today in DateBook\n"
 msgstr ""
 
-#: ../jpilot-dump.c:101
+#: ../jpilot-dump.c:99
 #, c-format
 msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr ""
 
-#: ../jpilot-dump.c:102
+#: ../jpilot-dump.c:100
 #, c-format
 msgid " -A dump Address book\n"
 msgstr ""
 
-#: ../jpilot-dump.c:103
+#: ../jpilot-dump.c:101
 #, c-format
 msgid " -T dump ToDo list as CSV\n"
 msgstr ""
 
-#: ../jpilot-dump.c:104
+#: ../jpilot-dump.c:102
 #, c-format
 msgid " -M dump Memos\n"
 msgstr ""
 
-#: ../jpilot-dump.c:165
+#: ../jpilot-dump.c:163
 #, c-format
 msgid ""
 "Warning: Host character encoding is not UTF-8 based.\n"
 "Exported ical file may not be standards-compliant\n"
 msgstr ""
 
-#: ../jpilot-merge.c:163 ../jpilot-merge.c:169
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
 #, c-format
 msgid "%s: Unable to open file:%s\n"
 msgstr ""
 
-#: ../jpilot-merge.c:271
+#: ../jpilot-merge.c:269
 #, c-format
 msgid "Records read from pdb = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:272
+#: ../jpilot-merge.c:270
 #, c-format
 msgid "Records added         = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:273
+#: ../jpilot-merge.c:271
 #, c-format
 msgid "Records deleted       = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:274
+#: ../jpilot-merge.c:272
 #, c-format
 msgid "Records modified      = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:275
+#: ../jpilot-merge.c:273
 #, c-format
 msgid "Records written       = %d\n"
 msgstr ""
 
-#: ../jpilot-merge.c:293
+#: ../jpilot-merge.c:291
 #, c-format
 msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
 msgstr ""
 
-#: ../jpilot-merge.c:294
+#: ../jpilot-merge.c:292
 #, c-format
 msgid "  This program will merge an unsynced records file (pc3)\n"
 msgstr ""
 
-#: ../jpilot-merge.c:295
+#: ../jpilot-merge.c:293
 #, c-format
 msgid ""
 "  into the corresponding palm database (pdb) file.\n"
 "\n"
 msgstr ""
 
-#: ../jpilot-merge.c:296
+#: ../jpilot-merge.c:294
 #, c-format
 msgid "  WARNING: Only run this utility if you understand the consequences!\n"
 msgstr ""
 
-#: ../jpilot-merge.c:297
+#: ../jpilot-merge.c:295
 #, c-format
 msgid "  The merge will leave your databases in an unsync-able state.\n"
 msgstr ""
 
-#: ../jpilot-merge.c:298
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
 "  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
 
-#: ../jpilot-merge.c:299
+#: ../jpilot-merge.c:297
 #, c-format
 msgid "  and where no syncing occurs to physical hardware.\n"
 msgstr ""
 
-#: ../jpilot-merge.c:300
+#: ../jpilot-merge.c:298
 #, c-format
 msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
 msgstr ""
 
-#: ../jpilot-merge.c:301
+#: ../jpilot-merge.c:299
 #, c-format
 msgid ""
 "  It is quite simple to destroy your databases by accidentally merging\n"
 msgstr ""
 
-#: ../jpilot-merge.c:302
+#: ../jpilot-merge.c:300
 #, c-format
 msgid "  address records into datebook databases, etc.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:66
+#: ../jpilot-sync.c:64
 #, c-format
 msgid ""
 " J-Pilot preferences are read to get sync info such as port, rate, number of "
 "backups, etc.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:67 ../utils.c:1873
+#: ../jpilot-sync.c:65 ../utils.c:1871
 #, c-format
 msgid " -v display version and compile options\n"
 msgstr ""
 
-#: ../jpilot-sync.c:69 ../utils.c:1875
+#: ../jpilot-sync.c:67 ../utils.c:1873
 #, c-format
 msgid " -d display debug info to stdout\n"
 msgstr ""
 
-#: ../jpilot-sync.c:70
+#: ../jpilot-sync.c:68
 #, c-format
 msgid " -P skip loading plugins\n"
 msgstr ""
 
-#: ../jpilot-sync.c:71
+#: ../jpilot-sync.c:69
 #, c-format
 msgid " -b sync, and then do a backup\n"
 msgstr ""
 
-#: ../jpilot-sync.c:72
+#: ../jpilot-sync.c:70
 #, c-format
 msgid " -l loop, otherwise sync once and exit\n"
 msgstr ""
 
-#: ../jpilot-sync.c:73
+#: ../jpilot-sync.c:71
 #, c-format
 msgid " -p {port} use this port to sync on instead of default\n"
 msgstr ""
 
-#: ../jpilot-sync.c:221
+#: ../jpilot-sync.c:219
 #, c-format
 msgid "Error: connecting to port %s\n"
 msgstr ""
 
-#: ../jpilot-sync.c:225
+#: ../jpilot-sync.c:223
 #, c-format
 msgid "Error: pi_listen\n"
 msgstr ""
 
-#: ../jpilot-sync.c:229
+#: ../jpilot-sync.c:227
 #, c-format
 msgid "Error: opening conduit to handheld\n"
 msgstr ""
 
-#: ../jpilot-sync.c:233
+#: ../jpilot-sync.c:231
 #, c-format
 msgid "Error: pi_accept\n"
 msgstr ""
 
-#: ../jpilot-sync.c:237 ../jpilot-sync.c:265
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
 #, c-format
 msgid "Error: "
 msgstr ""
 
-#: ../jpilot-sync.c:238
+#: ../jpilot-sync.c:236
 #, c-format
 msgid "This handheld does not have the same user name.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:239 ../jpilot-sync.c:253
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
 #, c-format
 msgid "as the one that was synced the last time.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:241
+#: ../jpilot-sync.c:239
 #, c-format
 msgid ""
 "Syncing with different handhelds to the same directory can destroy data.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
 #, c-format
 msgid " COPILOT_HOME"
 msgstr ""
 
-#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
 #, c-format
 msgid " JPILOT_HOME"
 msgstr ""
 
-#: ../jpilot-sync.c:247 ../jpilot-sync.c:260
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
 #, c-format
 msgid " environment variable can be used to sync different handhelds,\n"
 msgstr ""
 
-#: ../jpilot-sync.c:248 ../jpilot-sync.c:261
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
 #, c-format
 msgid " to different directories for the same UNIX user name.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:252
+#: ../jpilot-sync.c:250
 #, c-format
 msgid "This handheld does not have the same user ID.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:254
+#: ../jpilot-sync.c:252
 #, c-format
 msgid ""
 " Syncing with different handhelds to the same directory can destroy data.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:266
+#: ../jpilot-sync.c:264
 #, c-format
 msgid "This handheld has a NULL user ID.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:267
+#: ../jpilot-sync.c:265
 #, c-format
 msgid "Every handheld must have a unique user ID in order to sync properly.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:268
+#: ../jpilot-sync.c:266
 #, c-format
 msgid "If the handheld has been hard reset, \n"
 msgstr ""
 
-#: ../jpilot-sync.c:269
+#: ../jpilot-sync.c:267
 #, c-format
 msgid "   use restore from within "
 msgstr ""
 
-#: ../jpilot-sync.c:270
+#: ../jpilot-sync.c:268
 #, c-format
 msgid "Otherwise, to add a new user name and ID\n"
 msgstr ""
 
-#: ../jpilot-sync.c:271
+#: ../jpilot-sync.c:269
 #, c-format
 msgid "   use \"install-user %s name numeric_id\"\n"
 msgstr ""
 
-#: ../jpilot-sync.c:275
+#: ../jpilot-sync.c:273
 #, c-format
 msgid "Error: sync returned error %d\n"
 msgstr ""
 
-#: ../libplugin.c:64 ../utils.c:1054
+#: ../libplugin.c:62 ../utils.c:1052
 msgid ""
 "This record is already deleted.\n"
 "It is scheduled to be deleted from the Palm on the next sync.\n"
 msgstr ""
 
-#: ../libplugin.c:73 ../libplugin.c:110 ../utils.c:1064 ../utils.c:1106
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
 msgid "Unable to open PC records file\n"
 msgstr ""
 
-#: ../libplugin.c:79 ../utils.c:1071
+#: ../libplugin.c:77 ../utils.c:1069
 msgid "Couldn't find record to delete\n"
 msgstr ""
 
-#: ../libplugin.c:97 ../utils.c:1091
+#: ../libplugin.c:95 ../utils.c:1089
 #, c-format
 msgid "Unknown header version %d\n"
 msgstr ""
 
-#: ../libplugin.c:182
+#: ../libplugin.c:180
 #, c-format
 msgid "%s:%d Error opening file: %s\n"
 msgstr ""
 
-#: ../libplugin.c:188 ../libplugin.c:217 ../sync.c:1721 ../todo.c:102
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
 #, c-format
 msgid "%s:%d Error reading file: %s\n"
 msgstr ""
 
-#: ../libplugin.c:340 ../libplugin.c:398 ../utils.c:2119 ../utils.c:2132
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
 #, c-format
 msgid "Error opening file: %s\n"
 msgstr ""
 
-#: ../libplugin.c:526
+#: ../libplugin.c:524
 #, c-format
 msgid "Error reading %s 5\n"
 msgstr ""
 
-#: ../libplugin.c:801
+#: ../libplugin.c:799
 msgid "Error reading PC file 1\n"
 msgstr ""
 
-#: ../libplugin.c:817
+#: ../libplugin.c:815
 msgid "Error reading PC file 2\n"
 msgstr ""
 
-#: ../libplugin.c:923
+#: ../libplugin.c:921
 #, c-format
 msgid "Unknown PC header version = %d\n"
 msgstr ""
 
-#: ../log.c:101
+#: ../log.c:98
 #, c-format
 msgid "Unable to open log file, giving up.\n"
 msgstr ""
 
-#: ../log.c:111
+#: ../log.c:108
 #, c-format
 msgid "Unable to open log file\n"
 msgstr ""
@@ -1911,44 +1930,44 @@ msgstr ""
 msgid "Imported Memo %s\n"
 msgstr ""
 
-#: ../memo_gui.c:400
+#: ../memo_gui.c:402
 msgid "File doesn't appear to be memopad.dat format\n"
 msgstr ""
 
-#: ../memo_gui.c:471
+#: ../memo_gui.c:473
 msgid "DAT/MPA (Palm Archive Formats)"
 msgstr ""
 
-#: ../memo_gui.c:554
+#: ../memo_gui.c:558
 #, c-format
 msgid ""
 "Memo exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../memo_gui.c:557
+#: ../memo_gui.c:561
 #, c-format
 msgid ""
 "Memos exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../memo_gui.c:578
+#: ../memo_gui.c:597 ../memo_gui.c:679
 #, c-format
 msgid "Can't export memo %d\n"
 msgstr ""
 
-#: ../memo_gui.c:605
+#: ../memo_gui.c:641
 #, c-format
 msgid "Memo: %ld\n"
 msgstr ""
 
-#: ../memo_gui.c:611
+#: ../memo_gui.c:647
 #, c-format
 msgid "----- Start of Memo -----\n"
 msgstr ""
 
-#: ../memo_gui.c:613
+#: ../memo_gui.c:649
 #, c-format
 msgid ""
 "\n"
@@ -1956,558 +1975,562 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../monthview_gui.c:438
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
 msgid "Monthly View"
 msgstr ""
 
-#: ../monthview_gui.c:480
+#: ../monthview_gui.c:478
 msgid "Last month   Alt+LeftArrow"
 msgstr ""
 
-#: ../monthview_gui.c:508
+#: ../monthview_gui.c:506
 msgid "Next month   Alt+RightArrow"
 msgstr ""
 
-#: ../otherconv.c:76
+#: ../otherconv.c:74
 #, c-format
 msgid "%s: error exit from g_iconv_close(%s)\n"
 msgstr ""
 
-#: ../otherconv.c:201
+#: ../otherconv.c:199
 #, c-format
 msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
 msgstr ""
 
-#: ../otherconv.c:203
+#: ../otherconv.c:201
 msgid "last char truncated"
 msgstr ""
 
-#: ../otherconv.c:280
+#: ../otherconv.c:278
 #, c-format
 msgid "UTF_to_other: %s\n"
 msgstr ""
 
-#: ../otherconv.c:294
+#: ../otherconv.c:292
 #, c-format
 msgid "iconv: unconvertible sequence at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:298
+#: ../otherconv.c:296
 #, c-format
 msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:301
+#: ../otherconv.c:299
 #, c-format
 msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:304
+#: ../otherconv.c:302
 #, c-format
 msgid "iconv: unexpected error at place %d in '%s'\n"
 msgstr ""
 
-#: ../password.c:283
+#: ../password.c:281
 msgid "Palm Password"
 msgstr ""
 
-#: ../password.c:308
+#: ../password.c:306
 msgid "Incorrect, Reenter PalmOS Password"
 msgstr ""
 
-#: ../password.c:310
+#: ../password.c:308
 msgid "Enter PalmOS Password"
 msgstr ""
 
-#: ../pidfile.c:67
+#: ../pidfile.c:69
 msgid "removing stale pidfile\n"
 msgstr ""
 
-#: ../pidfile.c:91
+#: ../pidfile.c:95
 #, c-format
 msgid "create pidfile failed: %s\n"
 msgstr ""
 
-#: ../pidfile.c:92
+#: ../pidfile.c:96
 msgid "Warning: hotplug syncing disabled.\n"
 msgstr ""
 
-#: ../plugins.c:90 ../plugins.c:203 ../restore_gui.c:133
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
 msgid "infinite loop"
 msgstr ""
 
-#: ../plugins.c:216
+#: ../plugins.c:214
 #, c-format
 msgid "While reading %s%s line 1:[%s]\n"
 msgstr ""
 
-#: ../plugins.c:217
+#: ../plugins.c:215
 msgid "Wrong Version\n"
 msgstr ""
 
-#: ../plugins.c:218
+#: ../plugins.c:216
 msgid "Check preferences->conduits\n"
 msgstr ""
 
-#: ../plugins.c:274
+#: ../plugins.c:272
 #, c-format
 msgid ""
 "Open failed on plugin [%s]\n"
 " error [%s]\n"
 msgstr ""
 
-#: ../plugins.c:291 ../plugins.c:316
+#: ../plugins.c:289 ../plugins.c:314
 #, c-format
 msgid " plugin is invalid: [%s]\n"
 msgstr ""
 
-#: ../plugins.c:299
+#: ../plugins.c:297
 #, c-format
 msgid "Plugin:[%s]\n"
 msgstr ""
 
-#: ../plugins.c:300
+#: ../plugins.c:298
 #, c-format
 msgid "This plugin is version (%d.%d).\n"
 msgstr ""
 
-#: ../plugins.c:302
+#: ../plugins.c:300
 msgid "It is too old to work with this version of J-Pilot.\n"
 msgstr ""
 
-#: ../prefs.c:420
+#: ../prefs.c:418
 msgid "%B %d, %Y"
 msgstr ""
 
-#: ../prefs.c:421
+#: ../prefs.c:419
 msgid "%d %B %Y"
 msgstr ""
 
-#: ../prefs.c:422
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr ""
 
-#: ../prefs.c:423
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr ""
 
-#: ../prefs.c:424
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr ""
 
-#: ../prefs.c:425
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr ""
 
-#: ../prefs_gui.c:454
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr ""
 
-#: ../prefs_gui.c:485
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr ""
 
-#: ../prefs_gui.c:487
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr ""
 
-#: ../prefs_gui.c:489
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr ""
 
-#: ../prefs_gui.c:493
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr ""
 
-#: ../prefs_gui.c:495
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr ""
 
-#: ../prefs_gui.c:497
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr ""
 
-#: ../prefs_gui.c:499
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr ""
 
 #. Shortdate
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:522
 msgid "Short date format"
 msgstr ""
 
 #. Longdate
-#: ../prefs_gui.c:537
+#: ../prefs_gui.c:535
 msgid "Long date format"
 msgstr ""
 
 #. Time
-#: ../prefs_gui.c:550
+#: ../prefs_gui.c:548
 msgid "Time format"
 msgstr ""
 
 #. GTK colors file
-#: ../prefs_gui.c:570
+#: ../prefs_gui.c:568
 msgid "GTK color theme file"
 msgstr ""
 
 #. Port
-#: ../prefs_gui.c:583
+#: ../prefs_gui.c:581
 msgid "Sync Port"
 msgstr ""
 
 #. Serial Rate
-#: ../prefs_gui.c:607
+#: ../prefs_gui.c:605
 msgid "Serial Rate"
 msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:627
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr ""
 
 #. Show deleted files check box
-#: ../prefs_gui.c:645
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr ""
 
 #. Show modified files check box
-#: ../prefs_gui.c:649
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr ""
 
-#: ../prefs_gui.c:654
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr ""
 
 #. Show tooltips check box
-#: ../prefs_gui.c:658
+#: ../prefs_gui.c:656
 msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr ""
 
-#: ../prefs_gui.c:668
+#: ../prefs_gui.c:666
 msgid "Use Datebook database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:671
+#: ../prefs_gui.c:669
 msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr ""
 
 #. Show highlight days check box
-#: ../prefs_gui.c:697
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr ""
 
 #. Highlight today on month and week view
-#: ../prefs_gui.c:702
+#: ../prefs_gui.c:700
 msgid "Annotate today in day, week, and month views"
 msgstr ""
 
 #. Show number of years on anniversaries in month and week view
-#: ../prefs_gui.c:706
+#: ../prefs_gui.c:704
 msgid "Append years on anniversaries in day, week, and month views"
 msgstr ""
 
 #. Show use DateBk check box
-#: ../prefs_gui.c:712
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr ""
 
-#: ../prefs_gui.c:715
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr ""
 
-#: ../prefs_gui.c:727
+#: ../prefs_gui.c:725
 msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:730
+#: ../prefs_gui.c:728
 msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:759
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr ""
 
-#: ../prefs_gui.c:773
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr ""
 
-#: ../prefs_gui.c:785
+#: ../prefs_gui.c:783
 msgid "Use ToDo database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:788
+#: ../prefs_gui.c:786
 msgid "Use Task database (Palm OS > 5.2)"
 msgstr ""
 
 #. hide completed check box
-#: ../prefs_gui.c:815
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr ""
 
 #. hide todos not yet due check box
-#: ../prefs_gui.c:819
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr ""
 
 #. record todo completion date check box
-#: ../prefs_gui.c:823
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr ""
 
 #. Use Manana check box
-#: ../prefs_gui.c:828
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr ""
 
-#: ../prefs_gui.c:836
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr ""
 
-#: ../prefs_gui.c:858
+#: ../prefs_gui.c:856
 msgid "Use Memo database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:861
+#: ../prefs_gui.c:859
 msgid "Use Memos database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:864
+#: ../prefs_gui.c:862
 msgid "Use Memo32 database (pedit32)"
 msgstr ""
 
-#: ../prefs_gui.c:904
+#: ../prefs_gui.c:902
 msgid "External Editor"
 msgstr ""
 
-#: ../prefs_gui.c:917
+#: ../prefs_gui.c:915
 msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
 msgstr ""
 
 #. ********************************************************************
 #. Alarms preference tab
 #. Open alarm windows check box
-#: ../prefs_gui.c:925
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr ""
 
 #. Execute alarm command check box
-#: ../prefs_gui.c:929
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr ""
 
 #. Shell warning label
-#: ../prefs_gui.c:933
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr ""
 
-#: ../prefs_gui.c:941
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr ""
 
-#: ../prefs_gui.c:954
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr ""
 
-#: ../prefs_gui.c:958
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr ""
 
-#: ../prefs_gui.c:963
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr ""
 
-#: ../prefs_gui.c:967
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr ""
 
-#: ../prefs_gui.c:971
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr ""
 
-#: ../prefs_gui.c:976
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr ""
 
 #. ********************************************************************
 #. Conduits preference tab
 #. Sync datebook check box
-#: ../prefs_gui.c:986
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr ""
 
 #. Sync address check box
-#: ../prefs_gui.c:990
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr ""
 
 #. Sync todo check box
-#: ../prefs_gui.c:994
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr ""
 
 #. Sync memo check box
-#: ../prefs_gui.c:998
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr ""
 
 #. Show sync Manana check box
-#: ../prefs_gui.c:1003
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr ""
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:1009
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr ""
 
 #. Make a Sync checkbox for each plugin
-#: ../prefs_gui.c:1022
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr ""
 
-#: ../print_gui.c:185
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr ""
 
-#: ../print_gui.c:198
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr ""
 
-#: ../print_gui.c:214
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr ""
 
-#: ../print_gui.c:220
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr ""
 
-#: ../print_gui.c:226
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr ""
 
-#: ../print_gui.c:266
+#: ../print_gui.c:264
 msgid "Selected record"
 msgstr ""
 
-#: ../print_gui.c:270
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr ""
 
-#: ../print_gui.c:274
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr ""
 
-#: ../print_gui.c:296
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr ""
 
-#: ../print_gui.c:312
+#: ../print_gui.c:310
 msgid "Blank lines between each record"
 msgstr ""
 
 #. Print Command
-#: ../print_gui.c:321
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr ""
 
-#: ../restore_gui.c:71 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr ""
 
-#: ../restore_gui.c:176 ../restore_gui.c:178
+#: ../restore_gui.c:174 ../restore_gui.c:176
 msgid "Unable to convert filename for GTK display\n"
 msgstr ""
 
-#: ../restore_gui.c:177
+#: ../restore_gui.c:175
 msgid "See console log to find which file will not be restored\n"
 msgstr ""
 
-#: ../restore_gui.c:179
+#: ../restore_gui.c:177
 #, c-format
 msgid "File %s will not be restored\n"
 msgstr ""
 
 #. Label for instructions
-#: ../restore_gui.c:246
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr ""
 
-#: ../restore_gui.c:249
+#: ../restore_gui.c:247
 msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr ""
 
-#: ../restore_gui.c:252
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr ""
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr ""
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr ""
 
-#: ../search_gui.c:144
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr ""
 
-#: ../search_gui.c:146
+#: ../search_gui.c:144
 msgid "calendar"
 msgstr ""
 
-#: ../search_gui.c:233
+#: ../search_gui.c:231
 msgid "address"
 msgstr ""
 
-#: ../search_gui.c:235
+#: ../search_gui.c:233
 msgid "contact"
 msgstr ""
 
-#: ../search_gui.c:304
+#: ../search_gui.c:302
 msgid "todo"
 msgstr ""
 
-#: ../search_gui.c:361
+#: ../search_gui.c:359
 msgid "memo"
 msgstr ""
 
-#: ../search_gui.c:363
+#: ../search_gui.c:361
 msgid "memos"
 msgstr ""
 
-#: ../search_gui.c:421
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr ""
 
-#: ../search_gui.c:501
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr ""
 
-#: ../search_gui.c:600
+#: ../search_gui.c:598
 msgid "Search"
 msgstr ""
 
 #. Search label
-#: ../search_gui.c:617
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr ""
 
 #. Case Sensitive checkbox
-#: ../search_gui.c:626
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr ""
 
-#: ../sync.c:120
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr ""
 
-#: ../sync.c:133
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr ""
 
@@ -2516,291 +2539,291 @@ msgstr ""
 msgid "sync file is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:171
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr ""
 
-#: ../sync.c:174
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:410
+#: ../sync.c:418
 msgid "Check your sync port and settings\n"
 msgstr ""
 
-#: ../sync.c:669
+#: ../sync.c:677
 msgid "Unable to read home dir\n"
 msgstr ""
 
-#: ../sync.c:1075 ../sync.c:1413
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
 msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
 msgstr ""
 
-#: ../sync.c:1079 ../sync.c:1417
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
 msgid "Fetching '%s' (Creator ID '%s')... "
 msgstr ""
 
-#: ../sync.c:1086 ../sync.c:1423
+#: ../sync.c:1096 ../sync.c:1433
 #, c-format
 msgid "Failed, unable to create file %s\n"
 msgstr ""
 
-#: ../sync.c:1090 ../sync.c:1428
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
 msgid "Failed, unable to back up database %s\n"
 msgstr ""
 
-#: ../sync.c:1094 ../sync.c:1432 ../sync.c:1619
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
 msgid "OK\n"
 msgstr ""
 
-#: ../sync.c:1294
+#: ../sync.c:1304
 #, c-format
 msgid "Skipping %s (Creator ID '%s')\n"
 msgstr ""
 
-#: ../sync.c:1488
+#: ../sync.c:1498
 #, c-format
 msgid "Installing %s "
 msgstr ""
 
-#: ../sync.c:1494 ../sync.c:1530
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
 msgid ""
 "\n"
 "Unable to open file: '%s': %s!\n"
 msgstr ""
 
-#: ../sync.c:1498
+#: ../sync.c:1508
 #, c-format
 msgid ""
 "\n"
 "Unable to sync file: '%s': file corrupted?\n"
 msgstr ""
 
-#: ../sync.c:1514
+#: ../sync.c:1524
 #, c-format
 msgid "(Creator ID '%s')... "
 msgstr ""
 
-#: ../sync.c:1518
+#: ../sync.c:1528
 #, c-format
 msgid "(Creator ID '%s') "
 msgstr ""
 
-#: ../sync.c:1520
+#: ../sync.c:1530
 #, c-format
 msgid "(SDcard dir %s)... "
 msgstr ""
 
-#: ../sync.c:1552 ../sync.c:1565 ../sync.c:1580 ../sync.c:1593
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
 msgid ""
 "\n"
 "Unable to open file: %s\n"
 msgstr ""
 
-#: ../sync.c:1605
+#: ../sync.c:1615
 #, c-format
 msgid "Install %s failed"
 msgstr ""
 
-#: ../sync.c:1609
+#: ../sync.c:1619
 msgid "Failed.\n"
 msgstr ""
 
-#: ../sync.c:1615
+#: ../sync.c:1625
 #, c-format
 msgid "Installed %s"
 msgstr ""
 
-#: ../sync.c:1726
+#: ../sync.c:1736
 #, c-format
 msgid "%s:%d Error getting app info %s\n"
 msgstr ""
 
-#: ../sync.c:1732 ../sync.c:1762
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
 msgid "%s:%d Error unpacking app info %s\n"
 msgstr ""
 
-#: ../sync.c:1753
+#: ../sync.c:1763
 #, c-format
 msgid "Error reading appinfo block for %s\n"
 msgstr ""
 
 #. Fix - need a func for this logging
-#: ../sync.c:1991 ../sync.c:1995
+#: ../sync.c:2001 ../sync.c:2005
 #, c-format
 msgid "Could not add category %s to remote.\n"
 msgstr ""
 
-#: ../sync.c:1992 ../sync.c:1998
+#: ../sync.c:2002 ../sync.c:2008
 #, c-format
 msgid "Too many categories on remote.\n"
 msgstr ""
 
-#: ../sync.c:1993 ../sync.c:2001
+#: ../sync.c:2003 ../sync.c:2011
 #, c-format
 msgid "All records on desktop in %s will be moved to %s.\n"
 msgstr ""
 
-#: ../sync.c:2096 ../sync.c:2814
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr ""
 
-#: ../sync.c:2104 ../sync.c:2457 ../sync.c:2822
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr ""
 
-#: ../sync.c:2106 ../sync.c:2459 ../sync.c:2824
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr ""
 
-#: ../sync.c:2108 ../sync.c:2461 ../sync.c:2826
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr ""
 
-#: ../sync.c:2110 ../sync.c:2463 ../sync.c:2828
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr ""
 
-#: ../sync.c:2112 ../sync.c:2465
+#: ../sync.c:2122 ../sync.c:2475
 #, c-format
 msgid "Sync Conflict: duplicated an %s record."
 msgstr ""
 
-#: ../sync.c:2115 ../sync.c:2468 ../sync.c:2831
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr ""
 
-#: ../sync.c:2117 ../sync.c:2470 ../sync.c:2833
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr ""
 
-#: ../sync.c:2119 ../sync.c:2472 ../sync.c:2835
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr ""
 
-#: ../sync.c:2121 ../sync.c:2474 ../sync.c:2837
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr ""
 
-#: ../sync.c:2123 ../sync.c:2476
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
 msgid "Sync Conflict: duplicated a %s record."
 msgstr ""
 
-#: ../sync.c:2227 ../sync.c:2557
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
 msgid "Sync Conflict: a %s record must be manually merged\n"
 msgstr ""
 
-#: ../sync.c:2358 ../sync.c:2698
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
 msgstr ""
 
-#: ../sync.c:2927
+#: ../sync.c:2937
 msgid "Finished installing user information.\n"
 msgstr ""
 
-#: ../sync.c:3084
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr ""
 
-#: ../sync.c:3085
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr ""
 
-#: ../sync.c:3127 ../sync.c:3149 ../sync.c:3170
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr ""
 
-#: ../sync.c:3128 ../sync.c:3150 ../sync.c:3171
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr ""
 
-#: ../sync.c:3129 ../sync.c:3151 ../sync.c:3172
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr ""
 
-#: ../sync.c:3130 ../sync.c:3152 ../sync.c:3173
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
 msgid " This User ID-->%d\n"
 msgstr ""
 
-#: ../sync.c:3194
+#: ../sync.c:3204
 #, c-format
 msgid "Username is \"%s\"\n"
 msgstr ""
 
-#: ../sync.c:3195
+#: ../sync.c:3205
 #, c-format
 msgid "User ID is %d\n"
 msgstr ""
 
-#: ../sync.c:3197
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr ""
 
-#: ../sync.c:3198
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr ""
 
-#: ../sync.c:3222
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr ""
 
-#: ../sync.c:3245
+#: ../sync.c:3255
 msgid "Finished restoring handheld.\n"
 msgstr ""
 
-#: ../sync.c:3246
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr ""
 
-#: ../sync.c:3268
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr ""
 
-#: ../sync.c:3281
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr ""
 
-#: ../sync.c:3356
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr ""
 
-#: ../sync.c:3401 ../sync.c:3469
+#: ../sync.c:3411 ../sync.c:3479
 msgid "Finished.\n"
 msgstr ""
 
-#: ../sync.c:3436
+#: ../sync.c:3446
 #, c-format
 msgid "%s: sync process already in progress (process ID = %d)\n"
 msgstr ""
 
-#: ../sync.c:3437
+#: ../sync.c:3447
 #, c-format
 msgid ""
 "%s: press the HotSync button on the cradle\n"
@@ -2808,22 +2831,22 @@ msgid ""
 "         or stop the sync by typing \"kill %d\" at the command line\n"
 msgstr ""
 
-#: ../sync.c:3468
+#: ../sync.c:3478
 #, c-format
 msgid "Exiting with status %s\n"
 msgstr ""
 
-#: ../todo.c:266
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../todo.c:272
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../todo_gui.c:161
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr ""
 
@@ -2883,120 +2906,120 @@ msgstr ""
 msgid "Priority out of range\n"
 msgstr ""
 
-#: ../todo_gui.c:1932 ../KeyRing/keyring.c:1310
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr ""
 
 #. Completed checkbox
-#: ../todo_gui.c:2414
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr ""
 
-#: ../todo_gui.c:2421
+#: ../todo_gui.c:2418
 msgid "Priority:"
 msgstr ""
 
-#: ../todo_gui.c:2423
+#: ../todo_gui.c:2420
 msgid "Set priority   Alt+#"
 msgstr ""
 
-#: ../todo_gui.c:2444
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr ""
 
-#: ../utils.c:332
+#: ../utils.c:330
 msgid "Today"
 msgstr ""
 
-#: ../utils.c:577
+#: ../utils.c:575
 #, c-format
 msgid "Couldn't find empty DB file %s: %s\n"
 msgstr ""
 
-#: ../utils.c:580
+#: ../utils.c:578
 msgid " may not be installed.\n"
 msgstr ""
 
 #. Can't create directory
-#: ../utils.c:615 ../utils.c:619
+#: ../utils.c:613 ../utils.c:617
 #, c-format
 msgid "Can't create directory %s\n"
 msgstr ""
 
-#: ../utils.c:625
+#: ../utils.c:623
 #, c-format
 msgid "%s is not a directory\n"
 msgstr ""
 
-#: ../utils.c:630
+#: ../utils.c:628
 #, c-format
 msgid "Unable to get write permission for directory %s\n"
 msgstr ""
 
-#: ../utils.c:1330 ../utils.c:1354
+#: ../utils.c:1328 ../utils.c:1352
 msgid "Save Changed Record?"
 msgstr ""
 
-#: ../utils.c:1331 ../utils.c:1355
+#: ../utils.c:1329 ../utils.c:1353
 msgid "Do you want to save the changes to this record?"
 msgstr ""
 
-#: ../utils.c:1336 ../utils.c:1360
+#: ../utils.c:1334 ../utils.c:1358
 msgid "Save New Record?"
 msgstr ""
 
-#: ../utils.c:1337 ../utils.c:1361
+#: ../utils.c:1335 ../utils.c:1359
 msgid "Do you want to save this new record?"
 msgstr ""
 
-#: ../utils.c:1652
+#: ../utils.c:1650
 msgid "infinite loop, breaking\n"
 msgstr ""
 
-#: ../utils.c:1876
+#: ../utils.c:1874
 #, c-format
 msgid " -p skip loading plugins\n"
 msgstr ""
 
-#: ../utils.c:1877
+#: ../utils.c:1875
 #, c-format
 msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr ""
 
-#: ../utils.c:1878
+#: ../utils.c:1876
 #, c-format
 msgid " -A ignore all alarms past and future\n"
 msgstr ""
 
-#: ../utils.c:1879
+#: ../utils.c:1877
 #, c-format
 msgid " -s start sync using existing instance of GUI\n"
 msgstr ""
 
-#: ../utils.c:1880
+#: ../utils.c:1878
 #, c-format
 msgid " -i iconify program immediately after launch\n"
 msgstr ""
 
-#: ../utils.c:1881
+#: ../utils.c:1879
 #, c-format
 msgid ""
-" -geometry {X geometry} use specifed geometry for main window\n"
+" -geometry {X geometry} use specified geometry for main window\n"
 "\n"
 msgstr ""
 
-#: ../utils.c:1882
+#: ../utils.c:1880
 #, c-format
 msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr ""
 
-#: ../utils.c:1883
+#: ../utils.c:1881
 #, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr ""
 
-#: ../utils.c:1884
+#: ../utils.c:1882
 #, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr ""
@@ -3005,97 +3028,99 @@ msgstr ""
 msgid "Error reading file"
 msgstr ""
 
-#: ../utils.c:1971
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr ""
 
-#: ../utils.c:1972
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr ""
 
-#: ../utils.c:1974
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr ""
 
-#: ../utils.c:1976
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr ""
 
-#: ../utils.c:1980
+#: ../utils.c:1982
 msgid "USB support"
 msgstr ""
 
-#: ../utils.c:1981 ../utils.c:1984 ../utils.c:1990 ../utils.c:1996
-#: ../utils.c:2002 ../utils.c:2008 ../utils.c:2013
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr ""
 
-#: ../utils.c:1982
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr ""
 
-#: ../utils.c:1986 ../utils.c:1992 ../utils.c:1998 ../utils.c:2004
-#: ../utils.c:2010
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
 msgid "no"
 msgstr ""
 
-#: ../utils.c:1988
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr ""
 
-#: ../utils.c:1994
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr ""
 
-#: ../utils.c:2000
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr ""
 
-#: ../utils.c:2006
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr ""
 
-#: ../utils.c:2012
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr ""
 
 #. No HOME var
-#: ../utils.c:2055
+#: ../utils.c:2057
+#, c-format
 msgid "Can't get HOME environment variable\n"
 msgstr ""
 
-#: ../utils.c:2062
+#: ../utils.c:2064
+#, c-format
 msgid "HOME environment variable is too long to process\n"
 msgstr ""
 
-#: ../utils.c:2557
+#: ../utils.c:2567
 msgid "Edit Categories..."
 msgstr ""
 
-#: ../utils.c:3223
+#: ../utils.c:3233
 msgid "PC ID is 0.\n"
 msgstr ""
 
-#: ../utils.c:3224
+#: ../utils.c:3234
 #, c-format
 msgid "Generated a new PC ID.  It is %lu\n"
 msgstr ""
 
-#: ../utils.c:3309
+#: ../utils.c:3376
 msgid "Invalid UTF-8 encoding in export string\n"
 msgstr ""
 
-#: ../utils.c:3470
+#: ../utils.c:3537
 #, c-format
 msgid "Today is %A, %x %X"
 msgstr ""
 
-#: ../utils.c:3472
+#: ../utils.c:3539
 #, c-format
 msgid "Today is %%A, %s %s"
 msgstr ""
 
-#: ../utils.c:3701
+#: ../utils.c:3768
 #, c-format
 msgid ""
 "Incorrect header format for CSV import\n"
@@ -3103,374 +3128,374 @@ msgid ""
 "Aborting import\n"
 msgstr ""
 
-#: ../utils.c:3738
+#: ../utils.c:3805
 #, c-format
 msgid "Error writing version header to file: %s%s\n"
 msgstr ""
 
-#: ../utils.c:3743
+#: ../utils.c:3810
 #, c-format
 msgid "Error writing next id to file: %s%s"
 msgstr ""
 
-#: ../weekview_gui.c:297
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr ""
 
-#: ../weekview_gui.c:337
+#: ../weekview_gui.c:335
 msgid "Last week   Alt+LeftArrow"
 msgstr ""
 
-#: ../weekview_gui.c:366
+#: ../weekview_gui.c:364
 msgid "Next week   Alt+RightArrow"
 msgstr ""
 
-#: ../Expense/expense.c:97
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr ""
 
-#: ../Expense/expense.c:98
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr ""
 
-#: ../Expense/expense.c:99
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr ""
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr ""
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr ""
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr ""
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr ""
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr ""
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr ""
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr ""
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr ""
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr ""
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr ""
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr ""
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr ""
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr ""
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr ""
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr ""
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr ""
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr ""
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr ""
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr ""
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr ""
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr ""
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr ""
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr ""
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr ""
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr ""
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr ""
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr ""
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr ""
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr ""
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr ""
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr ""
 
-#: ../Expense/expense.c:518 ../Expense/expense.c:529
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr ""
 
-#: ../Expense/expense.c:550 ../Expense/expense.c:1388
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr ""
 
-#: ../Expense/expense.c:552 ../Expense/expense.c:1389
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr ""
 
-#: ../Expense/expense.c:554 ../Expense/expense.c:1390
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr ""
 
-#: ../Expense/expense.c:556 ../Expense/expense.c:1391
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr ""
 
-#: ../Expense/expense.c:558 ../Expense/expense.c:1392
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr ""
 
-#: ../Expense/expense.c:560 ../Expense/expense.c:1393
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr ""
 
-#: ../Expense/expense.c:562 ../Expense/expense.c:1394
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr ""
 
-#: ../Expense/expense.c:564 ../Expense/expense.c:1395
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr ""
 
-#: ../Expense/expense.c:566 ../Expense/expense.c:1396
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr ""
 
-#: ../Expense/expense.c:568 ../Expense/expense.c:1397
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr ""
 
-#: ../Expense/expense.c:570 ../Expense/expense.c:1398
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr ""
 
-#: ../Expense/expense.c:572 ../Expense/expense.c:1399
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr ""
 
-#: ../Expense/expense.c:574 ../Expense/expense.c:1400
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr ""
 
-#: ../Expense/expense.c:576 ../Expense/expense.c:1401
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr ""
 
-#: ../Expense/expense.c:578 ../Expense/expense.c:1402
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr ""
 
-#: ../Expense/expense.c:580 ../Expense/expense.c:1403
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr ""
 
-#: ../Expense/expense.c:582 ../Expense/expense.c:1404
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr ""
 
-#: ../Expense/expense.c:586 ../Expense/expense.c:1406
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr ""
 
-#: ../Expense/expense.c:588 ../Expense/expense.c:1407
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr ""
 
-#: ../Expense/expense.c:590 ../Expense/expense.c:1408
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr ""
 
-#: ../Expense/expense.c:592 ../Expense/expense.c:1409
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr ""
 
-#: ../Expense/expense.c:594 ../Expense/expense.c:1410
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr ""
 
-#: ../Expense/expense.c:596 ../Expense/expense.c:1411
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr ""
 
-#: ../Expense/expense.c:598 ../Expense/expense.c:1412
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr ""
 
-#: ../Expense/expense.c:600 ../Expense/expense.c:1413
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr ""
 
-#: ../Expense/expense.c:602 ../Expense/expense.c:1414
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr ""
 
-#: ../Expense/expense.c:604 ../Expense/expense.c:1415
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr ""
 
-#: ../Expense/expense.c:1239
+#: ../Expense/expense.c:1237
 msgid "Expense: Unknown expense type\n"
 msgstr ""
 
-#: ../Expense/expense.c:1245
+#: ../Expense/expense.c:1243
 msgid "Expense: Unknown payment type\n"
 msgstr ""
 
-#: ../Expense/expense.c:1377
+#: ../Expense/expense.c:1375
 msgid "American Express"
 msgstr ""
 
-#: ../Expense/expense.c:1378
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr ""
 
-#: ../Expense/expense.c:1379
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr ""
 
-#: ../Expense/expense.c:1380
+#: ../Expense/expense.c:1378
 msgid "Credit Card"
 msgstr ""
 
-#: ../Expense/expense.c:1381
+#: ../Expense/expense.c:1379
 msgid "Master Card"
 msgstr ""
 
-#: ../Expense/expense.c:1382
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr ""
 
-#: ../Expense/expense.c:1383
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr ""
 
-#: ../Expense/expense.c:1619
+#: ../Expense/expense.c:1617
 msgid "Type"
 msgstr ""
 
-#: ../Expense/expense.c:1620
+#: ../Expense/expense.c:1618
 msgid "Amount"
 msgstr ""
 
 #. Category Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr ""
 
 #. Type Menu
-#: ../Expense/expense.c:1712
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr ""
 
 #. Payment Menu
-#: ../Expense/expense.c:1720
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr ""
 
 #. Currency Menu
-#: ../Expense/expense.c:1728
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr ""
 
-#: ../Expense/expense.c:1748
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr ""
 
-#: ../Expense/expense.c:1762
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr ""
 
-#: ../Expense/expense.c:1776
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr ""
 
 #. Amount Entry
-#: ../Expense/expense.c:1789
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr ""
 
 #. Vendor Entry
-#: ../Expense/expense.c:1799
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr ""
 
 #. City
-#: ../Expense/expense.c:1809
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr ""
 
 #. Attendees
-#: ../Expense/expense.c:1819
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr ""
 
 #. -------------------------------------------
-#: ../Expense/expense.c:2102
+#: ../Expense/expense.c:2100
 #, c-format
 msgid ""
 "%s\n"
@@ -3480,37 +3505,37 @@ msgid ""
 "judd@jpilot.org, http://jpilot.org"
 msgstr ""
 
-#: ../KeyRing/keyring.c:291
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1699
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1701
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1703
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1769
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1770
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1861 ../KeyRing/keyring.c:1872
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr ""
 
 #. -------------------------------------------
-#: ../KeyRing/keyring.c:1900
+#: ../KeyRing/keyring.c:1898
 #, c-format
 msgid ""
 "%s\n"
@@ -3524,20 +3549,20 @@ msgid ""
 "http://gnukeyring.sourceforge.net"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2137
+#: ../KeyRing/keyring.c:2136
 #, c-format
 msgid ""
 "Keys exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2153
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
 #, c-format
 msgid "Can't export key %d\n"
 msgstr ""
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2349
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3545,45 +3570,45 @@ msgid ""
 msgstr ""
 
 #. Clist
-#: ../KeyRing/keyring.c:2462
+#: ../KeyRing/keyring.c:2564
 msgid "Changed"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2464
+#: ../KeyRing/keyring.c:2566
 msgid "Account"
 msgstr ""
 
 #. Name entry
-#: ../KeyRing/keyring.c:2558
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr ""
 
 #. Account entry
-#: ../KeyRing/keyring.c:2566
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr ""
 
 #. Password entry
-#: ../KeyRing/keyring.c:2574
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr ""
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2581
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2591
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr ""
 
-#: ../SyncTime/synctime.c:61
+#: ../SyncTime/synctime.c:59
 msgid "SyncTime"
 msgstr ""
 
 #. -------------------------------------------
-#: ../SyncTime/synctime.c:72
+#: ../SyncTime/synctime.c:70
 #, c-format
 msgid ""
 "%s\n"
@@ -3595,18 +3620,18 @@ msgid ""
 "SyncTime WILL NOT work with PalmOS 3.3!"
 msgstr ""
 
-#: ../SyncTime/synctime.c:106
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:107
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:112
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:117
+#: ../SyncTime/synctime.c:115
 msgid "Done\n"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 1a06e6ff..217f0c61 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,40 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.8\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2005-12-11 23:24-0800\n"
 "Last-Translator: Byeong-Taek Lee <beongtaek.lee@gmail.com>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "�޸� ����"
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "����"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d %s ���� ���� ���� �� ����\n"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "���� �б� ����: %s\n"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "����"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -47,412 +59,558 @@ msgstr ""
 "�� �ڷ�� �����Ǿ����ϴ�.\n"
 "�����ϱ� ���ؼ��� �����ϰų� �����Ͻʽÿ�.\n"
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "������ �� �� ����: %s\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "������ �� �� ����: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "���� ������ address.dat�� �ƴ� ���մϴ�.\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "��з�"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "Ȯ��"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "�ƴϿ�"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "��"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s�� ���丮�Դϴ�."
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "���Ͽ��� ����"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "%s ������ ����ðڽ��ϱ�?"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "������ ����ðڽ��ϱ�?"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "���� ���� ����: %s"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "�ּҸ� ������ �� �����ϴ� %d\n"
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-msgid "Field"
-msgstr "�ʵ�"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "����: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "����"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "�̸���"
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "�˷����� ���� �������� ����\n"
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "ȸ��/�̸�"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "�̸�/ȸ��"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "�̸�/ȸ��"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "ȸ��/�̸�"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "������ �ڷ�� ������ �� �����ϴ�.\n"
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "���ִ� ������ �ʽ��ϴ�\n"
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "���� ���� = [%s]\n"
 
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
+
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "��� ����\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
 #. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "����: "
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
-msgstr "����("
-
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
-msgstr "�̸���"
-
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "����"
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "��ȭ�ɱ�"
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-�̸�����-"
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 �ڷ�"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d ��° �ڷ� (��ü %d ��)"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
-msgstr "���� ����"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "�̸�"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "�ּ�"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "��Ÿ"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "��Ʈ"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "��ȭ"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "���� �: "
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "���"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "������ �� ���"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "�����"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "���õ� �ڷ� �����"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "����� ���"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "���õ� �ڷ� ����� ���"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "����"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "���õ� �ڷ� ����"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "�� �׸�"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "�� �ڷ� ���ϱ�"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "�ڷ� ���ϱ�"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "�� �ڷ� ���ϱ�"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "�ٲ� �� ����"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "���� ����"
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "����"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "�̸�"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "�ּ�"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "��Ÿ"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "���"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "��ü"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "����"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "����\n"
 "��� ������"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "���� ����"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "������"
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "��"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "��ü"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "��"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "��"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "������"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "%s%s ������ �� �� ����\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "������ �� �� �����ϴ�: %s%s\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "��� ���"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "���� ���"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "����� ���"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "���"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "J-Pilot �˶�"
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr "���� ����, ���߱�\n"
-
-#: ../alarms.c:1531
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "%s �˶� ������ �� �� ����\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-msgid "rename failed"
-msgstr "�̸��ٲٱ� ����"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "PC ������ ����?\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek ���� - �߿��� ����\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "�̸��ٲٱ� ����"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "�̵�"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "���� ����"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "�̹� �ִ� ���� ��(16)�� ��� ��"
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "�� ���� �ֱ�"
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr "���� ���� ����"
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "�̸��� �ٲٱ� ���ؼ��� ���ָ� �����ؾ� ��"
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "%s ���ִ� ������ �� �����ϴ�.\n"
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "�� ���� �̸� �ֱ�"
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "�����ϱ� ���ؼ��� ���ָ� �����ؾ� ��"
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr "%s ���ָ� ������ �� ����.\n"
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
@@ -460,199 +618,336 @@ msgstr ""
 "%d�� �ڷᰡ %s�� �ֽ��ϴ�.\n"
 "%s�� �ű�ų� �����Ͻðڽ��ϱ�?"
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "%s ������ �߸��� ���� (%d ��)\n"
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "%s ���ִ� �� �� �̻� ���� �� ����"
 
-#. correctly translate title
-#: ../category.c:813
-msgid "category name"
-msgstr "���� �̸�"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "����:"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "�� ����"
 
-#: ../category.c:845
+#: ../category.c:841
 msgid "Rename"
 msgstr "�̸��ٲٱ�"
 
-#: ../category.c:960
-msgid "debug"
-msgstr "�����˻�"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "�˷����� ���� ����="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "�ٴ� �׸� �� != %d, �˷����� ���� ����\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "�׸� �� !=%d, �˷����� ���� ����\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "�˷����� ���� ����, ������ �߸��� ��Ű���� ����\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "���� ����:"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "��Ģ: "
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr "%s:%d �ڷ� %d, �׸� %d: Ÿ��ġ ���� ����. ��밪 %d, ã���� �� %d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "���� �б� ����\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "DatebookDB���� �˷����� ���� �ݺ����� (%d) �߰�\n"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "�ݺ� ����:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "�ݺ� ����"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "�ݺ� ����:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "�ݺ� ����"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "�ݺ� ����"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "�ݺ� ����"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "��"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "��"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "ȭ"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "��"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "��"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "��"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "��"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "������ ��¥"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "�ݺ� ����"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "�ڷ� �� = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "��Ʈ"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "�˶�"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "�ݺ� ����:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "����"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "��� ���� > %d, %d���� �߷���\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "����"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "������ datebook.dat ������ �ƴ� ��\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "�˷����� ���� �������� ����"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "��������"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "��� Datebook �ڷ� ��������"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "���̸� ����"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "�����"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Datebook ����"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "�ݱ�"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "����"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "���� ��¥"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "������ ��¥"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "�Ͽ���"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "������"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "ȭ����"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "������"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "�����"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "�ݿ���"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "�����"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4��°"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "������"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -667,18 +962,18 @@ msgstr ""
 "�ݺ��� �� �����ϴ�.\n"
 "��� ���� ���մϱ�?"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "����?"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "�ݺ� ����Դϴ�\n"
 "���� �ٲ� �͵���\n"
@@ -686,51 +981,56 @@ msgstr ""
 "�ݺ��Ǵ� ��� ��ǵ鿡\n"
 "�����Ͻðڽ��ϱ�?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "����"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "����"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "��"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "��"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "��"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "��"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "�� %d %s�� �ݺ��ϴ� ����� ���� �� �����ϴ�\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
+#, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr "������ � ������ �ݺ����� �ʴ¸��� �ݺ� ����� ���� ���� �����ϴ�"
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "�� �ð�"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Ÿ������ ���� ���"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -738,182 +1038,162 @@ msgstr ""
 "�� ����� ��������\n"
 "���۳�¥�� ������??�ϴ�."
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "��¥ ����"
 
-#: ../datebook_gui.c:3021
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "DateBookDB ���޴��� ���� = %d\n"
 
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "DatebookDB���� �˷����� ���� �ݺ����� �߰�\n"
-
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a., %s"
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (����)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "��"
 
-#: ../datebook_gui.c:4206
-msgid "W"
-msgstr "W"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "�ִ��� ��Ӻ���"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "��"
 
-#: ../datebook_gui.c:4218
-msgid "M"
-msgstr "M"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "������ ��Ӻ���"
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Cats"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "�ð�"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "�� �� ����"
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "����"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "����"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "�˶�"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "��"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "�� ��ǿ��� Ư�� �ð� ������ ����"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "��¥:"
 
-#: ../datebook_gui.c:4493
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "���� ����"
 
-#: ../datebook_gui.c:4507
-msgid "Start Time"
-msgstr "���� �ð�"
-
-#: ../datebook_gui.c:4525
-msgid "End Time"
-msgstr "���� �ð�"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "���� ����"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "DateBk ����ǥ"
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "��"
 
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "��"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "�� ����� �ݺ����� ����"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "���� ����: ��"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "��"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "���� ����"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "��"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "�ݺ� ����"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "��"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "�ݺ� ����:"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "����"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "��"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "��"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "��ȭ �ɱ�"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "���λ� 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "���λ� 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "���λ� 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "��ȭ ��ȣ:"
 
@@ -921,228 +1201,138 @@ msgstr "
 msgid "Extension"
 msgstr "Ȯ��"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "��ȭ�ɱ� ����"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "����"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "���� ������"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "���������� �ڷ� ����"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Ctrl�� Shift Ű�� ����ϼ���"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "�鿩����"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "���� ������ ���丮�� �����Ϸ���, �Ʒ��� ���� �Է��ϰ� TAB�� ġ����"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "�Ϸ�"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "�鿩�� ���� ����"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "��ǥ�� ���� ������ ������ "
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "�ڷᰡ ���� ������ �������� ����"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "�鿩���� ���� ����: [%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "�ڷᰡ ���� ���ַ� �Էµ� [%s]"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "��� �鿩����"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "�dzʶٱ�"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "��ġ"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "���� ������ ���丮�� �����Ϸ���, �Ʒ��� ���� �Է��ϰ� TAB�� ġ����"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "��ġ�� ���ϵ�"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "�鿩�� ���� ����"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "�߰�"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "��ġ�� ���ϵ�"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "����"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "��ġ"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/����/����� �Է�"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "����� �̸�"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "����� ID"
 
-#: ../jpilot-dump.c:95
-#, fuzzy
-msgid " +D +A +T +M format like date +format.\n"
-msgstr "��¥ +format�� ���� +B +M +A +T ����\n"
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr "-v ���� ���� ������ �� ������.\n"
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr "-h ���� ������ �� ������.\n"
-
-#: ../jpilot-dump.c:98
-msgid " -f displays help for format codes.\n"
-msgstr "-f ���� �ڵ� ���� �����ֱ�.\n"
-
-#: ../jpilot-dump.c:99
-msgid " -D dump DateBook.\n"
-msgstr "-D DateBook �����ϱ�\n"
-
-#: ../jpilot-dump.c:100
-msgid " -N dump appts for today in DateBook.\n"
-msgstr "-N DateBook���� ���� ��� ����\n"
-
-#: ../jpilot-dump.c:101
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr "-NYYYY/MM/DD Datebook�� YYYY/MM/DD�� ��� ����.\n"
-
-#: ../jpilot-dump.c:102
-msgid " -A dump Address book.\n"
-msgstr "-A �ּҷ� ����\n"
-
-#: ../jpilot-dump.c:103
-msgid " -T dump ToDo list as CSV.\n"
-msgstr "-T CSV�� ���� ��� ����.\n"
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr "-M �޸� ����.\n"
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-"��Ʈ/���ۼӵ�/����� ����, ��Ÿ ������ ��� ���� J-Pilot ���û����� �б�.\n"
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr "-v = ����\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr "-h = ����\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = ����׸��� ����\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = �÷������� ����� �ʱ�.\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = ��ũ�� �� ����ϱ�, �������� �ʴٸ� ��ũ�� �ϱ�.\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l = �ݺ�, �������� �ʴٸ� ��ũ�� �� ����.\n"
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr " -p {port} = ��ũ�� ���� ���û��� ���� ��� �� ��Ʈ ���\n"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Ÿ������ ���� ���� ����: \"%s\"\n"
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "�μ�"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "�� �������� �μ������� �ȵ˴ϴ�."
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "�� �������� �鿩���� ������ �ȵ˴ϴ�."
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "�� �������� �������� ������ �ȵ˴ϴ�."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "��ũ ���"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "�� ���� �ֱ� ��ũ�� �Ͱ� ������ ����� �̸�\n"
@@ -1151,14 +1341,16 @@ msgstr ""
 "�� �𸣰ڴٸ� ����� �������� �о�ʽÿ�."
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "�� �ʿ��� ����� id�� �����ϴ�.\n"
@@ -1169,245 +1361,225 @@ msgstr ""
 "����ϰų� �޴��� ����� �Է��� ����Ͻʽÿ�.\n"
 "�� �𸣰ڴٸ� ����� �������� �о�ʽÿ�."
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "��ũ ���"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "��ũ ����ϱ�"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "��ũ ����"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr " �����: "
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "��ũ ���� �� �˷����� ���� ����\n"
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "���� %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/����(_F)"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/����/tear"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/����/�(_F)"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/����/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/����/��ġ�ϱ�(_I)"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/����/�鿩����"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/����/��������"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/����/���û���"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/����/�μ�(_P)"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/����/����� �Է�"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/����/�� �����ϱ�"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/����/����(_Q)"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/����(_V)"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/����/���� �ڷ� ���߱�"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/����/���� �ڷ� ǥ���ϱ�"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/����/���� �ڷ� ����ũ"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/����/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/����/��������"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/����/�ּҷ�"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/����/����"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/����/�޸�"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/�÷�����(_P)"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/��(_W)"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/��/�ݽ�����"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/��/������"
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/��/������"
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/��/�����"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/��/GnomeUrl"
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/��/Lynx"
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/��/Links"
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/��/W3M"
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/��/��Ŀ��"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/����(_H)"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/����/PayBack ���α׷�"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/����/J-Pilot�� ���Ͽ�"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/�÷�����(_P)/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/����(_H)/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr "�۲� ���� ��ȭ����"
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "�޷�:���� ����(_s):0"
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "�÷������� �ε����� ����.\n"
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "��� �˶� ����.\n"
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "���� �˶� ����.\n"
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "�������� �� �� ����\n"
 
-#: ../jpilot.c:2422
-msgid " User: "
-msgstr " �����: "
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "�����"
-
-#: ../jpilot.c:2649
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "���� ���� ǥ���ϱ�   Ctrl-Z"
 
-#: ../jpilot.c:2654
-msgid "Show private records"
-msgstr "���� ���� ǥ���ϱ�"
-
-#: ../jpilot.c:2659
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "���� ���� ���߱�   Ctrl-Z"
 
-#: ../jpilot.c:2664
-msgid "Hide private records"
-msgstr "���� ���� ���߱�"
-
-#: ../jpilot.c:2669
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "���� ���� ����ũ   Ctrl-Z"
 
-#: ../jpilot.c:2674
-msgid "Mask private records"
-msgstr "���� ���� ����ũ"
-
-#: ../jpilot.c:2684
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "����ũž���� ���� ��ũ�ϱ� Ctrl-Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
-msgid "Font"
-msgstr "�۲�"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "�ּҷ� ��ũ"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1415,41 +1587,43 @@ msgstr ""
 "���� ����ũž���� ��ũ�� ��\n"
 "����ϱ�"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "��������/���÷� ����"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "�ּҷ�"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "���� ���"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "�޸���"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "���� �ϱ�"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "���߿� �˷��ֱ�"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "�ٽ� �˷����� ����"
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 "J-Pilot�� GTK2 �׷��� ��Ŷ�� ����ϰ� �ֽ��ϴ�. �� ������ ��Ŷ�� UTF-8�����"
 "�Ͽ� ���ڸ� ��ȣȭ�մϴ�.\n"
@@ -1457,747 +1631,1202 @@ msgstr ""
 "(���� ��� �Ǽ�Ʈ).\n"
 "\n"
 
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr "�޴��� ���� \""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
-msgstr "\" �׸��� �ٲٱ� \""
-
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "���� �� "
 
-#: ../jpilot.c:2898
-msgid "\"."
-msgstr "\"."
-
-#: ../jpilot.c:2900
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "UTF-I ��ȣȭ ����"
 
-#: ../libplugin.c:153
-#, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "�˷����� ���� PC header ���� = %d\n"
-
-#: ../libplugin.c:416
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d ���� ���� ����: %s\n"
+#: ../jpilot-dump.c:92
+#, fuzzy, c-format
+msgid " +D +A +T +M format like date +format.\n"
+msgstr "��¥ +format�� ���� +B +M +A +T ����\n"
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d ���� �б� ����: %s\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr "-v ���� ���� ������ �� ������.\n"
 
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
-msgstr ""
-"�� �ڷ�� �̹� �����Ǿ���.\n"
-"���� ��ũ�� �� �ʿ��� ������ ������\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr "-h ���� ������ �� ������.\n"
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-msgid "Unable to open PC records file\n"
-msgstr "PC �ڷ������� �� �� ����\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr "-f ���� �ڵ� ���� �����ֱ�.\n"
 
-#: ../libplugin.c:493 ../utils.c:1959
-msgid "Couldn't find record to delete\n"
-msgstr "������ �ڷḦ ã�� �� ����\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr "-D DateBook �����ϱ�\n"
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "Unknown header version %d\n"
-msgstr "�˷����� ���� ��� ���� %d\n"
-
-#: ../libplugin.c:524
-msgid "Couldn't open PC records file\n"
-msgstr "PC �ڷ� ������ �� �� ����\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
-#, c-format
-msgid "Error opening file: %s\n"
-msgstr "���� ���� ����: %s\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr "-N DateBook���� ���� ��� ����\n"
 
-#: ../libplugin.c:714
-msgid "Error reading PC file 1\n"
-msgstr "PC ������ �� �� ���� 1\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr "-NYYYY/MM/DD Datebook�� YYYY/MM/DD�� ��� ����.\n"
 
-#: ../libplugin.c:730
-msgid "Error reading PC file 2\n"
-msgstr "PC ������ �� �� ���� 2\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr "-A �ּҷ� ����\n"
 
-#: ../libplugin.c:903
-#, c-format
-msgid "Error reading %s 5\n"
-msgstr "���� �б� ���� %s 5\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr "-T CSV�� ���� ��� ����.\n"
 
-#: ../log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "��� ������ �� �� ����, ����.\n"
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr "-M �޸� ����.\n"
 
-#: ../log.c:102
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "���� ������ �� �� ����\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "�޸� �ؽ�ũ ũ�� > 65535, �߶�\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "������ �� �� ����: %s\n"
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "�޸� �鿩���� %s\n"
-
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "������ memopad.dat ������ �ƴѵ���\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "�޸� %d�� �������� �� �� ����\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "���� ����"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "�� ��й�ȣ"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Ʋ����, �� ��й�ȣ�� �ٽ� �Է��ϼ���"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "�� ��й�ȣ�� �Է��ϼ���"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "���� ����"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "%s%s ���� 1�� �д� ����: [%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
-msgstr "�߸��� ����\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
-msgstr "���û���->�������� �����ϼ���\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
-"�÷����� [%s]�� ���µ� ����\n"
-"���� [%s]\n"
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " �÷������� Ÿ������ ����: [%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: ../plugins.c:296
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "�÷�����: [%s]\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../plugins.c:297
+#: ../jpilot-merge.c:299
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "�� �÷������� ���� (%d.%d).\n"
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "J-Pilot ������ ���߾� �۵��ϱ� �ʹ� �����Ǿ����ϴ�.\n"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
-msgstr "%B %d, %Y"
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+"��Ʈ/���ۼӵ�/����� ����, ��Ÿ ������ ��� ���� J-Pilot ���û����� �б�.\n"
 
-#: ../prefs.c:394
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr "-v ������ ������ �ɼ��� ǥ���ϰ� ����.\n"
 
-#: ../prefs.c:395
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr "-d ����� ������ ǥ��������� ǥ��.\n"
+
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr " -p �÷����� �ε��� �dzʶ�.\n"
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l = �ݺ�, �������� �ʴٸ� ��ũ�� �� ����.\n"
+
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr " -p {port} = ��ũ�� ���� ���û��� ���� ��� �� ��Ʈ ���\n"
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "���� ���� ����: %s\n"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "������ ���� �� ����: next_id\n"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "����"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "����� Ȩ ȯ�������� �ʹ� ��ϴ�.\n"
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"�� �ڷ�� �̹� �����Ǿ���.\n"
+"���� ��ũ�� �� �ʿ��� ������ ������\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "PC �ڷ������� �� �� ����\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "������ �ڷḦ ã�� �� ����\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "�˷����� ���� ��� ���� %d\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d ���� ���� ����: %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d ���� �б� ����: %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "���� ���� ����: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "���� �б� ���� %s 5\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "PC ������ �� �� ���� 1\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "PC ������ �� �� ���� 2\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "�˷����� ���� PC header ���� = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "��� ������ �� �� ����, ����.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "���� ������ �� �� ����\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "�޸� �ؽ�ũ ũ�� > 65535, �߶�\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "�޸� �鿩���� %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "������ memopad.dat ������ �ƴѵ���\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "�޸� %d�� �������� �� �� ����\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "�޸���"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "���� ����"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "�� ��й�ȣ"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Ʋ����, �� ��й�ȣ�� �ٽ� �Է��ϼ���"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "�� ��й�ȣ�� �Է��ϼ���"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "���� �б� ����: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "���� ����"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "%s%s ���� 1�� �д� ����: [%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "�߸��� ����\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "���û���->�������� �����ϼ���\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"�÷����� [%s]�� ���µ� ����\n"
+"���� [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " �÷������� Ÿ������ ����: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "�÷�����: [%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "�� �÷������� ���� (%d.%d).\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "J-Pilot ������ ���߾� �۵��ϱ� �ʹ� �����Ǿ����ϴ�.\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr "%B %d, %Y"
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr "%d. %B %Y"
 
-#: ../prefs.c:396
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr "%d %B, %Y"
 
-#: ../prefs.c:397
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr "%Y. %B. %d"
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr "%Y %B %d"
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "���û���"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "������"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "����"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr "��������"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "����"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "�޸�"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "�˶�"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "������"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "���� ��¥ ���� "
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "�� ��¥ ���� "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "�ð� ���� "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "������ ���� ���� "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "�� GTK �� ���� "
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "���� ��Ʈ (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "��ũ ����"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr "���� �ӵ� (USB�� ������ ��ġ�� ����)"
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "��� ����"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "���� �ڷ� �����ֱ� (�⺻�� �ƴϿ�)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "����� ���� �ڷ� �����ֱ� (�⺻�� �ƴϿ�)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "���� ��ġ (J-Pilot -> PDA) �� �� Ȯ�� (�⺻�� ��)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "�˾� ���� �����ֱ� (�⺻�� ��)"
 
-#. ********************************************************************
-#. Datebook preference tab
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "����ִ� ��¥�� �޷¿��� �����ϱ�"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr "��/��/���� ���⿡�� ������ �ּ�ó��"
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr "��/��/���� ���⿡�� �ų� ������� �߰�"
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "DateBk ��Ʈ �� ����ϱ�"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "�� ���������� DateBk ������ ���� ����"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
-msgstr "��/��/���� ���⿡�� ������ �ּ�ó��"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
+msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
-msgstr "��/��/���� ���⿡�� �ų� ������� �߰�"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
+msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "���� ����"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s�� �̸��� �ּҷ� ��ġ��"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "�Ϸ�� ���� �����"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "���� �������� �ƴ� ���� �����"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "�ڷ� �Ϸ� ��¥"
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Manana ����Ÿ���̽� ���"
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "������¥�� �⺻�� ���"
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Memo32 ��� (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "��� ȯ�⸦ ���� �˶� â ����"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "�� ������ ����"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "���: ������ �� ������ �����ϴ� ���� ������ �� �ֽ��ϴ�!!!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "�˶� ����"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t�� �˶��ð����� ��ġ��"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d�� �˶� ��¥�� ��ġ��"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D�� �˶� ���� �������� ��ġ��"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N�� �˶� ��Ʈ�� ��ġ��"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (��� ��ġ)�� ������ ���α׷����� �������� ����"
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (��Ʈ ��ġ)�� ������ ���α׷����� �������� ����"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "�������� ��ũ"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "�ּҷ� ��ũ"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "���� ��ũ"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "�޸� ��ũ"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "�޸�32 ��ũ (pedit32)"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Manana ��ũ"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "J-OS (�Ϻ��� ���� �ƴ�:WorkPad/CLIE) ����ϱ�"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "��ũ %s (%s)"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "�μ� ���û���"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "���� ũ��"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "�Ϻ� �μ�"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "�ֺ� �μ�"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "���� �μ�"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "�ڷ� �ϳ�"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "%s �ڷ� ������"
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "�� ������ ��� �ڷ�"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "��� �ڷ� �μ�"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "�ʴ� �ϳ��� �ڷ�"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " �� �ڷ� ���̿� �� ��"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "�μ� ���� (��. lpr, Ȥ�� cat > file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "�� ����"
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "��ġ�� ���ϵ�"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "����� ���� �����ϱ� ����:"
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1. �����ϱ⸦ ���ϴ� ��� �������α׷��� ����. �⺻���� ���."
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. ����� �̸��� ����� ID�� �Է�"
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Ȯ�� ��ư ������"
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "�̰��� ���� �ʿ� �ִ� �ڷḦ ��� ���Դϴ�."
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "����� �̸�"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "��������"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "�ּҷ�"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "����"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "�޸�"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "�޸�"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "�÷����� ?"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "�߰ߵ� �ڷᰡ ����"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "�"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "�: "
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "��ҹ��� ����"
 
-#: ../sync.c:139
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "������� ���� ����\n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "��� ����\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "��ũ ������ pid %d�� ���� �����\n"
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "������� ����\n"
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "��ũ�� pid %d�� ���� ���\n"
 
-#: ../sync.c:244
-#, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s: ũ���̵��� �ֽ�ũ ��ư�� �����ų� \"kill %d\"�� ����\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "������Ʈ�� ������ �����ϼ���\n"
 
-#: ../sync.c:297
-#, c-format
-msgid "Exiting with status %s\n"
-msgstr "%s ���·� ������\n"
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "Ȩ���丮�� ���� �� �����ϴ�\n"
 
-#: ../sync.c:298
-msgid "Finished\n"
-msgstr "�����\n"
+#: ../sync.c:1085 ../sync.c:1423
+#, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (���� ID '%s') ������Ʈ ��, ��������� �dzʶ�.\n"
 
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
-msgstr "����� ���� ��ġ�ϱⰡ �����.\n"
+#: ../sync.c:1089 ../sync.c:1427
+#, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "'%s' �������� �� (���� ID '%s')... "
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "������Ʈ�� ������ �����ϼ���\n"
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "����, %s ������ ������ �� �����ϴ�.\n"
 
-#: ../sync.c:674
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
-msgid " Syncing on device %s\n"
-msgstr " %s ��ġ���� ��ũ��\n"
+msgid "Failed, unable to back up database %s\n"
+msgstr "����, %s �����ͺ��̽��� ����� �� �����ϴ�.\n"
 
-#: ../sync.c:675
-msgid " Press the HotSync button now\n"
-msgstr " ���� �ֽ�ũ ��ư�� ��������\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "Ȯ��\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:1304
 #, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "�ֱ� ��ũ�� ������̸�-->\"%s\"\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "%s �dzʶ� (���� ID '%s')\n"
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:1498
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "�ֱ� ��ũ�� ����� ID-->\"%d\"\n"
+msgid "Installing %s "
+msgstr "%s ��ġ �� "
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr " �� ������̸�-->\"%s\"\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"������ �� �� �����ϴ�: '%s': %s!\n"
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:1508
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr " �� ����� ID-->%d\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"������ ��ũ�� �� �����ϴ�: '%s': ���� ����?\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(���� ID�� '%s')..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(���� ID�� '%s')..."
 
-#: ../sync.c:795
+#: ../sync.c:1530
 #, c-format
-msgid "Username is \"%s\"\n"
-msgstr "����� �̸��� \"%s\"\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:796
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid "User ID is %d\n"
-msgstr "����� ID�� %d\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"������ ���� �����ϴ�: %s\n"
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:1615
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "�ֱ� ��ũ�� PC = %d\n"
+msgid "Install %s failed"
+msgstr "%s ��ġ ����"
 
-#: ../sync.c:799
-#, c-format
-msgid "This PC = %lu\n"
-msgstr "�� PC = %lu\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "����.\n"
 
-#: ../sync.c:800
-#, c-format
-msgid "Last Username = [%s]\n"
-msgstr "�ֱ� ������̸� = [%s]\n"
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s ��ġ�� "
 
-#: ../sync.c:801
+#: ../sync.c:1736
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "�ֱ� �����ID = %d\n"
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d %s ���α׷� ������ �������� �� ����\n"
 
-#: ../sync.c:802
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "������̸� = [%s]\n"
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d %s ���α׷� ���� ���� �� ����\n"
 
-#: ../sync.c:803
+#: ../sync.c:1763
 #, c-format
-msgid "userID = %d\n"
-msgstr "�����ID = %d\n"
-
-#: ../sync.c:821
-msgid "Sync canceled\n"
-msgstr "��ũ ���\n"
-
-#: ../sync.c:843
-msgid "Finished restoring handheld.\n"
-msgstr "�� ���� �Ϸ�.\n"
-
-#: ../sync.c:844
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "J-Pilot�� ������Ʈ�ϱ� ���� ��ũ�� �ʿ䰡 �ֽ��ϴ�.\n"
-
-#: ../sync.c:874
-msgid "Doing a fast sync.\n"
-msgstr "���� ��ũ ������.\n"
+msgid "Error reading appinfo block for %s\n"
+msgstr "%s ���α׷� ���� ������ �д� �� ����\n"
 
-#: ../sync.c:913
-msgid "Doing a slow sync.\n"
-msgstr "���� ��ũ ������.\n"
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "�������� %s ���ָ� �߰��� �� �����ϴ�.\n"
 
-#: ../sync.c:1014
-msgid "Thank you for using J-Pilot."
-msgstr "J-Pilot�� ������ּż� �����մϴ�."
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "���ݻ� �ʹ� ���� ���ְ� �ֽ��ϴ�.\n"
 
-#: ../sync.c:1056
-msgid "Finished.\n"
-msgstr "�Ϸ�.\n"
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "%s �� ����ũž�� ��� �ڷᰡ %s�� �Ű��� ���Դϴ�.\n"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "%s ��ũ��\n"
 
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "%s �ڷḦ ���."
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "%s �ڷ� ��� ����"
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "%s �ڷ� ���� ����"
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "%s �ڷ� ������"
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "%s �ڷ� ������"
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "%s �ڷ� ��ϵ�"
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "%s �ڷ� ��� ����"
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "%s �ڷ� ���� ����"
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "%s �ڷ� ������"
 
-#: ../sync.c:1133
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "number of records = %d\n"
-msgstr "�ڷ� �� = %d\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
 
-#: ../sync.c:1260 ../sync.c:2435
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
+
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2205,780 +2834,836 @@ msgstr ""
 "dlp_�ڷ����(_D) ����\n"
 "�ڷᰡ �̹� �ʿ��� �����Ǿ��� ������ �� �ֽ��ϴ�.\n"
 
-#: ../sync.c:1358 ../sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (���� ID '%s') ������Ʈ ��, ��������� �dzʶ�.\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "����� ���� ��ġ�ϱⰡ �����.\n"
 
-#: ../sync.c:1362 ../sync.c:1774
+#: ../sync.c:3094
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "'%s' �������� �� (���� ID '%s')... "
+msgid " Syncing on device %s\n"
+msgstr " %s ��ġ���� ��ũ��\n"
 
-#: ../sync.c:1369 ../sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "����, %s ������ ������ �� �����ϴ�.\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " ���� �ֽ�ũ ��ư�� ��������\n"
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "����, %s �����ͺ��̽��� ����� �� �����ϴ�.\n"
-
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "Ȯ��\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "�ֱ� ��ũ�� ������̸�-->\"%s\"\n"
 
-#: ../sync.c:1687
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "%s �dzʶ� (���� ID '%s')\n"
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "�ֱ� ��ũ�� ����� ID-->\"%d\"\n"
 
-#: ../sync.c:1861
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid "Installing %s "
-msgstr "%s ��ġ �� "
+msgid " This Username-->\"%s\"\n"
+msgstr " �� ������̸�-->\"%s\"\n"
 
-#: ../sync.c:1867
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"������ �� �� �����ϴ�: '%s': %s!\n"
+msgid " This User ID-->%d\n"
+msgstr " �� ����� ID-->%d\n"
 
-#: ../sync.c:1871
+#: ../sync.c:3204
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"������ ��ũ�� �� �����ϴ�: '%s': ���� ����?\n"
+msgid "Username is \"%s\"\n"
+msgstr "����� �̸��� \"%s\"\n"
 
-#: ../sync.c:1883
+#: ../sync.c:3205
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(���� ID�� '%s')..."
+msgid "User ID is %d\n"
+msgstr "����� ID�� %d\n"
 
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
+#: ../sync.c:3207
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"������ ���� �����ϴ�: %s\n"
+msgid "lastSyncPC = %d\n"
+msgstr "�ֱ� ��ũ�� PC = %d\n"
 
-#: ../sync.c:1960
+#: ../sync.c:3208
 #, c-format
-msgid "Install %s failed"
-msgstr "%s ��ġ ����"
-
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "����.\n"
+msgid "This PC = %lu\n"
+msgstr "�� PC = %lu\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
-#, c-format
-msgid "Installed %s "
-msgstr "%s ��ġ�� "
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "��ũ ���\n"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "������ �� �� �����ϴ�: %s%s\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "�� ���� �Ϸ�.\n"
 
-#: ../sync.c:2180
-msgid "Unable to read home dir\n"
-msgstr "Ȩ���丮�� ���� �� �����ϴ�\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "J-Pilot�� ������Ʈ�ϱ� ���� ��ũ�� �ʿ䰡 �ֽ��ϴ�.\n"
 
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "��: �ڷ� �� = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "���� ��ũ ������.\n"
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "��ũ: �ڷ� �� = %d\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "���� ��ũ ������.\n"
 
-#: ../sync.c:2888
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d %s ���α׷� ������ �������� �� ����\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "J-Pilot�� ������ּż� �����մϴ�."
 
-#: ../sync.c:2894 ../sync.c:2936
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d %s ���α׷� ���� ���� �� ����\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "�Ϸ�.\n"
 
-#: ../sync.c:2916 ../sync.c:2928
+#: ../sync.c:3446
 #, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "%s ���α׷� ���� ������ �д� �� ����\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
+#: ../sync.c:3447
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "�������� %s ���ָ� �߰��� �� �����ϴ�.\n"
-
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
-msgstr "���ݻ� �ʹ� ���� ���ְ� �ֽ��ϴ�.\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "%s �� ����ũž�� ��� �ڷᰡ %s�� �Ű��� ���Դϴ�.\n"
+msgid "Exiting with status %s\n"
+msgstr "%s ���·� ������\n"
 
-#: ../todo.c:248
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "���� ���� �ý�Ʈ > %d, %d���� �߷���\n"
 
-#: ../todo.c:255
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "���� ��Ʈ �ؽ�Ʈ > %d, %d���� �߷���\n"
 
-#: ../todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d %s ���� ���� ���� �� ����\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "�Ϸ� ��¥"
 
-#: ../todo_gui.c:535
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "������ todo.dat ������ �ƴѵ���\n"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "���� %d�� �������� �� �� ����\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "�Ϸ� ��¥"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "�Ϸ� ��¥"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "�켱����: "
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "�Ϸ�"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "�켱������ ���� ����\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "��¥ ����"
 
-#. The completed check box
-#: ../todo_gui.c:2206
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "�Ϸ�"
 
-#: ../todo_gui.c:2214
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "�켱����: "
 
-#: ../todo_gui.c:2234
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "��� ��¥:"
 
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "��Ʈ"
+#: ../utils.c:330
+msgid "Today"
+msgstr "����"
 
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
-msgstr "-v ������ ������ �ɼ��� ǥ���ϰ� ����.\n"
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "�� DB���� %s��(��) � �� ����: %s\n"
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
-msgstr "-d ����� ������ ǥ��������� ǥ��.\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " ��ġ�� �� ���� ��.\n"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "%s ���丮�� ���� �� �����ϴ�.\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s�� ���丮�Դϴ�."
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "%s ���丮�� ������ �� �� �����ϴ�.\n"
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "�ٲ� �ڷḦ �����Ͻðڽ��ϱ�?"
+
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "�ٲ� ������ �� �ڷῡ �����Ͻðڽ��ϱ�?"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "�� �ڷḦ �����Ͻðڽ��ϱ�?"
+
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "�� �� �ڷḦ �����Ͻðڽ��ϱ�?"
 
-#: ../utils.c:75
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "���� ����, ���߱�\n"
+
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr " -p �÷����� �ε��� �dzʶ�.\n"
 
-#: ../utils.c:76
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr " -a �ֱ� ���α׷��� ����� �̷��� ��ģ �˶��� ����.\n"
 
-#: ../utils.c:77
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A ��� ���ſ� �̷��� �˶��� ����.\n"
 
-#: ../utils.c:78
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i ���α׷��� �����Ű�ڸ��� �����ܻ��·� ����.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " PILOTPORT�� PILOTRATE ȯ�������� �̿��� �� ����\n"
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " ��� ��Ʈ�� ��� ���� �ӵ��� ��ũ�� ������\n"
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " PILOTPORT�� ���������� �ʴٸ� �⺻���� /dev/pilot��.\n"
 
-#: ../utils.c:107
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "���� �б� ����"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "��¥ �����ϵ�"
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "�� �ɼǵ��� ������ �����ϵ�:"
 
-#: ../utils.c:110
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "��ġ�� �н�"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link ����"
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "USB ����"
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "��"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-msgid "no"
-msgstr "�ƴϿ�"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "���� �ڷ� ����"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "�ƴϿ�"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "�������� ����"
 
-#: ../utils.c:134
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "�÷����� ����"
 
-#: ../utils.c:140
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Manana ����"
 
-#: ../utils.c:146
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "NLS ���� (�ܱ���)"
 
-#: ../utils.c:152
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "GTK2 ����"
 
-#: ../utils.c:207
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %A, %x %X"
-msgstr "������ %A, %x %X"
-
-#: ../utils.c:209
-#, c-format
-msgid "Today is %%A, %s %s"
-msgstr "������ %%A, %s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "����"
+msgid "Can't get HOME environment variable\n"
+msgstr "Ȩ ȯ�� ������ ���� �� �����ϴ�\n"
 
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "�ٲ� �ڷḦ �����Ͻðڽ��ϱ�?"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
+msgstr "����� Ȩ ȯ�������� �ʹ� ��ϴ�.\n"
 
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "�ٲ� ������ �� �ڷῡ �����Ͻðڽ��ϱ�?"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "���� ����"
 
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "�� �ڷḦ �����Ͻðڽ��ϱ�?"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC ID�� 0.\n"
 
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "�� �� �ڷḦ �����Ͻðڽ��ϱ�?"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "�� PC ID�� �����Ǿ����ϴ�. %lu\n"
 
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
-msgid "Can't get HOME environment variable\n"
-msgstr "Ȩ ȯ�� ������ ���� �� �����ϴ�\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "����� Ȩ ȯ�������� �ʹ� ��ϴ�.\n"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "������ %A, %x %X"
 
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
+#: ../utils.c:3539
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr "%s ���丮�� ���� �� �����ϴ�.\n"
+msgid "Today is %%A, %s %s"
+msgstr "������ %%A, %s %s"
 
-#: ../utils.c:1399
+#: ../utils.c:3768
 #, c-format
 msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
-"%s�� ���丮�� �ƴ� ����.\n"
-"���丮���� �� �ʿ䰡 ����.\n"
-
-#: ../utils.c:1405
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "%s ���丮�� ������ �� �� �����ϴ�.\n"
 
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "PC ����� ���Ͽ� ���� �� ����: next_id\n"
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
 msgstr "���� id�� ���Ͽ� ���� �� ����: next_id\n"
 
-#: ../utils.c:1483
-msgid "Error opening file: next_id\n"
-msgstr "������ ���� �� ����: next_id\n"
-
-#: ../utils.c:1657
-#, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "�� DB���� %s��(��) � �� ����: %s\n"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-msgid " may not be installed.\n"
-msgstr " ��ġ�� �� ���� ��.\n"
-
-#: ../utils.c:1839
-msgid "Error reading file"
-msgstr "���� �б� ����"
-
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC ID�� 0.\n"
-
-#: ../utils.c:2517
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "�� PC ID�� �����Ǿ����ϴ�. %lu\n"
-
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "�ֺ� ����"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "����Ʈ���ϸ���"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "����Ʈ����"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "���⿡"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "�����"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "ij����"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "����ũ"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (����)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "�ɶ���"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "������"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "����"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "ȫ��"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "���̽�����"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "�ε�"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "�ε��׽þ�"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "���Ϸ���"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "���¸�"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "�Ϻ�"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "�ѱ�"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "������"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "����������"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "�߽���"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "�״�����"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "��������"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "�븣����"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "P.R.C."
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "�ʸ���"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "�̰���"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "������"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "������"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "����������"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "�븸"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "�±�"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "����"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "�̱�"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "�����"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "�װ���"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "��ħ�Ļ�"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "����"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "����� �Ļ�"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "�ڵ��� ��Ʈ"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "����"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "����"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "�ѽ�"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "�⸧"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "����"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "ȣ��"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "�����"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "��Ź"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "������"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "����"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "����"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "���ϸ���"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "����"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "����"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "����"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "����ö"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "��ǰ"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "�ý�"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "��ȭ"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "��"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "�����"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "����"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
-msgstr "�Ƹ߽�"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr "�����: �˷����� ���� ��� ����\n"
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr "�����: �˷����� ���� ���� ����\n"
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "�Ƹ޸�ĭ �ͽ�������"
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "����"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "üũī��"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
-msgstr "ũ����ī��"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
+msgstr "ũ���� ī��"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
-msgstr "������ī��"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
+msgstr "������ ī��"
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "����"
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "����"
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr "�����: �˷����� ���� ����\n"
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr "�����: �˷����� ���� ��� ����\n"
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr "�����: �˷����� ���� ���� ����\n"
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr "�Ƹ޸�ĭ �ͽ�������"
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "ũ���� ī��"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "����:"
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr "������ ī��"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "��:"
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "����:"
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "����:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "����:"
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "��ȭ:"
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-msgid "Date:"
-msgstr "��¥:"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "��:"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "��¥:"
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "��:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "��:"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "����:"
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "����:"
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "������"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "Ű��: pack_KeyRing(): buf_size�� �ʹ� ����\n"
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "����Ȯ�� ����, Ű�� ��й�ȣ�� �ٽ� �Է��ϼ���"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "�� Ű�� ��й�ȣ�� ��������"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Ű�� ��й�ȣ�� ��������"
 
-#: ../KeyRing/keyring.c:1636
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "Ȩ ȯ�溯���� �ʹ� ��ϴ�(>1024)\n"
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "Ű��: ���� %s�� �߰ߵ��� ����.\n"
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "Ű��: ��ũ�� �õ��غ�����.\n"
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "��"
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "���"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "����"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "�޸� %d�� �������� �� �� ����\n"
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -2988,52 +3673,258 @@ msgstr ""
 "��\n"
 "��й�ȣ"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "���"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "����"
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "�̸�: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "����: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "��й�ȣ: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "��й�ȣ ����"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "�޸� ��ũ"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "�Ϸ�"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "������ ����ðڽ��ϱ�?"
+
+#~ msgid "Field"
+#~ msgstr "�ʵ�"
+
+#~ msgid "kana("
+#~ msgstr "����("
+
+#~ msgid "Quick View"
+#~ msgstr "���� ����"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "%s%s ������ �� �� ����\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "%s �˶� ������ �� �� ����\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "%s ���ִ� ������ �� �����ϴ�.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "%s ���ָ� ������ �� ����.\n"
+
+#~ msgid "category name"
+#~ msgstr "���� �̸�"
+
+#~ msgid "debug"
+#~ msgstr "�����˻�"
+
+#~ msgid "Close"
+#~ msgstr "�ݱ�"
+
+#~ msgid "none"
+#~ msgstr "����"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "DatebookDB���� �˷����� ���� �ݺ����� �߰�\n"
+
+#~ msgid "W"
+#~ msgstr "W"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "�� ��ǿ��� Ư�� �ð� ������ ����"
+
+#~ msgid "Start Time"
+#~ msgstr "���� �ð�"
+
+#~ msgid "End Time"
+#~ msgstr "���� �ð�"
+
+#~ msgid "Dismiss"
+#~ msgstr "����"
+
+#~ msgid "Done"
+#~ msgstr "�Ϸ�"
+
+#~ msgid "Add"
+#~ msgstr "�߰�"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "����� �̸�"
+
+#~ msgid " -v = version\n"
+#~ msgstr "-v = ����\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr "-h = ����\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = ����׸��� ����\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = �÷������� ����� �ʱ�.\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr " -b = ��ũ�� �� ����ϱ�, �������� �ʴٸ� ��ũ�� �ϱ�.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Ÿ������ ���� ���� ����: \"%s\"\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/����/PayBack ���α׷�"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "�۲� ���� ��ȭ����"
+
+#~ msgid "Clear"
+#~ msgstr "�����"
+
+#~ msgid "Show private records"
+#~ msgstr "���� ���� ǥ���ϱ�"
+
+#~ msgid "Hide private records"
+#~ msgstr "���� ���� ���߱�"
+
+#~ msgid "Mask private records"
+#~ msgstr "���� ���� ����ũ"
+
+#~ msgid "Font"
+#~ msgstr "�۲�"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "�޴��� ���� \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" �׸��� �ٲٱ� \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "PC �ڷ� ������ �� �� ����\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "������ ���� ���� "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "���� ��Ʈ (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "���� �ӵ� (USB�� ������ ��ġ�� ����)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "�޸�32 ��ũ (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "�ڷ� �ϳ�"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s: ũ���̵��� �ֽ�ũ ��ư�� �����ų� \"kill %d\"�� ����\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "�����\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "�ֱ� ������̸� = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "�ֱ� �����ID = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "������̸� = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "�����ID = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "��: �ڷ� �� = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "��ũ: �ڷ� �� = %d\n"
+
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i ���α׷��� �����Ű�ڸ��� �����ܻ��·� ����.\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s�� ���丮�� �ƴ� ����.\n"
+#~ "���丮���� �� �ʿ䰡 ����.\n"
+
+#~ msgid "AmEx"
+#~ msgstr "�Ƹ߽�"
+
+#~ msgid "CreditCard"
+#~ msgstr "ũ����ī��"
+
+#~ msgid "MasterCard"
+#~ msgstr "������ī��"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "�����: �˷����� ���� ����\n"
+
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "Ȩ ȯ�溯���� �ʹ� ��ϴ�(>1024)\n"
+
 #~ msgid "Quit"
 #~ msgstr "����"
diff --git a/po/nb.po b/po/nb.po
index acb46b52..fe24fad3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,670 +5,961 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JPilot\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2001-08-16 14:53GMT+1\n"
 "Last-Translator: Ragnar Wisløff <ragnar@wisloff.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "feil"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "Feil under lesing"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, fuzzy, c-format
 msgid "Error reading file: %s\n"
 msgstr "Feil under lesing"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "feil"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
 msgstr ""
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, fuzzy, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Kan ikke åpne loggfil\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Kan ikke åpne loggfil\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr ""
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr ""
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "Greit"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 #, fuzzy
 msgid "No"
 msgstr "Ingen"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 #, fuzzy
 msgid "Yes"
 msgstr "år"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr ""
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Feil under lesing"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr ""
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr ""
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, fuzzy, c-format
 msgid "Error opening file: %s"
 msgstr "Feil under lesing"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr ""
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-#, fuzzy
-msgid "Field"
-msgstr "Ferdig\n"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Kategori"
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Privat"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr ""
+
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr ""
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "Bedrift/Navn"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Navn/Bedrift"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Navn/Bedrift"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Bedrift/Navn"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr ""
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr ""
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, fuzzy, c-format
 msgid "executing command = [%s]\n"
 msgstr "Utfør denne kommandoen"
 
-#. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
-msgid "Category: "
-msgstr "Kategori"
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
+#: ../address_gui.c:2479
+msgid "Birthday"
 msgstr ""
 
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "Ferdig\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
 msgstr ""
 
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#. Category menu
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
+msgid "Category: "
+msgstr "Kategori"
+
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr ""
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr ""
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr ""
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 poster"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d av %d poster"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Navn"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Adresse"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Andre"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Notat"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
 msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 #, fuzzy
 msgid "Quick Find: "
 msgstr "Hurtigsøk"
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Angre"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr ""
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Slette"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 #, fuzzy
 msgid "Delete the selected record"
 msgstr "%d av %d poster"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete"
 msgstr "Slette"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete the selected record"
 msgstr "%d av %d poster"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 #, fuzzy
 msgid "Copy the selected record"
 msgstr "Legg til post"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Ny post"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 #, fuzzy
 msgid "Add a new record"
 msgstr "Legg til post"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Legg til post"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 #, fuzzy
 msgid "Add the new record"
 msgstr "Legg til post"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Lagre endringer"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr ""
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privat"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "Navn"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "Angre"
 
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "Adresse"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Fjern"
 
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "Andre"
+#: ../address_gui.c:4246
+msgid "Show In List"
+msgstr ""
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "Alle"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "Minn meg på"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
-msgstr ""
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "Dager"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "Kortversjon"
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Alle"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minutter"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Timer"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Minn meg på"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, fuzzy, c-format
-msgid "Unable to open %s%s file\n"
+msgid "Unable to open file: %s%s\n"
 msgstr "Kan ikke åpne loggfil\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Avtale-påminnelse"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Forbigåtte avtaler"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Utsatt avtale"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr ""
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
+msgid "PC file corrupt?\n"
 msgstr ""
 
-#: ../alarms.c:1531
-#, c-format
-msgid "Unable to open %s.alarms file\n"
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
+msgid "fseek failed - fatal error\n"
 msgstr ""
 
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
 #, fuzzy
 msgid "rename failed"
 msgstr "Innstallering av %s mislyktes"
 
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
-msgid "PC file corrupt?\n"
-msgstr ""
-
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
-msgid "fseek failed - fatal error\n"
-msgstr ""
-
-#: ../category.c:421
+#: ../category.c:407
 #, fuzzy
 msgid "Move"
 msgstr "Ma"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr ""
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr ""
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr ""
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr ""
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr ""
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr ""
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr ""
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr ""
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr ""
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
 msgstr ""
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr ""
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr ""
 
-#. correctly translate title
-#: ../category.c:813
+#. Category names in host character set
+#: ../category.c:733
 #, fuzzy
-msgid "category name"
+msgid "Category"
 msgstr "Kategori"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr ""
 
-#: ../category.c:845
+#: ../category.c:841
 #, fuzzy
 msgid "Rename"
 msgstr "Navn"
 
-#: ../category.c:960
-msgid "debug"
-msgstr ""
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr ""
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr ""
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr ""
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+msgid "It should be:"
 msgstr ""
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr ""
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr ""
 
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Gjenta på:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Gjenta på følgende dager: "
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Gjenta på:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Gjenta på følgende dager: "
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Gjenta på følgende dager: "
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Gjenta på følgende dager: "
+
 # These days of the week are put in the buttons above the calendar and
 # the little buttons in the repeat weekly window.
 # They should be one letter if possible.  The English ones get truncated to
 # one letter.
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Sø"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Ma"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Ti"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "On"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 #, fuzzy
 msgid "Th"
 msgstr "To"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Fr"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Lø"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Slutt-dato"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Gjenta på følgende dager: "
+
+#: ../datebook_gui.c:330
+#, c-format
+msgid "Number of exceptions: %d"
+msgstr ""
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Notat"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Alarm"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Gjenta på:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "ukedag"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 #, fuzzy
 msgid "Error"
 msgstr "feil"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr ""
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr ""
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr ""
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr ""
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr ""
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr ""
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr ""
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "Lukk"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Ingen"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 #, fuzzy
 msgid "Begin On Date"
 msgstr "Slutt-dato"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Slutt-dato"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr ""
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr ""
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -678,182 +969,165 @@ msgid ""
 "Which do you want?"
 msgstr ""
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr ""
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr ""
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "ingen"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "dag"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "uke"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "måned"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "år"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Du kan ikke ha en avtale som repeteres hver %d %s\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
 #, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr ""
 "Du kan ikke ha en avtale med ukentlig gjentagelse som ikke repeteres på en "
 "ukedag.\n"
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Ingen tid"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 #, fuzzy
 msgid "Invalid Appointment"
 msgstr "Forbigåtte avtaler"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
 msgstr ""
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Ingen forfallsdato"
 
-#: ../datebook_gui.c:3021
+#: ../datebook_gui.c:3491
 #, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
-msgstr ""
-
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr ""
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Uke"
 
-#: ../datebook_gui.c:4206
-#, fuzzy
-msgid "W"
-msgstr "On"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+msgid "View appointments by week   Ctrl+W"
 msgstr ""
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Måned"
 
-#: ../datebook_gui.c:4218
-#, fuzzy
-msgid "M"
-msgstr "Ma"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+msgid "View appointments by month   Ctrl+M"
 msgstr ""
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Katter"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Ingen tid"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr ""
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Forfall"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarm"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "Dager"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "Denne avtalen har ingen tidsangivelse"
-
-#: ../datebook_gui.c:4493
-msgid "Starts on"
-msgstr "Starter den"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+#, fuzzy
+msgid "Date:"
+msgstr "dato"
 
-#: ../datebook_gui.c:4507
+#. Start date and time
+#: ../datebook_gui.c:5280
 #, fuzzy
-msgid "Start Time"
+msgid "Start"
 msgstr "Starter den"
 
-#: ../datebook_gui.c:4525
+#. End date and time
+#: ../datebook_gui.c:5297
 #, fuzzy
-msgid "End Time"
-msgstr "Ingen tid"
+msgid "End"
+msgstr "Slutt-dato"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr ""
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Dag"
 
@@ -861,75 +1135,70 @@ msgstr "Dag"
 # msgstr "Pr. uke"
 # msgid "MonthView"
 # msgstr "Pr. mnd"
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "År"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Denne avtalen skal ikke gjentas"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Frekvens er"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "dag(er)"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Slutt-dato"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "uker(r)"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "Gjenta på følgende dager: "
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "måned(er)"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Gjenta på:"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "ukedag"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "dato"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "år"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr ""
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr ""
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr ""
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr ""
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr ""
 
@@ -937,508 +1206,391 @@ msgstr ""
 msgid "Extension"
 msgstr ""
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 #, fuzzy
 msgid "Dial Command"
 msgstr "Alarm-kommando"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr ""
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr ""
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr ""
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr ""
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr ""
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "For å bytte til en skjult katalog, angi den under og trykk TAB"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "Ferdig"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr ""
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr ""
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr ""
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr ""
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, fuzzy, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Alle poster i denne kategorien"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr ""
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr ""
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "/Arkiv/_Installere"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "For å bytte til en skjult katalog, angi den under og trykk TAB"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Filer som skal installeres"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr ""
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Legg til"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Filer som skal installeres"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Fjern"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "/Arkiv/_Installere"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/Arkiv/_Installer"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
+#: ../install_user.c:174 ../restore_gui.c:276
 #, fuzzy
-msgid "User name"
+msgid "User Name"
 msgstr "Navn"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 #, fuzzy
 msgid "User ID"
 msgstr "Navn"
 
-#: ../jpilot-dump.c:95
-msgid " +D +A +T +M format like date +format.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:98
-msgid " -f displays help for format codes.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:99
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr "Adressebok"
-
-#: ../jpilot-dump.c:100
-msgid " -N dump appts for today in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:101
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:102
-#, fuzzy
-msgid " -A dump Address book.\n"
-msgstr "Adressebok"
-
-#: ../jpilot-dump.c:103
-msgid " -T dump ToDo list as CSV.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr ""
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr ""
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr ""
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr ""
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr ""
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Det finnes ikke skriverstøtte for dette tillegget"
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 #, fuzzy
 msgid "There is no import support for this conduit."
 msgstr "Det finnes ikke skriverstøtte for dette tillegget"
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 #, fuzzy
 msgid "There is no export support for this conduit."
 msgstr "Det finnes ikke skriverstøtte for dette tillegget"
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Angre"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 #, fuzzy
 msgid "Cancel Sync"
 msgstr "Angre"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr ""
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 #, fuzzy
 msgid "Sync Problem"
 msgstr "Synkroniser notater"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+#, fuzzy
+msgid " User: "
+msgstr "Navn"
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr ""
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 #, fuzzy
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/_Arkiv/tear"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Arkiv/Skriv ut"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Arkiv/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Arkiv/_Installer"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 #, fuzzy
 msgid "/File/Import"
 msgstr "/Arkiv/Skriv ut"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 #, fuzzy
 msgid "/File/Export"
 msgstr "/Arkiv/Skriv ut"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Arkiv/Innstillinger"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Arkiv/Skriv ut"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 #, fuzzy
 msgid "/File/Install User"
 msgstr "/Arkiv/_Installer"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr ""
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Arkiv/Avslutt"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Vis"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 #, fuzzy
 msgid "/View/Hide Private Records"
 msgstr "/Vis/Gjem - visning av private poster"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 #, fuzzy
 msgid "/View/Show Private Records"
 msgstr "/Vis/Gjem - visning av private poster"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 #, fuzzy
 msgid "/View/Mask Private Records"
 msgstr "/Vis/Gjem - visning av private poster"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 #, fuzzy
 msgid "/View/sep1"
 msgstr "/Arkiv/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Vis/Kalender"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Vis/Adresser"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Vis/Huskeliste"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Vis/Notater"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 #, fuzzy
 msgid "/_Plugins"
 msgstr "/Tillegg"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 #, fuzzy
 msgid "/_Web"
 msgstr "On"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr ""
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr ""
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr ""
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr ""
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr ""
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr ""
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr ""
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr ""
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr ""
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/Hjelp/PayBack program"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 #, fuzzy
 msgid "/Help/About J-Pilot"
 msgstr "/Hjelp/J-Pilot"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, fuzzy, c-format
 msgid "/_Plugins/%s"
 msgstr "/Tillegg/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Hjelp/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr ""
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr ""
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr ""
 
-#: ../jpilot.c:2422
-#, fuzzy
-msgid " User: "
-msgstr "Navn"
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "Fjern"
-
-#: ../jpilot.c:2649
-#, fuzzy
-msgid "Show private records   Ctrl-Z"
-msgstr "/Vis/Gjem - visning av private poster"
-
-#: ../jpilot.c:2654
-#, fuzzy
-msgid "Show private records"
-msgstr "/Vis/Gjem - visning av private poster"
-
-#: ../jpilot.c:2659
+#: ../jpilot.c:1949
 #, fuzzy
-msgid "Hide private records   Ctrl-Z"
+msgid "Show private records   Ctrl+Z"
 msgstr "/Vis/Gjem - visning av private poster"
 
-#: ../jpilot.c:2664
+#: ../jpilot.c:1954
 #, fuzzy
-msgid "Hide private records"
+msgid "Hide private records   Ctrl+Z"
 msgstr "/Vis/Gjem - visning av private poster"
 
-#: ../jpilot.c:2669
-#, fuzzy
-msgid "Mask private records   Ctrl-Z"
-msgstr "Skriv ut alle poster"
-
-#: ../jpilot.c:2674
+#: ../jpilot.c:1959
 #, fuzzy
-msgid "Mask private records"
+msgid "Mask private records   Ctrl+Z"
 msgstr "Skriv ut alle poster"
 
-#: ../jpilot.c:2684
+#: ../jpilot.c:1971
 #, fuzzy
-msgid "Sync your palm to the desktop   Ctrl-Y"
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Synkroniser Palm'en med PC'en"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
+#: ../jpilot.c:1983
 #, fuzzy
-msgid "Font"
-msgstr "Måned"
+msgid "Stop Sync process"
+msgstr "Synkroniseradresser"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1446,1537 +1598,2019 @@ msgstr ""
 "Synkroniser Palm'en med PC'en\n"
 "Ta deretter sikkerhetskopi"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Kalender/Gå til i dag"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Huskeliste"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Notater"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr ""
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 #, fuzzy
 msgid "Remind me later"
 msgstr "Minn meg på"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr ""
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
-msgstr ""
-
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr ""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Tegnsett"
 
-#: ../jpilot.c:2898
-msgid "\"."
-msgstr ""
-
-#: ../jpilot.c:2900
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr ""
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:92
 #, c-format
-msgid "Unknown PC header version = %d\n"
+msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
 
-#: ../libplugin.c:416
-#, fuzzy, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "Feil under lesing"
-
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
-#, fuzzy, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "Feil under lesing"
+#: ../jpilot-dump.c:93
+#, c-format
+msgid " -v display version and exit\n"
+msgstr ""
 
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, c-format
+msgid " -h display help text\n"
 msgstr ""
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-msgid "Unable to open PC records file\n"
+#: ../jpilot-dump.c:95
+#, c-format
+msgid " -f display help for format codes\n"
 msgstr ""
 
-#: ../libplugin.c:493 ../utils.c:1959
-#, fuzzy
-msgid "Couldn't find record to delete\n"
-msgstr "Kan ikke åpne loggfil\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr "Adressebok"
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "Unknown header version %d\n"
+msgid " -i dump DateBook in iCalendar format\n"
 msgstr ""
 
-#: ../libplugin.c:524
-#, fuzzy
-msgid "Couldn't open PC records file\n"
-msgstr "Kan ikke åpne loggfil\n"
-
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
+#: ../jpilot-dump.c:98
 #, fuzzy, c-format
-msgid "Error opening file: %s\n"
-msgstr "Feil under lesing"
-
-#: ../libplugin.c:714
-#, fuzzy
-msgid "Error reading PC file 1\n"
-msgstr "Feil under lesing"
+msgid " -N dump appts for today in DateBook\n"
+msgstr "Adressebok"
 
-#: ../libplugin.c:730
-#, fuzzy
-msgid "Error reading PC file 2\n"
-msgstr "Feil under lesing"
+#: ../jpilot-dump.c:99
+#, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr ""
 
-#: ../libplugin.c:903
+#: ../jpilot-dump.c:100
 #, fuzzy, c-format
-msgid "Error reading %s 5\n"
-msgstr "Feil under lesing"
+msgid " -A dump Address book\n"
+msgstr "Adressebok"
+
+#: ../jpilot-dump.c:101
+#, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr ""
 
-#: ../log.c:95
+#: ../jpilot-dump.c:102
 #, fuzzy, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Kan ikke åpne loggfil, gir opp.\n"
+msgid " -M dump Memos\n"
+msgstr "Adressebok"
+
+#: ../jpilot-dump.c:163
+#, c-format
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../log.c:102
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
 #, fuzzy, c-format
-msgid "Unable to open log file\n"
+msgid "%s: Unable to open file:%s\n"
 msgstr "Kan ikke åpne loggfil\n"
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Imported Memo %s\n"
+msgid "Records added         = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:272
 #, c-format
-msgid "Can't export memo %d\n"
+msgid "Records modified      = %d\n"
 msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "Månedlig visning"
-
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Palm-passord"
-
-#: ../password.c:333
-#, fuzzy
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Angi Palm-passord"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "Angi Palm-passord"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
 msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
 msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
 msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
 msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
 msgstr ""
 
-#: ../plugins.c:296
-#, fuzzy, c-format
-msgid "Plugin:[%s]\n"
-msgstr "/Tillegg/%s"
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../plugins.c:297
+#: ../jpilot-merge.c:299
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
 msgstr ""
 
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
 msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
+#: ../jpilot-sync.c:64
+#, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
 msgstr ""
 
-#: ../prefs.c:394
-msgid "%d %B %Y"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, c-format
+msgid " -v display version and compile options\n"
 msgstr ""
 
-#: ../prefs.c:395
-msgid "%d. %B %Y"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, c-format
+msgid " -d display debug info to stdout\n"
 msgstr ""
 
-#: ../prefs.c:396
-msgid "%d %B, %Y"
+#: ../jpilot-sync.c:68
+#, c-format
+msgid " -P skip loading plugins\n"
 msgstr ""
 
-#: ../prefs.c:397
-msgid "%Y. %B. %d"
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
 msgstr ""
 
-#: ../prefs.c:398
-msgid "%Y %B %d"
+#: ../jpilot-sync.c:70
+#, c-format
+msgid " -l loop, otherwise sync once and exit\n"
 msgstr ""
 
-#: ../prefs_gui.c:334
+#: ../jpilot-sync.c:71
+#, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Feil under lesing"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Feil under lesing"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "feil"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr ""
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr ""
+
+#: ../libplugin.c:77 ../utils.c:1069
+#, fuzzy
+msgid "Couldn't find record to delete\n"
+msgstr "Kan ikke åpne loggfil\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr ""
+
+#: ../libplugin.c:180
+#, fuzzy, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "Feil under lesing"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, fuzzy, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "Feil under lesing"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, fuzzy, c-format
+msgid "Error opening file: %s\n"
+msgstr "Feil under lesing"
+
+#: ../libplugin.c:524
+#, fuzzy, c-format
+msgid "Error reading %s 5\n"
+msgstr "Feil under lesing"
+
+#: ../libplugin.c:799
+#, fuzzy
+msgid "Error reading PC file 1\n"
+msgstr "Feil under lesing"
+
+#: ../libplugin.c:815
+#, fuzzy
+msgid "Error reading PC file 2\n"
+msgstr "Feil under lesing"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr ""
+
+#: ../log.c:98
+#, fuzzy, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Kan ikke åpne loggfil, gir opp.\n"
+
+#: ../log.c:108
+#, fuzzy, c-format
+msgid "Unable to open log file\n"
+msgstr "Kan ikke åpne loggfil\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr ""
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr ""
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr ""
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr ""
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Notater"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Månedlig visning"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Palm-passord"
+
+#: ../password.c:306
+#, fuzzy
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Angi Palm-passord"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Angi Palm-passord"
+
+#: ../pidfile.c:69
+#, fuzzy
+msgid "removing stale pidfile\n"
+msgstr "Kan ikke åpne loggfil\n"
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Feil under lesing"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr ""
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr ""
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr ""
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr ""
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr ""
+
+#: ../plugins.c:297
+#, fuzzy, c-format
+msgid "Plugin:[%s]\n"
+msgstr "/Tillegg/%s"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr ""
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr ""
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr ""
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr ""
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr ""
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr ""
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
+msgstr ""
+
+#: ../prefs.c:423
+msgid "%Y %B %d"
+msgstr ""
+
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Språk"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 #, fuzzy
 msgid "Datebook"
 msgstr "Synkroniser dagbok"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 #, fuzzy
 msgid "ToDo"
 msgstr "Huskeliste"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 #, fuzzy
 msgid "Memo"
 msgstr "Synkroniser notater"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Alarm"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Tillegg"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "Kort datoangivelse "
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "Lang datoangivelse "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "Tidsangivelse "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "Første dag i uken er "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "Min GTK-fargefil er "
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Seriellport (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Synkroniser notater"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr ""
+#. Serial Rate
+#: ../prefs_gui.c:605
+#, fuzzy
+msgid "Serial Rate"
+msgstr "Seriell overføringshastighet "
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Antall kopier som skal arkiveres"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Vise slettede poster? (standard: nei)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Vise endrede slettede poster? (standard: nei)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr ""
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+msgid "Show popup tooltips (default YES) (requires restart)"
+msgstr ""
+
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr ""
 
-#. ********************************************************************
-#. Datebook preference tab
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Markere dager med avtaler"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr ""
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr ""
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 #, fuzzy
 msgid "Use DateBk note tags"
 msgstr "Bruk DateBk notat-markeringer"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr ""
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 #, fuzzy
 msgid "Mail Command"
 msgstr "Alarm-kommando"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, fuzzy, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%t erstattes med alarm-tidspunktet"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Gjem ferdige oppgaver?"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr ""
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr ""
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr ""
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr ""
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
 #, fuzzy
-msgid "Use Memo32 (pedit32)"
+msgid "Use Memo32 database (pedit32)"
 msgstr "Synkroniser notater"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Åpne alarmvinduer ved avtale-påminnelser"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Utfør denne kommandoen"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr ""
 "ADVARSEL: å utføre tilfeldige skall-kommandoer kan gi uforutsette resultater!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Alarm-kommando"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t erstattes med alarm-tidspunktet"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d erstattes med alarm-datoen"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D erstattes med alarm-beskrivelsen"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N erstattes med alarm-meldingen"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr ""
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr ""
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Synkroniser dagbok"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Synkroniseradresser"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Synkroniser oppgaver"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Synkroniser notater"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-#, fuzzy
-msgid "Sync memo32 (pedit32)"
-msgstr "Synkroniser notater"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr ""
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr ""
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, fuzzy, c-format
 msgid "Sync %s (%s)"
 msgstr "Hopper over %s\n"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Skriverinnstilinger"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr ""
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr ""
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 #, fuzzy
 msgid "Weekly Printout"
 msgstr "Ukentlig visning"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 #, fuzzy
 msgid "Monthly Printout"
 msgstr "Månedlig visning"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "En post"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "%d av %d poster"
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Alle poster i denne kategorien"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Skriv ut alle poster"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "En post per side"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " blanke linjer mellom hver post"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Utskriftskomando (f.eks. lpr, eller cat > fil.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr ""
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Filer som skal installeres"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr ""
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr ""
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr ""
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 #, fuzzy
 msgid "3. Press the OK button."
 msgstr "Trykk på HotSync-knappen nå\n"
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr ""
 
-#: ../restore_gui.c:282
-#, fuzzy
-msgid "User Name"
-msgstr "Navn"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 #, fuzzy
 msgid "datebook"
 msgstr "Synkroniser dagbok"
 
-#: ../search_gui.c:201
-#, fuzzy
-msgid "address"
-msgstr "Adresse"
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
+#, fuzzy
+msgid "address"
+msgstr "Adresse"
+
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
+#, fuzzy
+msgid "todo"
+msgstr "Synkroniser oppgaver"
+
+#: ../search_gui.c:359
+#, fuzzy
+msgid "memo"
+msgstr "Synkroniser notater"
+
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "Synkroniser notater"
+
+#: ../search_gui.c:419
+#, fuzzy
+msgid "plugin ?"
+msgstr "/Tillegg"
+
+#: ../search_gui.c:499
+msgid "No records found"
+msgstr "Ingen poster funnet"
+
+#: ../search_gui.c:598
+msgid "Search"
+msgstr "Søk"
+
+#. Search label
+#: ../search_gui.c:615
+msgid "Search for: "
+msgstr "Søk etter: "
+
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
+msgid "Case Sensitive"
+msgstr "Skill store/små bokstaver"
+
+#: ../sync.c:118
+#, fuzzy
+msgid "open lock file failed\n"
+msgstr "Kan ikke åpne loggfil\n"
+
+#: ../sync.c:131
+#, fuzzy
+msgid "lock failed\n"
+msgstr "Ferdig\n"
+
+#: ../sync.c:136
+#, c-format
+msgid "sync file is locked by pid %d\n"
+msgstr ""
+
+#: ../sync.c:175
+msgid "unlock failed\n"
+msgstr ""
+
+#: ../sync.c:180
+#, c-format
+msgid "sync is locked by pid %d\n"
+msgstr ""
+
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "Kontroller serieporten og innstillingene\n"
+
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr ""
+
+#: ../sync.c:1085 ../sync.c:1423
+#, fuzzy, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s er oppdatert, dropper overføring\n"
+
+#: ../sync.c:1089 ../sync.c:1427
+#, fuzzy, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Henter '%s'... "
+
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr ""
+
+#: ../sync.c:1100 ../sync.c:1438
+#, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr ""
+
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "Greit\n"
+
+#: ../sync.c:1304
+#, c-format
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr ""
+
+#: ../sync.c:1498
+#, fuzzy, c-format
+msgid "Installing %s "
+msgstr "Innstallerer %s... "
+
+#: ../sync.c:1504 ../sync.c:1540
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr "Kan ikke åpne loggfil\n"
+
+#: ../sync.c:1508
+#, c-format
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "Henter '%s'... "
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "Henter '%s'... "
+
+#: ../sync.c:1530
+#, c-format
+msgid "(SDcard dir %s)... "
+msgstr ""
+
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr "Kan ikke åpne loggfil\n"
+
+#: ../sync.c:1615
+#, c-format
+msgid "Install %s failed"
+msgstr "Innstallering av %s mislyktes"
+
+#: ../sync.c:1619
+#, fuzzy
+msgid "Failed.\n"
+msgstr "Ferdig\n"
+
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s innstallert"
+
+#: ../sync.c:1736
+#, fuzzy, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "Feil under lesing"
+
+#: ../sync.c:1742 ../sync.c:1772
+#, fuzzy, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "Feil under lesing"
 
-#: ../search_gui.c:267
-#, fuzzy
-msgid "todo"
-msgstr "Synkroniser oppgaver"
+#: ../sync.c:1763
+#, fuzzy, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Feil under lesing"
 
-#: ../search_gui.c:321
-#, fuzzy
-msgid "memo"
-msgstr "Synkroniser notater"
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr ""
 
-#: ../search_gui.c:377
-#, fuzzy
-msgid "plugin ?"
-msgstr "/Tillegg"
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr ""
 
-#: ../search_gui.c:449
-msgid "No records found"
-msgstr "Ingen poster funnet"
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr ""
 
-#: ../search_gui.c:547 ../search_gui.c:610
-msgid "Search"
-msgstr "Søk"
+#: ../sync.c:2106 ../sync.c:2824
+#, fuzzy, c-format
+msgid "Syncing %s\n"
+msgstr "Hopper over %s\n"
 
-#: ../search_gui.c:563
-msgid "Search for: "
-msgstr "Søk etter: "
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
+#, fuzzy, c-format
+msgid "Wrote an %s record."
+msgstr "Skriv ut alle poster"
 
-#: ../search_gui.c:570
-msgid "Case Sensitive"
-msgstr "Skill store/små bokstaver"
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
+#, c-format
+msgid "Writing an %s record failed."
+msgstr ""
 
-#: ../sync.c:139
-#, fuzzy
-msgid "open lock file failed\n"
-msgstr "Kan ikke åpne loggfil\n"
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
+#, c-format
+msgid "Deleting an %s record failed."
+msgstr ""
 
-#: ../sync.c:152
-#, fuzzy
-msgid "lock failed\n"
-msgstr "Ferdig\n"
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
+#, c-format
+msgid "Deleted an %s record."
+msgstr ""
 
-#: ../sync.c:155
+#: ../sync.c:2122 ../sync.c:2475
 #, c-format
-msgid "sync file is locked by pid %d\n"
+msgid "Sync Conflict: duplicated an %s record."
 msgstr ""
 
-#: ../sync.c:189
-msgid "unlock failed\n"
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
+#, fuzzy, c-format
+msgid "Wrote a %s record."
+msgstr "Skriv ut alle poster"
+
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
+#, c-format
+msgid "Writing a %s record failed."
 msgstr ""
 
-#: ../sync.c:192
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
-msgid "sync is locked by pid %d\n"
+msgid "Deleting a %s record failed."
 msgstr ""
 
-#: ../sync.c:244
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, fuzzy, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "Trykk på HotSync-knappen nå\n"
+msgid "Deleted a %s record."
+msgstr "%d av %d poster"
 
-#: ../sync.c:297
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "Exiting with status %s\n"
+msgid "Sync Conflict: duplicated a %s record."
 msgstr ""
 
-#: ../sync.c:298
-msgid "Finished\n"
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
 msgstr ""
 
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
+#: ../sync.c:2368 ../sync.c:2708
+msgid ""
+"dlp_DeleteRecord failed\n"
+"This could be because the record was already deleted on the Palm\n"
 msgstr ""
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "Kontroller serieporten og innstillingene\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr ""
 
-#: ../sync.c:674
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr ""
 
-#: ../sync.c:675
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr "Trykk på HotSync-knappen nå\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr ""
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr ""
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr ""
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
 msgid " This User ID-->%d\n"
 msgstr ""
 
-#: ../sync.c:795
+#: ../sync.c:3204
 #, c-format
 msgid "Username is \"%s\"\n"
 msgstr ""
 
-#: ../sync.c:796
+#: ../sync.c:3205
 #, fuzzy, c-format
 msgid "User ID is %d\n"
 msgstr "Navn"
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr ""
 
-#: ../sync.c:799
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr ""
 
-#: ../sync.c:800
-#, c-format
-msgid "Last Username = [%s]\n"
-msgstr ""
-
-#: ../sync.c:801
-#, c-format
-msgid "Last UserID = %d\n"
-msgstr ""
-
-#: ../sync.c:802
-#, c-format
-msgid "Username = [%s]\n"
-msgstr ""
-
-#: ../sync.c:803
-#, c-format
-msgid "userID = %d\n"
-msgstr ""
-
-#: ../sync.c:821
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr ""
 
-#: ../sync.c:843
+#: ../sync.c:3255
 msgid "Finished restoring handheld.\n"
 msgstr ""
 
-#: ../sync.c:844
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr ""
 
-#: ../sync.c:874
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr "Utfører hurtigsynkronisering\n"
 
-#: ../sync.c:913
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr "Utfører en treg synkronisering\n"
 
-#: ../sync.c:1014
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr "Takk for at du bruker J-Pilot."
 
-#: ../sync.c:1056
+#: ../sync.c:3411 ../sync.c:3479
 #, fuzzy
 msgid "Finished.\n"
 msgstr "Ferdig\n"
 
-#: ../sync.c:1092 ../sync.c:2611
-#, fuzzy, c-format
-msgid "Syncing %s\n"
-msgstr "Hopper over %s\n"
-
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
-#, fuzzy, c-format
-msgid "Wrote an %s record."
-msgstr "Skriv ut alle poster"
-
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:3446
 #, c-format
-msgid "Writing an %s record failed."
+msgid "%s: sync process already in progress (process ID = %d)\n"
 msgstr ""
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:3447
 #, c-format
-msgid "Deleting an %s record failed."
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
 msgstr ""
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:3478
 #, c-format
-msgid "Deleted an %s record."
+msgid "Exiting with status %s\n"
 msgstr ""
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
-#, fuzzy, c-format
-msgid "Wrote a %s record."
-msgstr "Skriv ut alle poster"
-
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../todo.c:264
 #, c-format
-msgid "Writing a %s record failed."
+msgid "ToDo description text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../todo.c:270
 #, c-format
-msgid "Deleting a %s record failed."
+msgid "ToDo note text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
-#, fuzzy, c-format
-msgid "Deleted a %s record."
-msgstr "%d av %d poster"
+#: ../todo_gui.c:159
+msgid "Due Date"
+msgstr "Ingen forfallsdato"
 
-#: ../sync.c:1133
-#, c-format
-msgid "number of records = %d\n"
+#: ../todo_gui.c:532
+msgid "File doesn't appear to be todo.dat format\n"
 msgstr ""
 
-#: ../sync.c:1260 ../sync.c:2435
-msgid ""
-"dlp_DeleteRecord failed\n"
-"This could be because the record was already deleted on the Palm\n"
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
 msgstr ""
 
-#: ../sync.c:1358 ../sync.c:1770
-#, fuzzy, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s er oppdatert, dropper overføring\n"
-
-#: ../sync.c:1362 ../sync.c:1774
-#, fuzzy, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Henter '%s'... "
-
-#: ../sync.c:1369 ../sync.c:1780
+#: ../todo_gui.c:688
 #, c-format
-msgid "Failed, unable to create file %s\n"
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
 msgstr ""
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../todo_gui.c:726
 #, c-format
-msgid "Failed, unable to back up database %s\n"
+msgid "Can't export todo %d\n"
 msgstr ""
 
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "Greit\n"
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Ingen forfallsdato"
 
-#: ../sync.c:1687
-#, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr ""
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Ingen forfallsdato"
 
-#: ../sync.c:1861
+#: ../todo_gui.c:771
 #, fuzzy, c-format
-msgid "Installing %s "
-msgstr "Innstallerer %s... "
+msgid "Priority: %d\n"
+msgstr "Prioritet: "
 
-#: ../sync.c:1867
+#: ../todo_gui.c:772
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr "Kan ikke åpne loggfil\n"
+msgid "Completed: %s\n"
+msgstr "Utført"
 
-#: ../sync.c:1871
+#: ../todo_gui.c:774
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
+msgid "Description: %s\n"
 msgstr ""
 
-#: ../sync.c:1883
+#: ../todo_gui.c:777
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr ""
-
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
-#, fuzzy, c-format
 msgid ""
+"Note: %s\n"
 "\n"
-"Unable to open file: %s\n"
-msgstr "Kan ikke åpne loggfil\n"
-
-#: ../sync.c:1960
-#, c-format
-msgid "Install %s failed"
-msgstr "Innstallering av %s mislyktes"
+msgstr ""
 
-#: ../sync.c:1964
-#, fuzzy
-msgid "Failed.\n"
-msgstr "Ferdig\n"
+#: ../todo_gui.c:1610
+msgid "Priority out of range\n"
+msgstr ""
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
-msgid "Installed %s "
-msgstr "%s innstallert"
+msgid "No date"
+msgstr "Ingen forfallsdato"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, fuzzy, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Kan ikke åpne loggfil\n"
+#. Completed checkbox
+#: ../todo_gui.c:2411
+msgid "Completed"
+msgstr "Utført"
 
-#: ../sync.c:2180
-msgid "Unable to read home dir\n"
-msgstr ""
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
+msgstr "Prioritet: "
 
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
 msgstr ""
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr ""
+#: ../todo_gui.c:2441
+msgid "Date Due:"
+msgstr "Forfallsdato:"
 
-#: ../sync.c:2888
-#, fuzzy, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "Feil under lesing"
+#: ../utils.c:330
+msgid "Today"
+msgstr "dag"
 
-#: ../sync.c:2894 ../sync.c:2936
+#: ../utils.c:575
 #, fuzzy, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "Feil under lesing"
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Kan ikke åpne loggfil\n"
 
-#: ../sync.c:2916 ../sync.c:2928
-#, fuzzy, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Feil under lesing"
+#: ../utils.c:578
+#, fuzzy
+msgid " may not be installed.\n"
+msgstr "Filer som skal installeres"
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr ""
-
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
+msgid "Can't create directory %s\n"
 msgstr ""
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../utils.c:623
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
+msgid "%s is not a directory\n"
 msgstr ""
 
-#: ../todo.c:248
+#: ../utils.c:628
 #, c-format
-msgid "ToDo description text > %d, truncating to %d\n"
+msgid "Unable to get write permission for directory %s\n"
 msgstr ""
 
-#: ../todo.c:255
-#, c-format
-msgid "ToDo note text > %d, truncating to %d\n"
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
 msgstr ""
 
-#: ../todo.c:380
-#, fuzzy, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "Feil under lesing"
-
-#: ../todo_gui.c:149
-msgid "Due Date"
-msgstr "Ingen forfallsdato"
-
-#: ../todo_gui.c:535
-msgid "File doesn't appear to be todo.dat format\n"
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
 msgstr ""
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
-#, c-format
-msgid "Can't export todo %d\n"
+#: ../utils.c:1334 ../utils.c:1358
+#, fuzzy
+msgid "Save New Record?"
+msgstr "Ny post"
+
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
 msgstr ""
 
-#: ../todo_gui.c:1547
-msgid "Priority out of range\n"
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
 msgstr ""
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../utils.c:1874
 #, c-format
-msgid "No date"
-msgstr "Ingen forfallsdato"
-
-#. The completed check box
-#: ../todo_gui.c:2206
-msgid "Completed"
-msgstr "Utført"
-
-#: ../todo_gui.c:2214
-msgid "Priority: "
-msgstr "Prioritet: "
-
-#: ../todo_gui.c:2234
-msgid "Date Due:"
-msgstr "Forfallsdato:"
-
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "Notat"
-
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
+msgid " -p skip loading plugins\n"
 msgstr ""
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
+#: ../utils.c:1875
+#, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr ""
 
-#: ../utils.c:75
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1876
+#, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr ""
 
-#: ../utils.c:76
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
 msgstr ""
 
-#: ../utils.c:77
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
 msgstr ""
 
-#: ../utils.c:78
-msgid " -i makes program iconify itself upon launch.\n"
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
 msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr ""
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr ""
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr ""
 
-#: ../utils.c:107
+#: ../utils.c:1921
+#, fuzzy
+msgid "Error reading file"
+msgstr "Feil under lesing"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr ""
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr ""
 
-#: ../utils.c:110
+#: ../utils.c:1976
 #, fuzzy
 msgid "Installed Path"
 msgstr "%s innstallert"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr ""
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr ""
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 #, fuzzy
 msgid "yes"
 msgstr "år"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-#, fuzzy
-msgid "no"
-msgstr "ingen"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 #, fuzzy
 msgid "Private record support"
 msgstr "Skriv ut alle poster"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+#, fuzzy
+msgid "no"
+msgstr "ingen"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr ""
 
-#: ../utils.c:134
+#: ../utils.c:1996
 #, fuzzy
 msgid "Plugin support"
 msgstr "/Tillegg"
 
-#: ../utils.c:140
+#: ../utils.c:2002
 #, fuzzy
 msgid "Manana support"
 msgstr "/Tillegg"
 
-#: ../utils.c:146
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr ""
 
-#: ../utils.c:152
+#: ../utils.c:2014
 #, fuzzy
 msgid "GTK2 support"
 msgstr "/Tillegg"
 
-#: ../utils.c:207
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %A, %x %X"
-msgstr "I dag er %A %x %X"
+msgid "Can't get HOME environment variable\n"
+msgstr ""
 
-#: ../utils.c:209
+#: ../utils.c:2064
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "I dag er det %%A %s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "dag"
-
-#: ../utils.c:1330
-msgid "Save Changed Record?"
+msgid "HOME environment variable is too long to process\n"
 msgstr ""
 
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
+#: ../utils.c:2567
+msgid "Edit Categories..."
 msgstr ""
 
-#: ../utils.c:1336
-#, fuzzy
-msgid "Save New Record?"
-msgstr "Ny post"
-
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr ""
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC ID er 0.\n"
 
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
-msgid "Can't get HOME environment variable\n"
-msgstr ""
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "En ny PC ID laget.  Denne er %d\n"
 
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
 msgstr ""
 
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
+#: ../utils.c:3537
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr ""
+msgid "Today is %A, %x %X"
+msgstr "I dag er %A %x %X"
 
-#: ../utils.c:1399
+#: ../utils.c:3539
 #, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr ""
+msgid "Today is %%A, %s %s"
+msgstr "I dag er det %%A %s %s"
 
-#: ../utils.c:1405
+#: ../utils.c:3768
 #, c-format
-msgid "I can't write files in directory %s\n"
-msgstr ""
-
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
-msgstr ""
-
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
 
-#: ../utils.c:1483
-#, fuzzy
-msgid "Error opening file: next_id\n"
-msgstr "Feil under lesing"
-
-#: ../utils.c:1657
+#: ../utils.c:3805
 #, fuzzy, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Kan ikke åpne loggfil\n"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-#, fuzzy
-msgid " may not be installed.\n"
-msgstr "Filer som skal installeres"
-
-#: ../utils.c:1839
-#, fuzzy
-msgid "Error reading file"
+msgid "Error writing version header to file: %s%s\n"
 msgstr "Feil under lesing"
 
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC ID er 0.\n"
-
-#: ../utils.c:2517
+#: ../utils.c:3810
 #, fuzzy, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "En ny PC ID laget.  Denne er %d\n"
+msgid "Error writing next id to file: %s%s"
+msgstr "Feil under lesing"
 
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Ukentlig visning"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr ""
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr ""
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr ""
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr ""
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr ""
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr ""
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr ""
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr ""
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 #, fuzzy
 msgid "France"
 msgstr "Angre"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr ""
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr ""
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr ""
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr ""
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 #, fuzzy
 msgid "Indonesia"
 msgstr "ingen"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr ""
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 #, fuzzy
 msgid "Italy"
 msgstr "/Arkiv/_Installere"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr ""
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr ""
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr ""
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr ""
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr ""
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr ""
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr ""
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr ""
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr ""
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr ""
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr ""
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 #, fuzzy
 msgid "Spain"
 msgstr "Skriv ut"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 #, fuzzy
 msgid "Sweden"
 msgstr "uke"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr ""
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 #, fuzzy
 msgid "Taiwan"
 msgstr "Skriv ut"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 #, fuzzy
 msgid "Thailand"
 msgstr "Skriv ut"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr ""
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr ""
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr ""
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr ""
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr ""
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr ""
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr ""
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr ""
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 #, fuzzy
 msgid "Dinner"
 msgstr "ingen"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr ""
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr ""
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr ""
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr ""
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 #, fuzzy
 msgid "Hotel"
 msgstr "Notat"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr ""
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 #, fuzzy
 msgid "Laundry"
 msgstr "Søndag"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr ""
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr ""
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr ""
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr ""
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 #, fuzzy
 msgid "Parking"
 msgstr "Skriv ut"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr ""
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 #, fuzzy
 msgid "Snack"
 msgstr "Synkroniser"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 #, fuzzy
 msgid "Subway"
 msgstr "Søndag"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr ""
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr ""
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr ""
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr ""
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr ""
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 #, fuzzy
 msgid "Train"
 msgstr "Skriv ut"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
 msgstr ""
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 #, fuzzy
 msgid "Cash"
 msgstr "Katter"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr ""
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
 msgstr ""
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
 msgstr ""
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr ""
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr ""
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr ""
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr ""
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr ""
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Tid:"
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr ""
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Om %s"
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 #, fuzzy
 msgid "Category:"
 msgstr "Kategori"
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 #, fuzzy
 msgid "Type:"
 msgstr "Tid:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr ""
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr ""
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-#, fuzzy
-msgid "Date:"
-msgstr "dato"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 #, fuzzy
 msgid "Month:"
 msgstr "Måned"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 #, fuzzy
 msgid "Day:"
 msgstr "Dag"
@@ -2985,80 +3619,109 @@ msgstr "Dag"
 # msgstr "Pr. uke"
 # msgid "MonthView"
 # msgstr "Pr. mnd"
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 #, fuzzy
 msgid "Year:"
 msgstr "År"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 #, fuzzy
 msgid "Amount:"
 msgstr "Om %s"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr ""
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 #, fuzzy
 msgid "City:"
 msgstr "Kategori"
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr ""
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+"%s er skrevet av\n"
+"Judd Montgomery (c) 1999-2000.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 #, fuzzy
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Angi Palm-passord"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 #, fuzzy
 msgid "Enter a NEW KeyRing Password"
 msgstr "Angi Palm-passord"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 #, fuzzy
 msgid "Enter KeyRing Password"
 msgstr "Angi Palm-passord"
 
-#: ../KeyRing/keyring.c:1636
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr ""
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "Angre"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, c-format
+msgid "Can't export key %d\n"
 msgstr ""
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 #, fuzzy
 msgid ""
 "Change\n"
@@ -3066,56 +3729,176 @@ msgid ""
 "Password"
 msgstr "Angi Palm-passord"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "Angre"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr ""
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 #, fuzzy
 msgid "name: "
 msgstr "Navn"
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr ""
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 #, fuzzy
 msgid "password: "
 msgstr "Palm-passord"
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 #, fuzzy
 msgid "Generate Password"
 msgstr "Angi Palm-passord"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "Synkroniser notater"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+"%s er skrevet av\n"
+"Judd Montgomery (c) 1999-2000.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "Ferdig"
 
+#, fuzzy
+#~ msgid "Field"
+#~ msgstr "Ferdig\n"
+
+#~ msgid "Quick View"
+#~ msgstr "Kortversjon"
+
+#, fuzzy
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Kan ikke åpne loggfil\n"
+
+#, fuzzy
+#~ msgid "category name"
+#~ msgstr "Kategori"
+
+#~ msgid "Close"
+#~ msgstr "Lukk"
+
+#~ msgid "none"
+#~ msgstr "ingen"
+
+#, fuzzy
+#~ msgid "W"
+#~ msgstr "On"
+
+#, fuzzy
+#~ msgid "M"
+#~ msgstr "Ma"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Denne avtalen har ingen tidsangivelse"
+
+#, fuzzy
+#~ msgid "Start Time"
+#~ msgstr "Starter den"
+
+#, fuzzy
+#~ msgid "End Time"
+#~ msgstr "Ingen tid"
+
+#~ msgid "Done"
+#~ msgstr "Ferdig"
+
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Navn"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Hjelp/PayBack program"
+
+#~ msgid "Clear"
+#~ msgstr "Fjern"
+
+#, fuzzy
+#~ msgid "Show private records"
+#~ msgstr "/Vis/Gjem - visning av private poster"
+
+#, fuzzy
+#~ msgid "Hide private records"
+#~ msgstr "/Vis/Gjem - visning av private poster"
+
+#, fuzzy
+#~ msgid "Mask private records"
+#~ msgstr "Skriv ut alle poster"
+
+#, fuzzy
+#~ msgid "Font"
+#~ msgstr "Måned"
+
+#, fuzzy
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Kan ikke åpne loggfil\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "Første dag i uken er "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Seriellport (/dev/ttyS0, /dev/pilot)"
+
+#, fuzzy
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "Synkroniser notater"
+
+#~ msgid "One record"
+#~ msgstr "En post"
+
+#, fuzzy
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "Trykk på HotSync-knappen nå\n"
+
 #, fuzzy
 #~ msgid "Quit"
 #~ msgstr "Avslutt"
@@ -3164,28 +3947,9 @@ msgstr "Ferdig"
 #~ msgid "Error reading at %s : %s %d\n"
 #~ msgstr "Feil under lesing"
 
-#~ msgid "Serial Rate "
-#~ msgstr "Seriell overføringshastighet "
-
 #, fuzzy
 #~ msgid "Cannot open "
 #~ msgstr "Kan ikke åpne loggfil\n"
 
-#, fuzzy
-#~ msgid "_to_install file\n"
-#~ msgstr "Kan ikke åpne loggfil\n"
-
 #~ msgid "RTh"
 #~ msgstr "To"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s %s was written by\n"
-#~ "Judd Montgomery (Copyright) 1999-2002.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-#~ msgstr ""
-#~ "%s er skrevet av\n"
-#~ "Judd Montgomery (c) 1999-2000.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
diff --git a/po/nl.po b/po/nl.po
index 42d8b382..e799b879 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,511 +7,611 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot-1.6.0-pre2\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2007-11-23 20:00+0100\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2008-05-04 12:53+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../address.c:295 ../address.c:539 ../alarms.c:370 ../contact.c:277
-#: ../contact.c:582 ../dat.c:181 ../dat.c:655 ../dat.c:857 ../dat.c:991
-#: ../dat.c:1130 ../datebook.c:89 ../datebook.c:390 ../datebook.c:397
-#: ../datebook.c:427 ../datebook.c:1043 ../jpilot.c:1564 ../libplugin.c:437
-#: ../libplugin.c:719 ../libplugin.c:829 ../libplugin.c:908 ../libplugin.c:952
-#: ../memo.c:95 ../memo.c:384 ../plugins.c:112 ../prefs.c:323 ../prefs.c:348
-#: ../prefs.c:887 ../sync.c:294 ../sync.c:1256 ../sync.c:1311 ../sync.c:1325
-#: ../sync.c:2549 ../sync.c:2618 ../todo.c:206 ../todo.c:543 ../utils.c:2520
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: ../address.c:352 ../address.c:359 ../contact.c:334 ../datebook.c:340
-#: ../libplugin.c:179 ../memo.c:166 ../memo.c:173 ../todo.c:289 ../todo.c:296
-#: ../utils.c:2130 ../utils.c:2138 ../utils.c:2151 ../utils.c:2159
-#: ../utils.c:2167 ../utils.c:2183 ../utils.c:2192 ../utils.c:2201
-#: ../utils.c:2210 ../utils.c:2220
-msgid "error"
-msgstr "fout"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Fout bij het lezen van category informatie %s\n"
 
-#: ../address.c:418 ../address_gui.c:1999 ../contact.c:403 ../datebook.c:686
-#: ../libplugin.c:779 ../libplugin.c:805 ../memo.c:258 ../memo_gui.c:986
-#: ../todo_gui.c:1290 ../Expense/expense.c:1088 ../Expense/expense.c:2088
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Fout bij lezen van bestand: %s\n"
 
-#: ../address_gui.c:391 ../datebook_gui.c:2538 ../memo_gui.c:166
-#: ../todo_gui.c:281 ../KeyRing/keyring.c:634
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "fout"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
 msgstr ""
 
-#: ../address_gui.c:526 ../address_gui.c:531 ../address_gui.c:541
-#: ../address_gui.c:551 ../address_gui.c:561 ../address_gui.c:572
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
 #, c-format
 msgid "%s%s: %s"
 msgstr ""
 
-#: ../address_gui.c:650 ../category.c:155 ../category.c:161 ../category.c:209
-#: ../category.c:266 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1212
-#: ../sync.c:1218 ../sync.c:2520 ../sync.c:2823 ../sync.c:2829 ../sync.c:2951
-#: ../sync.c:3273 ../todo_gui.c:421 ../utils.c:2925 ../utils.c:2966
-#: ../utils.c:2972 ../utils.c:3035 ../utils.c:3041 ../utils.c:3102
-#: ../utils.c:3157 ../utils.c:3163 ../utils.c:3224 ../utils.c:3231
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Kan bestand niet openen: %s\n"
 
-#: ../address_gui.c:729
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Kan bestand niet openen: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Bestand lijkt niet de 'address.dat'-indeling te hebben\n"
 
-#: ../address_gui.c:739 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:546 ../Expense/expense.c:1363
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Onbekend"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:876 ../alarms.c:289 ../category.c:412 ../category.c:891
-#: ../category.c:944 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:359 ../jpilot.c:404 ../jpilot.c:472
-#: ../jpilot.c:516 ../jpilot.c:1000 ../jpilot.c:1898 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:331 ../todo_gui.c:634 ../utils.c:1188
-#: ../utils.c:1369 ../KeyRing/keyring.c:1597
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "OK"
 
-#: ../address_gui.c:877 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:635 ../utils.c:1387
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Nee"
 
-#: ../address_gui.c:877 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:635 ../utils.c:1387
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Ja"
 
-#: ../address_gui.c:900 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:660
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s is een map"
 
-#: ../address_gui.c:902 ../address_gui.c:919 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:662
-#: ../todo_gui.c:679
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Fout bij openen van bestand"
 
-#: ../address_gui.c:906 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:666
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Wilt u het bestand %s overschrijven?"
 
-#: ../address_gui.c:908 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:668
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Bestand overschrijven?"
 
-#: ../address_gui.c:917 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:677
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Fout bij openen van bestand: %s"
 
-#: ../address_gui.c:928
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Kan adres %d niet exporteren\n"
 
-#: ../address_gui.c:996 ../address_gui.c:1004 ../address_gui.c:1024
-msgid "Field"
-msgstr "Veld"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Categorie: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Privé"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr ""
 
-#: ../address_gui.c:1225 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:816
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Onbekend exporttype\n"
 
-#: ../address_gui.c:1473 ../address_gui.c:3385
-msgid "Company/Name"
-msgstr "Bedrijf/Naam"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Naam/Bedrijf"
 
-#: ../address_gui.c:1475 ../address_gui.c:3387
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Naam/Bedrijf"
 
-#: ../address_gui.c:1602 ../datebook_gui.c:2616 ../memo_gui.c:894
-#: ../todo_gui.c:1218 ../KeyRing/keyring.c:974
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Bedrijf/Naam"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr ""
 
-#. Illegal category
-#: ../address_gui.c:1789 ../address_gui.c:2416 ../address_gui.c:3086
-#: ../memo_gui.c:800 ../memo_gui.c:1078 ../memo_gui.c:1368 ../todo_gui.c:1084
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Ongeldige categorie\n"
 
-#: ../address_gui.c:1841
-#, fuzzy
-msgid "email command empty\n"
-msgstr "Mailcommando"
-
-#: ../address_gui.c:1849 ../alarms.c:629 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, fuzzy, c-format
 msgid "executing command = [%s]\n"
 msgstr "Voer dit commando uit"
 
-#: ../address_gui.c:2055
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
 msgid "Birthday"
 msgstr ""
 
-#: ../address_gui.c:2137
+#: ../address_gui.c:2575
 msgid "External program not found, or other error"
 msgstr ""
 
-#: ../address_gui.c:2138
+#: ../address_gui.c:2577
 msgid ""
-"J-Pilot can not find an external program \"convert\"\n"
+"J-Pilot can not find the external program \"convert\"\n"
 "or an error occurred while executing convert.\n"
 "You may need to install package ImageMagick"
 msgstr ""
 
-#: ../address_gui.c:2139
+#: ../address_gui.c:2578
 #, c-format
 msgid "Command executed was \"%s\"\n"
 msgstr ""
 
-#: ../address_gui.c:2140
+#: ../address_gui.c:2579
 #, c-format
 msgid "return code was %d\n"
 msgstr ""
 
-#: ../address_gui.c:2219
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "vergrendelen is mislukt\n"
+
+#: ../address_gui.c:2660
 msgid "Add Photo"
 msgstr ""
 
-#. NEW CODE
-#. Fill out the "All" text buffer
 #. Category menu
-#: ../address_gui.c:2441 ../Expense/expense.c:1560 ../KeyRing/keyring.c:2112
-#: ../KeyRing/keyring.c:2213
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Categorie: "
 
-#. Set dial/email button text and callback data
-#: ../address_gui.c:2460 ../address_gui.c:3644
-msgid "E-mail"
-msgstr ""
-
-#: ../address_gui.c:2463 ../address_gui.c:2465 ../address_gui.c:3645
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Mail"
 
 #. Dial Phone Button
-#: ../address_gui.c:2470 ../address_gui.c:2472 ../address_gui.c:3648
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Bel"
 
-#: ../address_gui.c:2767 ../address_gui.c:2791
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Naamloos-"
 
-#: ../address_gui.c:2864 ../memo_gui.c:1278 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 items"
 
-#: ../address_gui.c:2867 ../datebook_gui.c:2414 ../memo_gui.c:1281
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d van de %d items"
 
-#: ../address_gui.c:3258 ../address_gui.c:3265 ../KeyRing/keyring.c:2125
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
 msgid "Name"
 msgstr "Naam"
 
-#: ../address_gui.c:3259 ../address_gui.c:3260 ../address_gui.c:3261
-#: ../address_gui.c:3266 ../prefs_gui.c:423
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
 msgid "Address"
 msgstr "Adres"
 
-#: ../address_gui.c:3262 ../address_gui.c:3267 ../Expense/expense.c:555
-#: ../Expense/expense.c:1384
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
 msgid "Other"
 msgstr "Diversen"
 
-#: ../address_gui.c:3281
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Notitie"
+
+#: ../address_gui.c:3844
 msgid "Reverting to Address database\n"
 msgstr ""
 
-#. Edit category button
-#: ../address_gui.c:3360 ../category.c:442 ../category.c:488 ../category.c:506
-#: ../category.c:585 ../category.c:778 ../memo_gui.c:1496 ../todo_gui.c:2101
-#: ../Expense/expense.c:1566
-msgid "Edit Categories"
-msgstr "Categorieën bewerken"
-
-#: ../address_gui.c:3391
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefoonnummer"
 
-#: ../address_gui.c:3414
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Snelzoeken: "
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:3430 ../category.c:413 ../category.c:881 ../category.c:934
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4385
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1530
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:322
-#: ../todo_gui.c:2172 ../utils.c:1174 ../KeyRing/keyring.c:1587
-#: ../KeyRing/keyring.c:2154
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../address_gui.c:3430 ../datebook_gui.c:4385 ../memo_gui.c:1530
-#: ../todo_gui.c:2172 ../KeyRing/keyring.c:2154
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "De wijzigingen annuleren"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:3435 ../category.c:413 ../category.c:846
-#: ../datebook_gui.c:4390 ../memo_gui.c:1535 ../todo_gui.c:2177
-#: ../Expense/expense.c:1603 ../KeyRing/keyring.c:2159
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../address_gui.c:3435 ../datebook_gui.c:4390 ../memo_gui.c:1535
-#: ../todo_gui.c:2177 ../Expense/expense.c:1603 ../KeyRing/keyring.c:2159
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Het geselecteerde item verwijderen"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:3441 ../datebook_gui.c:4396 ../memo_gui.c:1541
-#: ../todo_gui.c:2183 ../KeyRing/keyring.c:2165
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete"
 msgstr "Verwijderen"
 
-#: ../address_gui.c:3441 ../datebook_gui.c:4396 ../memo_gui.c:1541
-#: ../todo_gui.c:2183 ../KeyRing/keyring.c:2165
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Het geselecteerde item terughalen"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:3447 ../datebook_gui.c:4402 ../memo_gui.c:1547
-#: ../todo_gui.c:2189 ../Expense/expense.c:1608 ../KeyRing/keyring.c:2171
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: ../address_gui.c:3447 ../datebook_gui.c:4402 ../memo_gui.c:1547
-#: ../todo_gui.c:2189 ../Expense/expense.c:1608 ../KeyRing/keyring.c:2171
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Het geselecteerde item kopiëren"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:3453 ../datebook_gui.c:4408 ../memo_gui.c:1553
-#: ../todo_gui.c:2195 ../Expense/expense.c:1613 ../KeyRing/keyring.c:2177
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Nieuw item"
 
-#: ../address_gui.c:3453 ../datebook_gui.c:4408 ../memo_gui.c:1553
-#: ../todo_gui.c:2195 ../Expense/expense.c:1613 ../KeyRing/keyring.c:2177
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Een nieuw item toevoegen"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:3458 ../datebook_gui.c:4414 ../memo_gui.c:1559
-#: ../todo_gui.c:2201 ../Expense/expense.c:1618 ../KeyRing/keyring.c:2183
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Item toevoegen"
 
-#: ../address_gui.c:3458 ../datebook_gui.c:4414 ../memo_gui.c:1559
-#: ../todo_gui.c:2201 ../Expense/expense.c:1618 ../KeyRing/keyring.c:2183
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Het nieuwe item toevoegen"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:3468 ../datebook_gui.c:4424 ../memo_gui.c:1569
-#: ../todo_gui.c:2211 ../Expense/expense.c:1627 ../KeyRing/keyring.c:2193
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Wijzigingen toepassen"
 
-#: ../address_gui.c:3468 ../datebook_gui.c:4424 ../memo_gui.c:1569
-#: ../todo_gui.c:2211 ../Expense/expense.c:1627 ../KeyRing/keyring.c:2193
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "De gemaakte wijzigingen doorvoeren"
 
 #. Private check box
-#: ../address_gui.c:3485 ../datebook_gui.c:4475 ../memo_gui.c:1587
-#: ../todo_gui.c:2274
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privé"
 
-#: ../address_gui.c:3582
+#: ../address_gui.c:4169
 #, fuzzy
 msgid "Change Photo"
 msgstr "Gewijzigd"
 
-#: ../address_gui.c:3587
+#: ../address_gui.c:4174
 #, fuzzy
 msgid "Remove Photo"
 msgstr "Verwijderen"
 
-#: ../address_gui.c:3654
+#: ../address_gui.c:4246
 #, fuzzy
 msgid "Show In List"
 msgstr ""
 "Laat in\n"
 "lijst zien"
 
-#: ../address_gui.c:3797
+#: ../address_gui.c:4347
 #, fuzzy
 msgid "Reminder"
 msgstr "Herinner me"
 
-#: ../address_gui.c:3813 ../datebook_gui.c:4463
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
 msgid "Days"
 msgstr "dagen"
 
-#. All page
-#. Create a "All" button
-#: ../address_gui.c:3848 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2881
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
 msgid "All"
 msgstr "Alles"
 
-#: ../alarms.c:257 ../datebook_gui.c:4457
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "minuten"
 
-#: ../alarms.c:259 ../datebook_gui.c:4461
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "uren"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Herinner me"
 
-#: ../alarms.c:457
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "Kan bestand %s%s niet openen\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "Kan bestand niet openen: %s%s\n"
 
-#: ../alarms.c:544
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Herinnering afspraak"
 
-#: ../alarms.c:547
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Gemiste herinnering"
 
-#: ../alarms.c:550
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Uitgestelde afspraak"
 
-#: ../alarms.c:553 ../datebook_gui.c:4293
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: ../alarms.c:636
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr ""
 
-#: ../alarms.c:1103
-msgid "infinite loop, breaking\n"
-msgstr ""
-
-#: ../alarms.c:1472
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Kan bestand %s.alarms niet openen\n"
-
-#: ../category.c:188 ../sync.c:2860 ../utils.c:2993 ../utils.c:3071
-#: ../utils.c:3183 ../utils.c:3251
-msgid "rename failed"
-msgstr "hernoemen is mislukt"
-
-#: ../category.c:225 ../category.c:282 ../sync.c:1245 ../sync.c:2538
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "Bestand op PC ongeldig?\n"
 
-#: ../category.c:232 ../category.c:242 ../category.c:289 ../category.c:300
-#: ../category.c:310 ../sync.c:1295 ../sync.c:1359 ../sync.c:1389
-#: ../sync.c:1432 ../sync.c:1449 ../sync.c:1478 ../sync.c:2602 ../sync.c:2654
-#: ../sync.c:2682 ../sync.c:2727 ../sync.c:2741 ../sync.c:2768
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek() is mislukt - ernstige fout\n"
 
-#: ../category.c:413
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "hernoemen is mislukt"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: ../category.c:443
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Categorieën bewerken"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr ""
 
-#: ../category.c:446
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Voer nieuwe categorie in"
 
-#: ../category.c:456 ../category.c:463 ../category.c:481
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr ""
 
-#: ../category.c:457
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "U dient een categorie te selecteren om te hernoemen"
 
 #: ../category.c:461
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "U kunt categorie %s niet bewerken.\n"
-
-#: ../category.c:468
 msgid "Enter New Category Name"
 msgstr "Voer nieuwe naam van categorie in"
 
-#: ../category.c:482
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "U dient een categorie te selecteren om te verwijderen"
 
-#: ../category.c:486
-#, c-format
-msgid "You can't delete category %s.\n"
-msgstr "U kunt categorie %s niet verwijderen.\n"
-
-#: ../category.c:502
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
@@ -520,200 +620,336 @@ msgstr ""
 "Er zitten %d items in %s.\n"
 "Wilt u ze naar %s verplaatsen, of ze verwijderen?"
 
-#: ../category.c:561
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr ""
 
-#: ../category.c:583
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "Categorie %s kan niet meer dan één keer gebruikt worden"
 
-#. correctly translate title
-#: ../category.c:805
-msgid "category name"
-msgstr "categorienaam"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "Categorie:"
 
-#: ../category.c:830
+#: ../category.c:834
 msgid "New"
 msgstr "Nieuw"
 
-#: ../category.c:837
+#: ../category.c:841
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: ../category.c:952
-msgid "debug"
-msgstr ""
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr ""
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr ""
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr ""
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+msgid "It should be:"
 msgstr ""
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr ""
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr ""
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4118
-#: ../datebook_gui.c:4125
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Herhaal elke"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Herhaal op dagen:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Herhaal elke"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Herhaal op dagen:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Herhaal op dagen:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Herhaal op dagen:"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Zo"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4119
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Ma"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4120
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Di"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4121
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Wo"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4122
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Do"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4123
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Vr"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4124
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Za"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Eindigt op datum "
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Herhaal op dagen:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "aantal items = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Notitie"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Alarm"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Herhaal elke"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Dag van de week"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, fuzzy, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Waarschuwing: ToDo beschrijving te lang, inkorten naar %d\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Fout"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Bestand lijkt niet de 'datebook.dat'-indeling te hebben\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr ""
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:549
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Exporteren..."
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Exporteer alle agenda-items"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Opslaan als..."
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Bladeren..."
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 #, fuzzy
 msgid "Datebook Categories"
 msgstr "Bewerk categorien"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:566 ../search_gui.c:636 ../weekview_gui.c:371
-msgid "Close"
-msgstr "Sluiten"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4640
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Geen"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Begint op datum"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Eindigt op datum "
 
-#: ../datebook_gui.c:1567 ../prefs.c:431
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Zondag"
 
-#: ../datebook_gui.c:1568 ../prefs.c:432
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Maandag"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4de"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Vorige"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -723,67 +959,76 @@ msgid ""
 "Which do you want?"
 msgstr ""
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr ""
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Dit item herhaalt zich.\n"
 "Wilt u deze veranderingen\n"
 "toepassen op het huidige\n"
 "item of op allemaal?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Huidige"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "geen"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "dag"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "week"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "maand"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "jaar"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, fuzzy, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "U kunt geen afspraak maken die zich elke %d %s(s) herhaalt\n"
 
-#: ../datebook_gui.c:2139
-msgid "You can not have a weekly repeating appointment that doesn't repeat on any day of the week."
-msgstr "U kunt geen wekelijkse afspraak maken die zich op geen enkele dag van de week herhaalt."
+#: ../datebook_gui.c:2339
+#, fuzzy
+msgid ""
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
+"day of the week."
+msgstr ""
+"U kunt geen wekelijkse afspraak maken die zich op geen enkele dag van de "
+"week herhaalt."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Geen tijd"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Ongeldige afspraak"
 
-#: ../datebook_gui.c:2633
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -791,179 +1036,160 @@ msgstr ""
 "The einddatum van deze afspraak\n"
 "is voor de begindatum."
 
-#. The No due date check box
-#: ../datebook_gui.c:2902 ../datebook_gui.c:4674 ../datebook_gui.c:4704
-#: ../datebook_gui.c:4759 ../datebook_gui.c:4808 ../todo_gui.c:130
-#: ../todo_gui.c:2265
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Geen datum"
 
-#: ../datebook_gui.c:3022
+#: ../datebook_gui.c:3491
 #, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
-msgstr ""
-
-#: ../datebook_gui.c:3193
-msgid "Unknown repeatType found in DatebookDB\n"
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:3226
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3231 ../monthview_gui.c:236 ../weekview_gui.c:221
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (vandaag)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4201 ../datebook_gui.c:4642
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Week"
 
-#: ../datebook_gui.c:4207
-msgid "W"
-msgstr "W"
-
-#: ../datebook_gui.c:4209
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+msgid "View appointments by week   Ctrl+W"
 msgstr ""
 
-#. Make Monthview button
-#: ../datebook_gui.c:4212 ../datebook_gui.c:4643
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Maand"
 
-#: ../datebook_gui.c:4219
-msgid "M"
-msgstr "M"
-
-#: ../datebook_gui.c:4221
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+msgid "View appointments by month   Ctrl+M"
 msgstr ""
 
 #. Make Category button
-#: ../datebook_gui.c:4226
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Categorieën"
 
-#: ../datebook_gui.c:4292
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Tijd"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4329
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr ""
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2116
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Taak"
 
-#: ../datebook_gui.c:4345 ../todo_gui.c:2117
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Datum"
 
-#: ../datebook_gui.c:4442
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarm"
 
-#: ../datebook_gui.c:4486
-msgid "This Event has no particular time"
-msgstr "Deze gebeurtenis heeft geen bepaalde tijd"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "Datum:"
 
-#: ../datebook_gui.c:4494
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Begint op"
 
-#: ../datebook_gui.c:4508
-msgid "Start Time"
-msgstr "Begintijd"
-
-#: ../datebook_gui.c:4526
+#. End date and time
+#: ../datebook_gui.c:5297
 #, fuzzy
-msgid "End Time"
-msgstr "Tijd"
+msgid "End"
+msgstr "Eindigt op"
 
-#: ../datebook_gui.c:4624
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr ""
 
-#: ../datebook_gui.c:4641
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Dag"
 
-#: ../datebook_gui.c:4644
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Jaar"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4648
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Deze gebeurtenis herhaalt zich niet"
 
-#: ../datebook_gui.c:4658 ../datebook_gui.c:4690 ../datebook_gui.c:4745
-#: ../datebook_gui.c:4792
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Frequentie is iedere"
 
-#: ../datebook_gui.c:4663
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "dag(en)"
 
-#. checkbutton
-#: ../datebook_gui.c:4666 ../datebook_gui.c:4698 ../datebook_gui.c:4753
-#: ../datebook_gui.c:4800
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Eindigt op"
 
-#: ../datebook_gui.c:4695
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "week/weken"
 
-#: ../datebook_gui.c:4711
-msgid "Repeat on Days:"
-msgstr "Herhaal op dagen:"
-
-#: ../datebook_gui.c:4750
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "maand(en)"
 
-#: ../datebook_gui.c:4767
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Herhaal elke"
 
-#: ../datebook_gui.c:4771
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Dag van de week"
 
-#: ../datebook_gui.c:4780
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Datum"
 
-#: ../datebook_gui.c:4797
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "jaar/jaren"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Telefoonkiezer"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Voorvoegsel 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Voorvoegsel 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Voorvoegsel 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Telefoonnummer:"
 
@@ -971,500 +1197,382 @@ msgstr "Telefoonnummer:"
 msgid "Extension"
 msgstr "Uitbreiding"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "Kiescommando"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "Annuleren"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Bestandsbrowser"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Selecteer de items die u wilt exporteren"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Gebruik Ctrl en Shift"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:505
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importeren..."
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Om naar een verborgen map te gaan, type het hieronder en druk op TAB"
-
-#: ../import_gui.c:307 ../prefs_gui.c:973
-msgid "Done"
-msgstr "Klaar"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "Bestandstype importeren"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
 #, c-format
 msgid "Record was marked as private"
 msgstr "Item was als prive gemarkeerd"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
 #, c-format
 msgid "Record was not marked as private"
 msgstr "Item was niet als prive gemarkeerd"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr ""
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, fuzzy, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Alle items in deze categorie"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Alles importeren"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Overslaan"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Installeren"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "Om naar een verborgen map te gaan, type het hieronder en druk op TAB"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Bestanden die geinstalleerd zullen worden"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Bestandstype importeren"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Toevoegen"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Bestanden die geinstalleerd zullen worden"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Verwijderen"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Installeren"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/Bestand/_Installeren"
 
-#: ../install_user.c:138
-msgid "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
+#: ../install_user.c:137
+msgid ""
+"A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
-msgid "If you want to sync more than 1 PalmOS(c) device each one should have a different ID and preferably a different user name."
+#: ../install_user.c:144
+msgid ""
+"If you want to sync more than 1 PalmOS(c) device each one should have a "
+"different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "Gebruikersnaam"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:304
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: ../jpilot-dump.c:97
-msgid " +D +A +T +M format like date +format.\n"
-msgstr ""
+#: ../jpilot.c:317
+msgid "Print"
+msgstr "Afdrukken"
 
-#: ../jpilot-dump.c:98
-msgid " -v displays version and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:99 ../utils.c:80
-msgid " -h displays help and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:100
-msgid " -f displays help for format codes.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:101
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr "Adresboek"
-
-#: ../jpilot-dump.c:102
-#, fuzzy
-msgid " -i dump DateBook in iCalendar format.\n"
-msgstr "Adresboek"
-
-#: ../jpilot-dump.c:103
-msgid " -N dump appts for today in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:104
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:105
-#, fuzzy
-msgid " -A dump Address book.\n"
-msgstr "Adresboek"
-
-#: ../jpilot-dump.c:106
-msgid " -T dump ToDo list as CSV.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:107
-msgid " -M dump Memos.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:66
-msgid " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr ""
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr ""
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr ""
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:73
-msgid " -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr ""
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:138
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr ""
-
-#: ../jpilot.c:445 ../monthview_gui.c:579 ../print_gui.c:338
-#: ../weekview_gui.c:385
-msgid "Print"
-msgstr "Afdrukken"
-
-#: ../jpilot.c:446
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Er is geen printondersteuning voor dit onderdeel."
 
-#: ../jpilot.c:506
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Er is geen import-ondersteuning voor dit onderdeel."
 
-#: ../jpilot.c:550
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Er is geen export-ondersteuning voor dit onderdeel."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "synchroniseren annuleren"
+
 #. -------------------------------------------
-#: ../jpilot.c:726
+#: ../jpilot.c:673
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:733
+#: ../jpilot.c:680
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
-#: ../jpilot.c:740
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "synchroniseren annuleren"
 
-#: ../jpilot.c:740
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Synchroniseer toch"
 
-#: ../jpilot.c:749 ../jpilot.c:753
+#: ../jpilot.c:697 ../jpilot.c:701
 #, fuzzy
 msgid "Sync Problem"
 msgstr "Synchroniseer memoblok"
 
-#: ../jpilot.c:991
+#: ../jpilot.c:932 ../jpilot.c:1787
+#, fuzzy
+msgid " User: "
+msgstr "Gebruikers ID"
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr ""
 
-#: ../jpilot.c:1012 ../Expense/expense.c:500 ../KeyRing/keyring.c:1752
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Info over %s"
 
-#: ../jpilot.c:1415
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Bestand/tear"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Bestand/_Zoeken"
 
-#: ../jpilot.c:1418 ../jpilot.c:1424 ../jpilot.c:1427
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Bestand/sep1"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Bestand/_Installeren"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Bestand/Importeren"
 
-#: ../jpilot.c:1421
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Bestand/Exporteren"
 
-#: ../jpilot.c:1422 ../jpilot.c:2901
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Bestand/Voorkeuren..."
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Bestand/_Afdrukken"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1117
 #, fuzzy
 msgid "/File/Install User"
 msgstr "/Bestand/_Installeren"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Bestand/Handheld herstellen"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Bestand/Afsluiten"
 
-#: ../jpilot.c:1429
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/B_eeld"
 
-#: ../jpilot.c:1430 ../jpilot.c:1431 ../jpilot.c:1432 ../jpilot.c:1683
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 #, fuzzy
 msgid "/View/Hide Private Records"
 msgstr "/Beeld/Verberg-maak prive-items zichtbaar"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1123 ../jpilot.c:1373
 #, fuzzy
 msgid "/View/Show Private Records"
 msgstr "/Beeld/Verberg-maak prive-items zichtbaar"
 
-#: ../jpilot.c:1432
+#: ../jpilot.c:1124 ../jpilot.c:1376
 #, fuzzy
 msgid "/View/Mask Private Records"
 msgstr "/Beeld/Verberg-maak prive-items zichtbaar"
 
-#: ../jpilot.c:1433
+#: ../jpilot.c:1125
 #, fuzzy
 msgid "/View/sep1"
 msgstr "/Bestand/sep1"
 
-#: ../jpilot.c:1434
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Beeld/Agenda"
 
-#: ../jpilot.c:1435
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Beeld/Adresboek"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Beeld/Takenlijst"
 
-#: ../jpilot.c:1437
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Beeld/Memo's"
 
-#: ../jpilot.c:1438 ../jpilot.c:1569
+#: ../jpilot.c:1130 ../jpilot.c:1261
 #, fuzzy
 msgid "/_Plugins"
 msgstr "/_Plugins"
 
-#: ../jpilot.c:1440
+#: ../jpilot.c:1132
 #, fuzzy
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1441
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/Netscape"
 
-#: ../jpilot.c:1445
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/Mozilla"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/Galeon"
 
-#: ../jpilot.c:1455
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/Opera"
 
-#: ../jpilot.c:1459
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/GnomeUrl"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/Lynx"
 
-#: ../jpilot.c:1463
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/Links"
 
-#: ../jpilot.c:1465
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W3M"
 
-#: ../jpilot.c:1467
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/Konequeror"
 
-#: ../jpilot.c:1470
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: ../jpilot.c:1471
-msgid "/Help/PayBack program"
-msgstr ""
-
-#: ../jpilot.c:1472
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr ""
 
-#: ../jpilot.c:1536
+#: ../jpilot.c:1229
 #, fuzzy, c-format
 msgid "/_Plugins/%s"
 msgstr "/Plugins/%s"
 
-#: ../jpilot.c:1547
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Help/%s"
 
-#: ../jpilot.c:1846
-msgid "Font Selection Dialog"
-msgstr ""
-
-#: ../jpilot.c:2220
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:2269
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr ""
 
-#: ../jpilot.c:2273
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2277
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2372 ../jpilot.c:2380
+#: ../jpilot.c:1732 ../jpilot.c:1740
 #, fuzzy
 msgid "Unable to open pipe\n"
 msgstr "Kon %s niet openen\n"
 
-#: ../jpilot.c:2431
-#, fuzzy
-msgid " User: "
-msgstr "Gebruikers ID"
-
-#: ../jpilot.c:2572
-msgid "Clear"
-msgstr "Wissen"
-
-#: ../jpilot.c:2657
-#, fuzzy
-msgid "Show private records   Ctrl-Z"
-msgstr "Laat prive-items zien"
-
-#: ../jpilot.c:2662
+#: ../jpilot.c:1949
 #, fuzzy
-msgid "Show private records"
+msgid "Show private records   Ctrl+Z"
 msgstr "Laat prive-items zien"
 
-#: ../jpilot.c:2667
-#, fuzzy
-msgid "Hide private records   Ctrl-Z"
-msgstr "Prive-items verbergen"
-
-#: ../jpilot.c:2672
+#: ../jpilot.c:1954
 #, fuzzy
-msgid "Hide private records"
+msgid "Hide private records   Ctrl+Z"
 msgstr "Prive-items verbergen"
 
-#: ../jpilot.c:2677
+#: ../jpilot.c:1959
 #, fuzzy
-msgid "Mask private records   Ctrl-Z"
+msgid "Mask private records   Ctrl+Z"
 msgstr "Prive-items bedekken"
 
-#: ../jpilot.c:2682
+#: ../jpilot.c:1971
 #, fuzzy
-msgid "Mask private records"
-msgstr "Prive-items bedekken"
-
-#: ../jpilot.c:2692
-msgid "Sync your palm to the desktop   Ctrl-Y"
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Synchroniseer uw Palm met uw computer"
 
-#. Create "Font" button
-#: ../jpilot.c:2698
-msgid "Font"
-msgstr "Lettertype"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Synchroniseer adresboek"
 
-#: ../jpilot.c:2713
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1472,1590 +1580,2087 @@ msgstr ""
 "Synchroniseer uw Palm met uw computer\n"
 "en maak dan een backup"
 
-#: ../jpilot.c:2827
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Agenda / Ga naar vandaag"
 
-#: ../jpilot.c:2829
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: ../jpilot.c:2831
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Takenlijst"
 
-#: ../jpilot.c:2833
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Memoblok"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr ""
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 #, fuzzy
 msgid "Remind me later"
 msgstr "Herinner me"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr ""
 
-#: ../jpilot.c:2897
+#: ../jpilot.c:2187
+#, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters (accents for example).\n"
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
+"(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 
-#: ../jpilot.c:2900
-msgid "Go to the menu \""
-msgstr ""
+#. Character Set
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
+msgstr "Tekenset "
 
-#: ../jpilot.c:2902
-msgid "\" and change the \""
+#: ../jpilot.c:2194
+msgid "Select a UTF-8 encoding"
 msgstr ""
 
-#. Character Set
-#: ../jpilot.c:2903 ../prefs_gui.c:443
-msgid "Character Set "
-msgstr "Tekenset "
+#: ../jpilot-dump.c:92
+#, c-format
+msgid " +D +A +T +M format like date +format.\n"
+msgstr ""
 
-#: ../jpilot.c:2904
-msgid "\"."
+#: ../jpilot-dump.c:93
+#, c-format
+msgid " -v display version and exit\n"
 msgstr ""
 
-#: ../jpilot.c:2906
-msgid "Select a UTF-8 encoding"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, c-format
+msgid " -h display help text\n"
 msgstr ""
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:95
 #, c-format
-msgid "Unknown PC header version = %d\n"
+msgid " -f display help for format codes\n"
 msgstr ""
 
-#: ../libplugin.c:411
+#: ../jpilot-dump.c:96
 #, fuzzy, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d Fout bij lezen van %s\n"
+msgid " -D dump DateBook\n"
+msgstr "Adresboek"
 
-#: ../libplugin.c:417 ../libplugin.c:446 ../sync.c:3249 ../todo.c:389
+#: ../jpilot-dump.c:97
 #, fuzzy, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Fout bij lezen van %s\n"
-
-#: ../libplugin.c:473 ../utils.c:2052
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
-msgstr ""
-
-#: ../libplugin.c:482 ../utils.c:2064 ../utils.c:2111
-#, fuzzy
-msgid "Unable to open PC records file\n"
-msgstr "Kon %s niet openen\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr "Adresboek"
 
-#: ../libplugin.c:488 ../utils.c:2073
-#, fuzzy
-msgid "Couldn't find record to delete\n"
-msgstr "Kon categorie %s niet vanaf hier toevoegen\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr "Adresboek"
 
-#: ../libplugin.c:506 ../utils.c:2094
+#: ../jpilot-dump.c:99
 #, c-format
-msgid "Unknown header version %d\n"
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr ""
 
-#: ../libplugin.c:519
-#, fuzzy
-msgid "Couldn't open PC records file\n"
-msgstr "Kon bestand %s niet openen\n"
-
-#: ../libplugin.c:680 ../libplugin.c:772 ../utils.c:1570 ../utils.c:1583
+#: ../jpilot-dump.c:100
 #, fuzzy, c-format
-msgid "Error opening file: %s\n"
-msgstr "Fout bij openen bestand"
-
-#: ../libplugin.c:709
-#, fuzzy
-msgid "Error reading PC file 1\n"
-msgstr "Fout bij lezen van %s\n"
+msgid " -A dump Address book\n"
+msgstr "Adresboek"
 
-#: ../libplugin.c:725
-#, fuzzy
-msgid "Error reading PC file 2\n"
-msgstr "Fout bij lezen van %s\n"
+#: ../jpilot-dump.c:101
+#, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr ""
 
-#: ../libplugin.c:900
+#: ../jpilot-dump.c:102
 #, fuzzy, c-format
-msgid "Error reading %s 5\n"
-msgstr "Fout bij lezen van %s\n"
+msgid " -M dump Memos\n"
+msgstr "Adresboek"
+
+#: ../jpilot-dump.c:163
+#, c-format
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../log.c:95
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
 #, fuzzy, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Kan logbestand niet openen, ik geef op.\n"
+msgid "%s: Unable to open file:%s\n"
+msgstr "Kan bestand niet openen: %s\n"
 
-#: ../log.c:102
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "Kan logbestand niet openen\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
+#: ../jpilot-merge.c:270
+#, c-format
+msgid "Records added         = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:271
 #, c-format
-msgid "Imported Memo %s\n"
+msgid "Records deleted       = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Bestand lijkt niet de 'memopad.dat'-indeling te hebben\n"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:273
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "Kan memo %d niet exporteren\n"
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../monthview_gui.c:521
-msgid "Monthly View"
-msgstr "Maandoverzicht"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Palm-wachtwoord"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Incorrect, geef PalmOS-wachtwoord opnieuw"
+#: ../jpilot-merge.c:293
+#, c-format
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "Geef PalmOS-wachtwoord"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../plugins.c:90 ../plugins.c:204 ../restore_gui.c:133
-msgid "infinite loop"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
 msgstr ""
 
-#: ../plugins.c:217
+#: ../jpilot-merge.c:296
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
 
-#: ../plugins.c:218
-msgid "Wrong Version\n"
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
 msgstr ""
 
-#: ../plugins.c:219
-msgid "Check preferences->conduits\n"
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
 msgstr ""
 
-#: ../plugins.c:275
+#: ../jpilot-merge.c:299
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is quite simple to destroy your databases by accidentally merging\n"
 msgstr ""
 
-#: ../plugins.c:292 ../plugins.c:318
+#: ../jpilot-merge.c:300
 #, c-format
-msgid " plugin is invalid: [%s]\n"
+msgid "  address records into datebook databases, etc.\n"
 msgstr ""
 
-#: ../plugins.c:300
+#: ../jpilot-sync.c:64
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "Plugin:[%s]\n"
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
 
-#: ../plugins.c:301
+#: ../jpilot-sync.c:65 ../utils.c:1871
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
+msgid " -v display version and compile options\n"
 msgstr ""
 
-#: ../plugins.c:303
-msgid "It is too old to work with this version of J-Pilot.\n"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, c-format
+msgid " -d display debug info to stdout\n"
 msgstr ""
 
-#: ../prefs.c:400
-msgid "%B %d, %Y"
+#: ../jpilot-sync.c:68
+#, c-format
+msgid " -P skip loading plugins\n"
 msgstr ""
 
-#: ../prefs.c:401
-msgid "%d %B %Y"
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
 msgstr ""
 
-#: ../prefs.c:402
-msgid "%d. %B %Y"
+#: ../jpilot-sync.c:70
+#, c-format
+msgid " -l loop, otherwise sync once and exit\n"
 msgstr ""
 
-#: ../prefs.c:403
-msgid "%d %B, %Y"
+#: ../jpilot-sync.c:71
+#, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
 msgstr ""
 
-#: ../prefs.c:404
-msgid "%Y. %B. %d"
-msgstr ""
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Fout bij openen bestand"
 
-#: ../prefs.c:405
-msgid "%Y %B %d"
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
 msgstr ""
 
-#: ../prefs_gui.c:387
-msgid "Preferences"
-msgstr "Voorkeuren"
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Fout bij openen bestand: next_id()\n"
 
-#: ../prefs_gui.c:417
-msgid "Locale"
-msgstr "Taalregio"
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
 
-#: ../prefs_gui.c:419
-msgid "Settings"
-msgstr "Instellingen"
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Fout"
 
-#: ../prefs_gui.c:421
-msgid "Datebook"
-msgstr "Agenda"
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
 
-#: ../prefs_gui.c:425
-msgid "ToDo"
-msgstr "Takenlijst"
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
 
-#: ../prefs_gui.c:427
-#, fuzzy
-msgid "Memo"
-msgstr "Memo"
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#: ../prefs_gui.c:429
-msgid "Alarms"
-msgstr "Herinneringen"
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
 
-#: ../prefs_gui.c:431
-msgid "Conduits"
-msgstr "Onderdelen"
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
 
-#. Shortdate
-#: ../prefs_gui.c:456
-msgid "Short date format "
-msgstr "Korte datumopmaak "
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr ""
 
-#. Longdate
-#: ../prefs_gui.c:469
-msgid "Long date format "
-msgstr "Lange datumopmaak "
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+#, fuzzy
+msgid "Unable to open PC records file\n"
+msgstr "Kon %s niet openen\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+#, fuzzy
+msgid "Couldn't find record to delete\n"
+msgstr "Kon categorie %s niet vanaf hier toevoegen\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr ""
+
+#: ../libplugin.c:180
+#, fuzzy, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d Fout bij lezen van %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, fuzzy, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Fout bij lezen van %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, fuzzy, c-format
+msgid "Error opening file: %s\n"
+msgstr "Fout bij openen bestand"
+
+#: ../libplugin.c:524
+#, fuzzy, c-format
+msgid "Error reading %s 5\n"
+msgstr "Fout bij lezen van %s\n"
+
+#: ../libplugin.c:799
+#, fuzzy
+msgid "Error reading PC file 1\n"
+msgstr "Fout bij lezen van %s\n"
+
+#: ../libplugin.c:815
+#, fuzzy
+msgid "Error reading PC file 2\n"
+msgstr "Fout bij lezen van %s\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr ""
+
+#: ../log.c:98
+#, fuzzy, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Kan logbestand niet openen, ik geef op.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "Kan logbestand niet openen\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr ""
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr ""
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Bestand lijkt niet de 'memopad.dat'-indeling te hebben\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "Kan memo %d niet exporteren\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Memoblok"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Maandoverzicht"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+#, fuzzy
+msgid "last char truncated"
+msgstr "laatst gewijzigd: "
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Palm-wachtwoord"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Incorrect, geef PalmOS-wachtwoord opnieuw"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Geef PalmOS-wachtwoord"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Fout bij lezen van bestand: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr ""
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr ""
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr ""
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr ""
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr ""
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "Plugin:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr ""
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr ""
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr ""
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr ""
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr ""
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr ""
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
+msgstr ""
+
+#: ../prefs.c:423
+msgid "%Y %B %d"
+msgstr ""
+
+#: ../prefs_gui.c:452
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: ../prefs_gui.c:483
+msgid "Locale"
+msgstr "Taalregio"
+
+#: ../prefs_gui.c:485
+msgid "Settings"
+msgstr "Instellingen"
+
+#: ../prefs_gui.c:487
+msgid "Datebook"
+msgstr "Agenda"
+
+#: ../prefs_gui.c:491
+msgid "ToDo"
+msgstr "Takenlijst"
+
+#: ../prefs_gui.c:493
+#, fuzzy
+msgid "Memo"
+msgstr "Memo"
+
+#: ../prefs_gui.c:495
+msgid "Alarms"
+msgstr "Herinneringen"
+
+#: ../prefs_gui.c:497
+msgid "Conduits"
+msgstr "Onderdelen"
+
+#. Shortdate
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
+msgstr "Korte datumopmaak "
+
+#. Longdate
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
+msgstr "Lange datumopmaak "
 
 #. Time
-#: ../prefs_gui.c:482
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "Tijdopmaak "
 
-#: ../prefs_gui.c:496
-msgid "The first day of the week is "
-msgstr "De eerste dag van de week is "
-
 #. GTK colors file
-#: ../prefs_gui.c:517
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "Mijn GTK-kleurenbestand is "
 
 #. Port
-#: ../prefs_gui.c:530
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Seriële poort (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Synchroniseer memoblok"
 
-#. Rate
-#: ../prefs_gui.c:547
+#. Serial Rate
+#: ../prefs_gui.c:605
 msgid "Serial Rate"
 msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:560
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Aantal te archiveren backups"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:577
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Verwijderde items tonen (Standaard: Nee)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:581
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Gewijzigde verwijderde items tonen (standaard: Nee)"
 
-#: ../prefs_gui.c:586
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr ""
 
 #. Show tooltips check box
-#: ../prefs_gui.c:590
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr ""
 
-#: ../prefs_gui.c:602
-msgid "Use Datebook database (Palm OS <= 3.5)"
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:605
-msgid "Use Calendar database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr ""
 
 #. Show highlight days check box
-#: ../prefs_gui.c:632
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Laat afspraken zien op kalender"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr ""
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr ""
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:638
+#: ../prefs_gui.c:710
 #, fuzzy
 msgid "Use DateBk note tags"
 msgstr "Gebruik DateBk notitie-opties"
 
-#: ../prefs_gui.c:641
+#: ../prefs_gui.c:713
 #, fuzzy
 msgid "DateBk support disabled in this build"
 msgstr "Geen DateBk ondersteuning in deze build"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:648
-msgid "Annotate today in day, week, and month views"
-msgstr ""
-
-#: ../prefs_gui.c:653
-msgid "Append years on anniversaries in day, week, and month views"
-msgstr ""
-
-#: ../prefs_gui.c:664
-msgid "Use Address database (Palm OS <= 3.5)"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:667
-msgid "Use Contacts database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:696
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Mailcommando"
 
-#: ../prefs_gui.c:710
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s wordt vervangen door het e-mailadres"
 
-#: ../prefs_gui.c:722
-msgid "Use ToDo database (Palm OS <= 3.5) "
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:725
-msgid "Use Task database (Palm OS >= 4.0) "
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
 msgstr ""
 
-#. The hide completed check box
-#: ../prefs_gui.c:752
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Verberg voltooide taken"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:756
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr ""
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:760
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr ""
 
 #. Use Manana check box
-#: ../prefs_gui.c:765
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Gebruik Manana database"
 
-#: ../prefs_gui.c:773
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr ""
 
-#: ../prefs_gui.c:794
-msgid "Use Memo database (Palm OS <= 3.5)"
-msgstr ""
+#: ../prefs_gui.c:856
+#, fuzzy
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr "Gebruik Memo32 (pedit32)"
 
-#: ../prefs_gui.c:797
-msgid "Use Memos database (Palm OS >= 4.0)"
-msgstr ""
+#: ../prefs_gui.c:859
+#, fuzzy
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr "Gebruik Memo32 (pedit32)"
 
-#: ../prefs_gui.c:800
+#: ../prefs_gui.c:862
 #, fuzzy
 msgid "Use Memo32 database (pedit32)"
 msgstr "Gebruik Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:847
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Open vensters voor afspraakherinneringen"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:851
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Voer dit commando uit"
 
-#. Shell warning
-#: ../prefs_gui.c:855
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
-msgstr "WAARSCHUWING: willekeurige shell-commando's invoeren kunnen gevaarlijk zijn!!!"
+msgstr ""
+"WAARSCHUWING: willekeurige shell-commando's invoeren kunnen gevaarlijk "
+"zijn!!!"
 
-#: ../prefs_gui.c:863
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Alarm commando"
 
-#: ../prefs_gui.c:876
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t wordt vervangen door de alarmtijd"
 
-#: ../prefs_gui.c:880
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d wordt vervangen door de alarmdatum"
 
-#: ../prefs_gui.c:885
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D wordt vervangen door de alarmbeschrijving"
 
-#: ../prefs_gui.c:889
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N wordt vervangen door de alarmnotitie"
 
-#: ../prefs_gui.c:893
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (vervangende omschrijving) is uitgeschakeld in deze build"
 
-#: ../prefs_gui.c:897
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (vervangende notitie) is uitgeschakeld in deze build"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:906
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Synchroniseer agenda"
 
-#. Show sync address check box
-#: ../prefs_gui.c:910
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Synchroniseer adresboek"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:914
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Synchroniseer takenlijst"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:925
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Synchroniseer memoblok"
 
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:930
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Synchroniseer Manana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:936
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Gebruik J-OS (Niet-Japanse PalmOS: Workpad/CLIE)"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:949
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, fuzzy, c-format
 msgid "Sync %s (%s)"
 msgstr "Synchronisatie van %s\n"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Afdrukopties"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Paperformaat"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Dagprint"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Weekprint"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Maandprint"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "Een item"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "%s item verwijderd."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Alle items in deze categorie"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Print alle items"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Een item per pagina"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr "Lege lijnen tussen ieder item"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Print commando (bijv. lpr of cat > file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:238
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Handheld herstellen"
 
-#: ../restore_gui.c:178
-msgid ""
-"Unable to convert filename for GTK display\n"
-"See console log to find which file will not be restored"
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
 msgstr ""
 
-#: ../restore_gui.c:180
-#, c-format
-msgid ""
-"Unable to convert filename for GTK display\n"
-"File %s will not be restored\n"
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
 msgstr ""
 
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Bestanden die geinstalleerd zullen worden"
+
 #. Label for instructions
-#: ../restore_gui.c:258
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Om uw handheld te herstellen:"
 
-#: ../restore_gui.c:261
-msgid "1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1. Kies alle applicaties die u wilt terugplaatsen.  Standaard: Alles."
 
-#: ../restore_gui.c:264
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Voer de gebruikersnaam en de gebruikers-ID in."
 
-#: ../restore_gui.c:267
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Druk op OK."
 
-#: ../restore_gui.c:270
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Dit zal alle data op de handheld overschrijven."
 
-#: ../restore_gui.c:291
-msgid "User Name"
-msgstr "Gebruikersnaam"
-
-#: ../search_gui.c:123
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "Agenda"
 
-#: ../search_gui.c:204
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "Adresboek"
 
-#: ../search_gui.c:270
-msgid "todo"
-msgstr ""
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
+msgid "todo"
+msgstr ""
+
+#: ../search_gui.c:359
+msgid "memo"
+msgstr "Memo"
+
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "Memo"
+
+#: ../search_gui.c:419
+msgid "plugin ?"
+msgstr "Plugin ?"
+
+#: ../search_gui.c:499
+msgid "No records found"
+msgstr "Geen items gevonden"
+
+#: ../search_gui.c:598
+msgid "Search"
+msgstr "Zoeken"
+
+#. Search label
+#: ../search_gui.c:615
+msgid "Search for: "
+msgstr "Zoeken naar: "
+
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
+msgid "Case Sensitive"
+msgstr "Hoofdlettergevoelig"
+
+#: ../sync.c:118
+msgid "open lock file failed\n"
+msgstr "openen van vergrendelingsbestand is mislukt\n"
+
+#: ../sync.c:131
+msgid "lock failed\n"
+msgstr "vergrendelen is mislukt\n"
+
+#: ../sync.c:136
+#, c-format
+msgid "sync file is locked by pid %d\n"
+msgstr "synchronisatiebestand is vergrendeld door PID %d\n"
+
+#: ../sync.c:175
+msgid "unlock failed\n"
+msgstr "ontgrendelen is mislukt\n"
+
+#: ../sync.c:180
+#, c-format
+msgid "sync is locked by pid %d\n"
+msgstr ""
+
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "Kijk uw seriele poort en instellingen na\n"
+
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "Kan persoonlijke map niet lezen\n"
+
+#: ../sync.c:1085 ../sync.c:1423
+#, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr ""
+"%s (Creator ID '%s') is up to date, het ophalen daarvan wordt overgeslagen.\n"
+
+#: ../sync.c:1089 ../sync.c:1427
+#, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Ophalen van '%s' (Creator ID '%s')..."
+
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "Mislukt, het was onmogelijk om het bestand %s aan te maken\n"
+
+#: ../sync.c:1100 ../sync.c:1438
+#, fuzzy, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr "Mislukt, het was onmogelijk om de database te backuppen\n"
+
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "OK\n"
+
+#: ../sync.c:1304
+#, c-format
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "%s overgeslagen (Creator ID '%s')\n"
+
+#: ../sync.c:1498
+#, c-format
+msgid "Installing %s "
+msgstr "Installeren van %s"
+
+#: ../sync.c:1504 ../sync.c:1540
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Kon '%s' niet openen!\n"
+
+#: ../sync.c:1508
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Kon '%s' niet openen!\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(Creator-ID is '%s')..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(Creator-ID is '%s')..."
+
+#: ../sync.c:1530
+#, c-format
+msgid "(SDcard dir %s)... "
+msgstr ""
+
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
+#, c-format
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"Kan bestand niet openen: %s\n"
+
+#: ../sync.c:1615
+#, c-format
+msgid "Install %s failed"
+msgstr "Installeren van %s is mislukt"
+
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Mislukt.\n"
+
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s is geïnstalleerd "
+
+#: ../sync.c:1736
+#, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d Fout bij het ophalen van programma-info %s\n"
+
+#: ../sync.c:1742 ../sync.c:1772
+#, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d Fout bij uitpakken van programma-info %s\n"
+
+#: ../sync.c:1763
+#, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Fout bij lezen van programma-info, blok voor %s\n"
+
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "Kon categorie %s niet vanaf hier toevoegen\n"
+
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "Te veel categorien op andere kant.\n"
+
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Alle items op de pc in %s worden verplaatst naar %s.\n"
 
-#: ../search_gui.c:324
-msgid "memo"
-msgstr "Memo"
+#: ../sync.c:2106 ../sync.c:2824
+#, c-format
+msgid "Syncing %s\n"
+msgstr "Synchronisatie van %s\n"
 
-#: ../search_gui.c:380
-msgid "plugin ?"
-msgstr "Plugin ?"
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
+#, c-format
+msgid "Wrote an %s record."
+msgstr "Een %s item is geschreven."
 
-#: ../search_gui.c:458
-msgid "No records found"
-msgstr "Geen items gevonden"
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
+#, c-format
+msgid "Writing an %s record failed."
+msgstr "Het schrijven van een %s item is mislukt."
 
-#: ../search_gui.c:559 ../search_gui.c:622
-msgid "Search"
-msgstr "Zoeken"
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
+#, c-format
+msgid "Deleting an %s record failed."
+msgstr "Het verwijderen van een %s item is mislukt."
 
-#: ../search_gui.c:575
-msgid "Search for: "
-msgstr "Zoeken naar: "
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
+#, c-format
+msgid "Deleted an %s record."
+msgstr "%s item verwijderd."
 
-#: ../search_gui.c:582
-msgid "Case Sensitive"
-msgstr "Hoofdlettergevoelig"
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "%s item verwijderd."
 
-#: ../sync.c:142
-msgid "open lock file failed\n"
-msgstr "openen van vergrendelingsbestand is mislukt\n"
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
+#, c-format
+msgid "Wrote a %s record."
+msgstr "%s geschreven."
 
-#: ../sync.c:155
-msgid "lock failed\n"
-msgstr "vergrendelen is mislukt\n"
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
+#, c-format
+msgid "Writing a %s record failed."
+msgstr "Het schrijven van een %s item is mislukt."
 
-#: ../sync.c:158
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
-msgid "sync file is locked by pid %d\n"
-msgstr "synchronisatiebestand is vergrendeld door PID %d\n"
+msgid "Deleting a %s record failed."
+msgstr "Het verwijderen van een %s item is mislukt."
 
-#: ../sync.c:192
-msgid "unlock failed\n"
-msgstr "ontgrendelen is mislukt\n"
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
+#, c-format
+msgid "Deleted a %s record."
+msgstr "%s item verwijderd."
 
-#: ../sync.c:195
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "sync is locked by pid %d\n"
+msgid "Sync Conflict: duplicated a %s record."
 msgstr ""
 
-#: ../sync.c:286
-#, fuzzy, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "Druk nu op de HotSync knop\n"
-
-#: ../sync.c:339
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
-msgid "Exiting with status %s\n"
-msgstr "Verlaten met status %s\n"
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:340
-msgid "Finished\n"
-msgstr "Klaar\n"
+#: ../sync.c:2368 ../sync.c:2708
+msgid ""
+"dlp_DeleteRecord failed\n"
+"This could be because the record was already deleted on the Palm\n"
+msgstr ""
+"dlp_DeleteRecord mislukt\n"
+"Dit zou veroorzaakt kunnen zijn omdat het item al verwijderd was op de Palm\n"
 
-#: ../sync.c:474
+#: ../sync.c:2937
 msgid "Finished installing user information.\n"
 msgstr ""
 
-#: ../sync.c:499 ../sync.c:617
-msgid "Check your serial port and settings\n"
-msgstr "Kijk uw seriele poort en instellingen na\n"
-
-#: ../sync.c:802
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr "Synchronisatie van apparaat aan %s\n"
 
-#: ../sync.c:803
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr "Druk nu op de HotSync knop\n"
 
-#: ../sync.c:855 ../sync.c:877 ../sync.c:899
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr "Laatst gesynchroniseerde gebruikersnaam-->\"%s\"\n"
 
-#: ../sync.c:856 ../sync.c:878 ../sync.c:900
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr "Laatst gesynchroniseerde gebruikers ID-->\"%d\"\n"
 
-#: ../sync.c:857 ../sync.c:879 ../sync.c:901
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr "Deze gebruikersnaam-->\"%s\"\n"
 
-#: ../sync.c:858 ../sync.c:880 ../sync.c:902
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
 msgid " This User ID-->%d\n"
 msgstr "Deze UserID-->%d\n"
 
-#: ../sync.c:923
+#: ../sync.c:3204
 #, c-format
 msgid "Username is \"%s\"\n"
 msgstr "Gebruikersnaam is \"%s\"\n"
 
-#: ../sync.c:924
+#: ../sync.c:3205
 #, c-format
 msgid "User ID is %d\n"
 msgstr "Gebruikers ID is %d\n"
 
-#: ../sync.c:926 ../sync.c:934
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr "lastSyncPC = %d\n"
 
-#: ../sync.c:927
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr "Deze PC = %lu\n"
 
-#: ../sync.c:930
-#, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Laatste gebruikersnaam = [%s]\n"
-
-#: ../sync.c:931
-#, c-format
-msgid "Last UserID = %d\n"
-msgstr "Laatste gebruikers ID = %d\n"
-
-#: ../sync.c:932
-#, c-format
-msgid "Username = [%s]\n"
-msgstr "Gebruikersnaam = [%s]\n"
-
-#: ../sync.c:933
-#, c-format
-msgid "userID = %d\n"
-msgstr "Gebruikers ID = %d\n"
-
-#: ../sync.c:951
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr "Synchronisatie geannuleerd\n"
 
-#: ../sync.c:974
+#: ../sync.c:3255
 msgid "Finished restoring handheld.\n"
 msgstr "Klaar met herstelling handheld.\n"
 
-#: ../sync.c:975
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr "U dient misschien te synchroniseren om J-Pilot te updaten.\n"
 
-#: ../sync.c:1006
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr "Snel synchroniseren.\n"
 
-#: ../sync.c:1019
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr "Langzaam synchroniseren.\n"
 
-#: ../sync.c:1094
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr "Bedankt voor het gebruiken van J-Pilot"
 
-#: ../sync.c:1139
+#: ../sync.c:3411 ../sync.c:3479
 msgid "Finished.\n"
 msgstr "Klaar.\n"
 
-#: ../sync.c:1179 ../sync.c:2923
-#, c-format
-msgid "Syncing %s\n"
-msgstr "Synchronisatie van %s\n"
-
-#: ../sync.c:1187 ../sync.c:2496 ../sync.c:2931
-#, c-format
-msgid "Wrote an %s record."
-msgstr "Een %s item is geschreven."
-
-#: ../sync.c:1189 ../sync.c:2498 ../sync.c:2933
+#: ../sync.c:3446
 #, c-format
-msgid "Writing an %s record failed."
-msgstr "Het schrijven van een %s item is mislukt."
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#: ../sync.c:1191 ../sync.c:2500 ../sync.c:2935
+#: ../sync.c:3447
 #, c-format
-msgid "Deleting an %s record failed."
-msgstr "Het verwijderen van een %s item is mislukt."
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:1193 ../sync.c:2502 ../sync.c:2937
+#: ../sync.c:3478
 #, c-format
-msgid "Deleted an %s record."
-msgstr "%s item verwijderd."
+msgid "Exiting with status %s\n"
+msgstr "Verlaten met status %s\n"
 
-#: ../sync.c:1195 ../sync.c:2504
+#: ../todo.c:264
 #, fuzzy, c-format
-msgid "Sync Conflict: duplicated an %s record."
-msgstr "%s item verwijderd."
-
-#: ../sync.c:1198 ../sync.c:2507 ../sync.c:2940
-#, c-format
-msgid "Wrote a %s record."
-msgstr "%s geschreven."
+msgid "ToDo description text > %d, truncating to %d\n"
+msgstr "Waarschuwing: ToDo beschrijving te lang, inkorten naar %d\n"
 
-#: ../sync.c:1200 ../sync.c:2509 ../sync.c:2942
-#, c-format
-msgid "Writing a %s record failed."
-msgstr "Het schrijven van een %s item is mislukt."
+#: ../todo.c:270
+#, fuzzy, c-format
+msgid "ToDo note text > %d, truncating to %d\n"
+msgstr "Waarschuwing: ToDo notitie te lang, inkorten naar %d\n"
 
-#: ../sync.c:1202 ../sync.c:2511 ../sync.c:2944
-#, c-format
-msgid "Deleting a %s record failed."
-msgstr "Het verwijderen van een %s item is mislukt."
+#: ../todo_gui.c:159
+msgid "Due Date"
+msgstr "Einddatum"
 
-#: ../sync.c:1204 ../sync.c:2513 ../sync.c:2946
-#, c-format
-msgid "Deleted a %s record."
-msgstr "%s item verwijderd."
+#: ../todo_gui.c:532
+msgid "File doesn't appear to be todo.dat format\n"
+msgstr "Bestand lijkt niet de 'todo.dat'-indeling te hebben\n"
 
-#: ../sync.c:1206 ../sync.c:2515
-#, c-format
-msgid "Sync Conflict: duplicated a %s record."
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
 msgstr ""
 
-#: ../sync.c:1228
+#: ../todo_gui.c:688
 #, c-format
-msgid "number of records = %d\n"
-msgstr "aantal items = %d\n"
-
-#: ../sync.c:1376 ../sync.c:2668
 msgid ""
-"dlp_DeleteRecord failed\n"
-"This could be because the record was already deleted on the Palm\n"
+"ToDo exported from %s %s on %s\n"
+"\n"
 msgstr ""
-"dlp_DeleteRecord mislukt\n"
-"Dit zou veroorzaakt kunnen zijn omdat het item al verwijderd was op de Palm\n"
-
-#: ../sync.c:1551 ../sync.c:1994
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (Creator ID '%s') is up to date, het ophalen daarvan wordt overgeslagen.\n"
-
-#: ../sync.c:1555 ../sync.c:1998
-#, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Ophalen van '%s' (Creator ID '%s')..."
 
-#: ../sync.c:1562 ../sync.c:2004
+#: ../todo_gui.c:726
 #, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Mislukt, het was onmogelijk om het bestand %s aan te maken\n"
+msgid "Can't export todo %d\n"
+msgstr ""
 
-#: ../sync.c:1573 ../sync.c:2013
+#: ../todo_gui.c:766
 #, fuzzy, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Mislukt, het was onmogelijk om de database te backuppen\n"
-
-#: ../sync.c:1577 ../sync.c:2017 ../sync.c:2199
-msgid "OK\n"
-msgstr "OK\n"
-
-#: ../sync.c:1870
-#, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "%s overgeslagen (Creator ID '%s')\n"
+msgid "Due Date: None\n"
+msgstr "Einddatum"
 
-#: ../sync.c:2085
-#, c-format
-msgid "Installing %s "
-msgstr "Installeren van %s"
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Einddatum"
 
-#: ../sync.c:2091
+#: ../todo_gui.c:771
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"Kon '%s' niet openen!\n"
+msgid "Priority: %d\n"
+msgstr "Prioriteit"
 
-#: ../sync.c:2095
+#: ../todo_gui.c:772
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"Kon '%s' niet openen!\n"
+msgid "Completed: %s\n"
+msgstr "Voltooid"
 
-#: ../sync.c:2107
+#: ../todo_gui.c:774
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(Creator-ID is '%s')..."
+msgid "Description: %s\n"
+msgstr ""
 
-#: ../sync.c:2127 ../sync.c:2140 ../sync.c:2155 ../sync.c:2168
+#: ../todo_gui.c:777
 #, c-format
 msgid ""
+"Note: %s\n"
 "\n"
-"Unable to open file: %s\n"
 msgstr ""
-"\n"
-"Kan bestand niet openen: %s\n"
-
-#: ../sync.c:2184
-#, c-format
-msgid "Install %s failed"
-msgstr "Installeren van %s is mislukt"
-
-#: ../sync.c:2188
-msgid "Failed.\n"
-msgstr "Mislukt.\n"
-
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:2195
-#, c-format
-msgid "Installed %s "
-msgstr "%s is geïnstalleerd "
-
-#: ../sync.c:2219 ../sync.c:2225
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Kan bestand niet openen: %s%s\n"
-
-#: ../sync.c:2404
-msgid "Unable to read home dir\n"
-msgstr "Kan persoonlijke map niet lezen\n"
 
-#: ../sync.c:3025
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: aantal items = %d\n"
-
-#: ../sync.c:3026
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "pc: aantal items = %d\n"
+#: ../todo_gui.c:1610
+msgid "Priority out of range\n"
+msgstr ""
 
-#: ../sync.c:3258
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d Fout bij het ophalen van programma-info %s\n"
+msgid "No date"
+msgstr "Geen datum"
 
-#: ../sync.c:3264 ../sync.c:3305
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d Fout bij uitpakken van programma-info %s\n"
+#. Completed checkbox
+#: ../todo_gui.c:2411
+msgid "Completed"
+msgstr "Voltooid"
 
-#: ../sync.c:3286 ../sync.c:3298
-#, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Fout bij lezen van programma-info, blok voor %s\n"
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
+msgstr "Prioriteit"
 
-#. Fix - need a func for this logging
-#: ../sync.c:3442 ../sync.c:3446
-#, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "Kon categorie %s niet vanaf hier toevoegen\n"
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
 
-#: ../sync.c:3443 ../sync.c:3449
-#, c-format
-msgid "Too many categories on remote.\n"
-msgstr "Te veel categorien op andere kant.\n"
+#: ../todo_gui.c:2441
+msgid "Date Due:"
+msgstr "Einddatum"
 
-#: ../sync.c:3444 ../sync.c:3452
-#, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Alle items op de pc in %s worden verplaatst naar %s.\n"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Vandaag"
 
-#: ../todo.c:247
+#: ../utils.c:575
 #, fuzzy, c-format
-msgid "ToDo description text > %d, truncating to %d\n"
-msgstr "Waarschuwing: ToDo beschrijving te lang, inkorten naar %d\n"
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Kon geen leeg DB bestand vinden.\n"
 
-#: ../todo.c:253
-#, fuzzy, c-format
-msgid "ToDo note text > %d, truncating to %d\n"
-msgstr "Waarschuwing: ToDo notitie te lang, inkorten naar %d\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " mag niet geïnstalleerd zijn\n"
 
-#: ../todo.c:378
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
 #, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Fout bij het lezen van category informatie %s\n"
-
-#: ../todo_gui.c:149
-msgid "Due Date"
-msgstr "Einddatum"
-
-#: ../todo_gui.c:536
-msgid "File doesn't appear to be todo.dat format\n"
-msgstr "Bestand lijkt niet de 'todo.dat'-indeling te hebben\n"
+msgid "Can't create directory %s\n"
+msgstr "Kan map %s niet aanmaken\n"
 
-#: ../todo_gui.c:692 ../todo_gui.c:707
-#, c-format
-msgid "Can't export todo %d\n"
-msgstr ""
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s is een map"
 
-#: ../todo_gui.c:1547
-msgid "Priority out of range\n"
-msgstr ""
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "Kan geen bestanden in map %s schrijven\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1092
-#, c-format
-msgid "No date"
-msgstr "Geen datum"
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Gewijzigd item bewaren?"
 
-#. The completed check box
-#: ../todo_gui.c:2226
-msgid "Completed"
-msgstr "Voltooid"
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Wilt u de wijzigingen voor dit item bewaren?"
 
-#: ../todo_gui.c:2234
-msgid "Priority: "
-msgstr "Prioriteit"
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Nieuw item opslaan?"
 
-#: ../todo_gui.c:2254
-msgid "Date Due:"
-msgstr "Einddatum"
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Wilt u dit nieuwe item opslaan?"
 
-#. Note textbox
-#: ../todo_gui.c:2316 ../Expense/expense.c:1819 ../KeyRing/keyring.c:2256
-msgid "Note"
-msgstr "Notitie"
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr ""
 
-#: ../utils.c:79
-msgid " -v displays version and compile options and exits.\n"
+#: ../utils.c:1874
+#, c-format
+msgid " -p skip loading plugins\n"
 msgstr ""
 
-#: ../utils.c:81
-msgid " -d displays debug info to stdout.\n"
+#: ../utils.c:1875
+#, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr ""
 
-#: ../utils.c:82
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1876
+#, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr ""
 
-#: ../utils.c:83
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
 msgstr ""
 
-#: ../utils.c:84
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
 msgstr ""
 
-#: ../utils.c:85
-msgid " -i makes program iconify itself upon launch.\n"
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
 msgstr ""
 
-#: ../utils.c:86
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr ""
 
-#: ../utils.c:87
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr ""
 
-#: ../utils.c:88
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr ""
 
-#: ../utils.c:114
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Fout bij lezen van bestand"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Compilatiedatum: "
 
-#: ../utils.c:115
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Gecompileerd met deze opties:"
 
-#: ../utils.c:117
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Geinstalleerd in"
 
-#: ../utils.c:119
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link versie"
 
-#: ../utils.c:123
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "USB ondersteuning"
 
-#: ../utils.c:125 ../utils.c:131 ../utils.c:137 ../utils.c:143 ../utils.c:149
-#: ../utils.c:155 ../utils.c:161
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "ja"
 
-#: ../utils.c:127 ../utils.c:133 ../utils.c:139 ../utils.c:145 ../utils.c:151
-#: ../utils.c:157 ../utils.c:163
-msgid "no"
-msgstr "nee"
-
-#: ../utils.c:129
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Prive-items ondersteuning"
 
-#: ../utils.c:135
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "nee"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Datebk ondersteuning"
 
-#: ../utils.c:141
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Plugin ondersteuning"
 
-#: ../utils.c:147
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Manana ondersteuning"
 
-#: ../utils.c:153
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "NLS ondersteuning (vreemde talen)"
 
-#: ../utils.c:159
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "GTK2 ondersteuning"
 
-#: ../utils.c:273
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %A, %x %X"
-msgstr "Vandaag is het %A, %x %X"
+msgid "Can't get HOME environment variable\n"
+msgstr ""
 
-#: ../utils.c:275
+#: ../utils.c:2064
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Vandaag is het %%A, %s %s"
-
-#: ../utils.c:1180
-msgid "Today"
-msgstr "Vandaag"
-
-#: ../utils.c:1396
-msgid "Save Changed Record?"
-msgstr "Gewijzigd item bewaren?"
-
-#: ../utils.c:1397
-msgid "Do you want to save the changes to this record?"
-msgstr "Wilt u de wijzigingen voor dit item bewaren?"
+msgid "HOME environment variable is too long to process\n"
+msgstr ""
 
-#: ../utils.c:1402
-msgid "Save New Record?"
-msgstr "Nieuw item opslaan?"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Categorieën bewerken"
 
-#: ../utils.c:1403
-msgid "Do you want to save this new record?"
-msgstr "Wilt u dit nieuwe item opslaan?"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC ID is 0.\n"
 
-#. Not home;
-#: ../utils.c:1423 ../KeyRing/keyring.c:1646
-msgid "Can't get HOME environment variable\n"
-msgstr ""
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Ik heb een nieuwe PC ID aangemaakt. Het is %lu\n"
 
-#: ../utils.c:1430
-msgid "Your HOME environment variable is too long for me\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
 msgstr ""
 
-#. Can't create directory
-#: ../utils.c:1455 ../utils.c:1459
+#: ../utils.c:3537
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr "Kan map %s niet aanmaken\n"
-
-#: ../utils.c:1465
-#, fuzzy, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr "Bestand lijkt geen address.dat formaat te hebben\n"
+msgid "Today is %A, %x %X"
+msgstr "Vandaag is het %A, %x %X"
 
-#: ../utils.c:1471
+#: ../utils.c:3539
 #, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "Kan geen bestanden in map %s schrijven\n"
+msgid "Today is %%A, %s %s"
+msgstr "Vandaag is het %%A, %s %s"
 
-#: ../utils.c:1527 ../utils.c:1536
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3768
+#, c-format
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
 
-#: ../utils.c:1532
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "Fout bij schrijven van volgend ID naar bestand: next_id()\n"
 
-#: ../utils.c:1549
-msgid "Error opening file: next_id\n"
-msgstr "Fout bij openen bestand: next_id()\n"
-
-#: ../utils.c:1746
+#: ../utils.c:3810
 #, fuzzy, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Kon geen leeg DB bestand vinden.\n"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1749
-msgid " may not be installed.\n"
-msgstr " mag niet geïnstalleerd zijn\n"
-
-#: ../utils.c:1930
-msgid "Error reading file"
-msgstr "Fout bij lezen van bestand"
-
-#: ../utils.c:2671
-msgid "PC ID is 0.\n"
-msgstr "PC ID is 0.\n"
-
-#: ../utils.c:2672
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Ik heb een nieuwe PC ID aangemaakt. Het is %lu\n"
+msgid "Error writing next id to file: %s%s"
+msgstr "Fout bij schrijven van volgend ID naar bestand: next_id()\n"
 
-#: ../weekview_gui.c:328
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Weekoverzicht"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Australië"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Oostenrijk"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "België"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brazilië"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Canada"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Denemarken"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (euro)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finland"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Frankrijk"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Duitsland"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "IJsland"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "India"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Indonesië"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Ierland"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Italië"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Japan"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Korea"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Maleisië"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Nieuw-Zeeland"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Noorwegen"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "China"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Filipijnen"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Spanje"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Zweden"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Zwitserland"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Verenigd Koninkrijk"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "Verenigde Staten"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Uitgaven"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1367
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Vlucht"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1368
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Ontbijt"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1369
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Bus"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1370
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Zakendiners"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1371
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Autohuur"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1372
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Diner"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1373
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Ontspanning"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1374
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fax"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1375
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Benzine"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1376
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Cadeau"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1377
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hotel"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1378
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Ongelukken"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1379
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Wasgoed"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1380
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limo"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1381
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Herberg"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1382
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Lunch"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1383
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Kilometervergoeding"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1385
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Parkeren"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1386
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Post"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1387
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Snack"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1388
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Metro"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1389
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Voorraad"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1390
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taxi"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1391
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1392
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Fooien"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1393
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Tol"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1394
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Trein"
 
-#: ../Expense/expense.c:1167
-msgid "Expense: Unknown category\n"
-msgstr ""
-
-#: ../Expense/expense.c:1173
+#: ../Expense/expense.c:1237
 msgid "Expense: Unknown expense type\n"
 msgstr ""
 
-#: ../Expense/expense.c:1179
+#: ../Expense/expense.c:1243
 msgid "Expense: Unknown payment type\n"
 msgstr ""
 
-#: ../Expense/expense.c:1356
+#: ../Expense/expense.c:1375
 msgid "American Express"
 msgstr "American Express"
 
-#: ../Expense/expense.c:1357
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Contant"
 
-#: ../Expense/expense.c:1358
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Cheque"
 
-#: ../Expense/expense.c:1359
+#: ../Expense/expense.c:1378
 msgid "Credit Card"
 msgstr "Creditcard"
 
-#: ../Expense/expense.c:1360
+#: ../Expense/expense.c:1379
 msgid "Master Card"
 msgstr "MasterCard"
 
-#: ../Expense/expense.c:1361
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Prepaid"
 
-#: ../Expense/expense.c:1362
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Type:"
+
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Hoeveelheid:"
+
 #. Category Menu
-#: ../Expense/expense.c:1644
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Categorie:"
 
 #. Type Menu
-#: ../Expense/expense.c:1657
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Type:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1670
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Betaling:"
 
 #. Currency Menu
-#: ../Expense/expense.c:1683
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Valuta:"
 
-#. Date Spinners
-#: ../Expense/expense.c:1696
-msgid "Date:"
-msgstr "Datum:"
-
-#: ../Expense/expense.c:1713
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Maand:"
 
-#: ../Expense/expense.c:1727
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Dag:"
 
-#: ../Expense/expense.c:1741
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Jaar:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1754
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Hoeveelheid:"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1768
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Winkel:"
 
 #. City
-#: ../Expense/expense.c:1782
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "Stad:"
 
 #. Attendees
-#: ../Expense/expense.c:1796
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr ""
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1561
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Incorrect, geef het KeyRing wachtwoord opnieuw"
 
-#: ../KeyRing/keyring.c:1563
+#: ../KeyRing/keyring.c:1699
 #, fuzzy
 msgid "Enter a NEW KeyRing Password"
 msgstr "Voer KeyRing wachtwoord in"
 
-#: ../KeyRing/keyring.c:1565
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Voer KeyRing wachtwoord in"
 
-#: ../KeyRing/keyring.c:1651
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr ""
-
-#: ../KeyRing/keyring.c:1656
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1657
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1741 ../KeyRing/keyring.c:1752
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr ""
 
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Kan memo %d niet exporteren\n"
+
 #. Change Password button
-#: ../KeyRing/keyring.c:2039
+#: ../KeyRing/keyring.c:2451
 #, fuzzy
 msgid ""
 "Change\n"
@@ -3064,60 +3669,199 @@ msgid ""
 msgstr "Voer KeyRing wachtwoord in"
 
 #. Clist
-#: ../KeyRing/keyring.c:2124
+#: ../KeyRing/keyring.c:2564
 msgid "Changed"
 msgstr "Gewijzigd"
 
-#: ../KeyRing/keyring.c:2126
+#: ../KeyRing/keyring.c:2566
 msgid "Account"
 msgstr "Account"
 
 #. Name entry
-#: ../KeyRing/keyring.c:2219
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "naam: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2226
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "account: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2233
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "wachtwoord: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2240
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr "laatst gewijzigd: "
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2250
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Wachtwoord aanmaken"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "Synchroniseer memoblok"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 msgid "Done\n"
 msgstr "Klaar\n"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Bestand overschrijven?"
+
+#~ msgid "Field"
+#~ msgstr "Veld"
+
+#, fuzzy
+#~ msgid "email command empty\n"
+#~ msgstr "Mailcommando"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Kan bestand %s%s niet openen\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Kan bestand %s.alarms niet openen\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "U kunt categorie %s niet bewerken.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "U kunt categorie %s niet verwijderen.\n"
+
+#~ msgid "category name"
+#~ msgstr "categorienaam"
+
+#~ msgid "Close"
+#~ msgstr "Sluiten"
+
+#~ msgid "none"
+#~ msgstr "geen"
+
+#~ msgid "W"
+#~ msgstr "W"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Deze gebeurtenis heeft geen bepaalde tijd"
+
+#~ msgid "Start Time"
+#~ msgstr "Begintijd"
+
+#, fuzzy
+#~ msgid "End Time"
+#~ msgstr "Tijd"
+
+#~ msgid "Dismiss"
+#~ msgstr "Annuleren"
+
+#~ msgid "Done"
+#~ msgstr "Klaar"
+
+#~ msgid "Add"
+#~ msgstr "Toevoegen"
+
+#~ msgid "Remove"
+#~ msgstr "Verwijderen"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Gebruikersnaam"
+
+#~ msgid "Clear"
+#~ msgstr "Wissen"
+
+#, fuzzy
+#~ msgid "Show private records"
+#~ msgstr "Laat prive-items zien"
+
+#, fuzzy
+#~ msgid "Hide private records"
+#~ msgstr "Prive-items verbergen"
+
+#, fuzzy
+#~ msgid "Mask private records"
+#~ msgstr "Prive-items bedekken"
+
+#~ msgid "Font"
+#~ msgstr "Lettertype"
+
+#, fuzzy
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Kon bestand %s niet openen\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "De eerste dag van de week is "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Seriële poort (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "One record"
+#~ msgstr "Een item"
+
+#, fuzzy
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "Druk nu op de HotSync knop\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "Klaar\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Laatste gebruikersnaam = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Laatste gebruikers ID = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Gebruikersnaam = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "Gebruikers ID = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: aantal items = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "pc: aantal items = %d\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr "Bestand lijkt geen address.dat formaat te hebben\n"
+
 #~ msgid "kana("
 #~ msgstr "kana("
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 95c83ca5..134ca69f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jpilot 0.99.9\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2007-06-17 22:59-0300\n"
 "Last-Translator: Frederico Goncalves Guimaraes <frederico@teia.bio.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,32 +20,43 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "erro"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Erro lendo informações de categoria %s\n"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Erro abrindo arquivo: %s\n"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "erro"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -52,412 +64,558 @@ msgstr ""
 "O registro foi excluído.\n"
 "Reverta sua exclusão ou copie-o para fazer alterações.\n"
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Não foi possível abrir arquivo: %s\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Não foi possível abrir arquivo: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Arquivo não parece seguir o formato address.dat\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Não arquivado"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "OK"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Não"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Sim"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s é um diretório"
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Erro Abrindo Arquivo"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Deseja sobrescrever o arquivo %s?"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Sobrescrever Arquivo?"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Erro abrindo arquivo: %s"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Não foi possível exportar endereço %d\n"
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-msgid "Field"
-msgstr "Campo"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Categoria:"
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Particular"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "E-mail"
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Tipo de exportação desconhecido\n"
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "Empresa/Nome"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Nome/Empresa"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Nome/Empresa"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Empresa/Nome"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Você não pode modificar um registro excluído\n"
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Categoria ilegal\n"
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "executando comando = [%s]\n"
 
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
+
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "falha em travar\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
 #. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Categoria:"
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
-msgstr "kana("
-
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Escr."
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Disc."
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Sem nome-"
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 registro"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d de %d registros"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
-msgstr "Editar Categorias"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Nome"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Endereço"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Outro"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Nota"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Localizar:"
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "Cancela as modificações"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Exclui o registro selecionado"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Desfazer Exclusão"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Desfaz a exclusão do registro"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Copia o registro selecionado"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Novo Registro"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Adiciona um novo registro"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Adicionar Registro"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Adiciona o novo registro"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Aplicar Mudanças"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "Aplica as modificações"
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Particular"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "Nome"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "Endereço"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "Outro"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "Alterado"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "Todas"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Remover"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "Mostrar\n"
 "na lista"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "Visualização rápida"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "Lembrar-me"
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "Dias"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Todas"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minutos"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Horas"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Lembrar-me"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "Não foi possível abrir arquivo %s%s\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "Não foi possível abrir arquivo: %s%s\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Lembrete de Compromisso"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Compromisso Passado"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Compromisso Adiado"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "Alarme J-Pilot"
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr "loop infinito, quebrando\n"
-
-#: ../alarms.c:1531
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Não foi possível abrir arquivo %s.alarms\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-msgid "rename failed"
-msgstr "falha ao renomear"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "Arquivo corrompido no PC?\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "Falha no fseek - erro fatal\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "falha ao renomear"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Mover"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Editar Categorias"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "O número máximo de categorias (16) já foi atingido"
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Digite Nova Categoria"
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr "Erro ao Editar Categorias"
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Você deve selecionar uma categoria para renomear"
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "Você não pode editar a categoria %s.\n"
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "Digite um Novo Nome de Categoria"
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Você deve selecionar uma categoria para excluir"
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr "Você não pode excluir a categoria %s.\n"
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
@@ -465,199 +623,337 @@ msgstr ""
 "Existem %d registros em %s.\n"
 "Você gostaria de movê-los para %s, ou excluí-los?"
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "estado inválido no arquivo %s, linha %d\n"
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "A categoria %s não pode ser usada mais de uma vez"
 
-#. correctly translate title
-#: ../category.c:813
-msgid "category name"
-msgstr "nome da categoria"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "Categoria:"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "Nova"
 
-#: ../category.c:845
+#: ../category.c:841
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../category.c:960
-msgid "debug"
-msgstr "depurar"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "tipo desconhecido ="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "conta de campos por coluna != %d, formato desconhecido\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "conta de campos != %d, formato desconhecido\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Formato desconhecido, arquivo tem esquema incorreto\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Esquema de arquivo é:"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "Deveria ser:"
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
-msgstr "%s:%d Registro %d, campo %d: Tipo inválido. Esperava-se %d, encontrou-se %d\n"
+msgstr ""
+"%s:%d Registro %d, campo %d: Tipo inválido. Esperava-se %d, encontrou-se %d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "leitura do arquivo terminada\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "Foi encontrado repeatType (%d) desconhecido em DatebookDB\n"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Repetir por:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Repetir nos dias:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Repetir por:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Repetir nos dias:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Repetir nos dias:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Repetir nos dias:"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Dom"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Seg"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Ter"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Qua"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Qui"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Sex"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Sáb"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Terminar em"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Repetir nos dias:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "número de registros = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Nota"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Alarme"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Repetir por:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Dia da semana"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Texto descritor de compromisso > %d, truncando para %d\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Erro"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Arquivo não parece seguir o formato datebook.dat\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "Tipo de exportação desconhecido"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Exportar"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Exportar Todos os Registros de Calendário"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Salvar como"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Procurar"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Categorias do Calendário"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "Fechar"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Começar em"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Terminar em"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4ª"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Última"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -671,71 +967,76 @@ msgstr ""
 "ou na última %s do mês.\n"
 "O que você prefere?"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "Dúvida?"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Este é um evento repetido.\n"
 "Você quer aplicar as mudanças\n"
 "no evento ATUAL, ou em\n"
 "TODAS as ocorrências do evento?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Atual"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "nenhum"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "dia"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "semana"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "mês"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "ano"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Não é possível ter compromissos que se repitam a cada %d %s(s)\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
+#, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr ""
 "Não é possível ter um compromisso semanal que não se repita em nenhum dia da "
 "semana."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Sem tempo"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Compromisso Inválido"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -743,182 +1044,162 @@ msgstr ""
 "A data de término deste compromisso\n"
 "vem antes da data de início."
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Sem Data"
 
-#: ../datebook_gui.c:3021
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "Erro no DateBookDB advanceUnits = %d\n"
 
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "Foi encontrado repeatType desconhecido em DatebookDB\n"
-
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a., %s"
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (HOJE)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Semana"
 
-#: ../datebook_gui.c:4206
-msgid "W"
-msgstr "Q"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "Ver compromissos por semana"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Mês"
 
-#: ../datebook_gui.c:4218
-msgid "M"
-msgstr "S"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "Ver compromissos por mês"
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Categorias"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Tempo"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Mostrar Tarefas"
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Prazo"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarme"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "Dias"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "Evento sem hora específica"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "Data:"
 
-#: ../datebook_gui.c:4493
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Começa em"
 
-#: ../datebook_gui.c:4507
-msgid "Start Time"
-msgstr "Início"
-
-#: ../datebook_gui.c:4525
-msgid "End Time"
-msgstr "Término"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "Fim em"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "Etiquetas DateBk"
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Dia"
 
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Ano"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Este evento não se repete"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Repetir a cada"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "Dia(s)"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Fim em"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "Semana(s)"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "Repetir nos dias:"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "Mês(es)"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Repetir por:"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Dia da semana"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Dia do mês"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "Ano(s)"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Discador"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Prefixo 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Prefixo 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Prefixo 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Nº de telefone:"
 
@@ -926,225 +1207,141 @@ msgstr "Nº de telefone:"
 msgid "Extension"
 msgstr "Extensão"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "Comando de Discagem"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "Descartar"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Navegador de Arquivos"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Selecione registros a serem exportados"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Usar Teclas Control e Shift"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importar"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Para mudar para um diretório oculto, digite-o abaixo e pressione TAB"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "Concluído"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "Importar arquivo do tipo"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "Registro foi marcado como particular"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "Registro não foi marcado como particular"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "Categoria antes da importação era: [%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Registros serão colocados na categoria [%s]"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Importação Tudo"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Ignorar"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Instalar"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "Para mudar para um diretório oculto, digite-o abaixo e pressione TAB"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Arquivos a serem instalados"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Importar arquivo do tipo"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Adicionar"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Arquivos a serem instalados"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Remover"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Instalar"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 msgid "Install User"
 msgstr "Instalar Usuário"
 
-#: ../install_user.c:138
-msgid "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
-msgstr "O dispositivo PalmOS(c) precisa de um nome de usuário e um ID de usuário para sincronizar corretamente."
+#: ../install_user.c:137
+msgid ""
+"A PalmOS(c) device needs a user name and a user ID in order to sync properly."
+msgstr ""
+"O dispositivo PalmOS(c) precisa de um nome de usuário e um ID de usuário "
+"para sincronizar corretamente."
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
-msgstr "Caso você deseje sincronizar mais de um dispositivo PalmOS(c), cada um deverá ter seu ID e, preferencialmente, nome de usuário próprios."
+msgstr ""
+"Caso você deseje sincronizar mais de um dispositivo PalmOS(c), cada um "
+"deverá ter seu ID e, preferencialmente, nome de usuário próprios."
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr "Várias pessoas utilizam seu nome ou apelido como nome de usuário."
 
-#: ../install_user.c:182
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "Nome do usuário"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr "Esse ID deve ser um número aleatório."
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "ID do usuário"
 
-#: ../jpilot-dump.c:95
-msgid " +D +A +T +M format like date +format.\n"
-msgstr " Formato +D +A +T +M, como date +format.\n"
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr " -v mostra a versão e sai.\n"
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr " -h mostra a ajuda e sai.\n"
-
-#: ../jpilot-dump.c:98
-msgid " -f displays help for format codes.\n"
-msgstr " -f mostra a ajuda para códigos de formato.\n"
-
-#: ../jpilot-dump.c:99
-msgid " -D dump DateBook.\n"
-msgstr " -D despeja o Calendário.\n"
-
-#: ../jpilot-dump.c:100
-msgid " -N dump appts for today in DateBook.\n"
-msgstr " -N despeja compromissos de hoje do Calendário.\n"
-
-#: ../jpilot-dump.c:101
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr " -NAAAA/MM/DD despeja compromissos de AAAA/MM/DD do Calendário.\n"
-
-#: ../jpilot-dump.c:102
-msgid " -A dump Address book.\n"
-msgstr " -A despeja os Contatos.\n"
-
-#: ../jpilot-dump.c:103
-msgid " -T dump ToDo list as CSV.\n"
-msgstr " -T despeja a lista de Tarefas como CSV.\n"
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr " -M despeja os Memos.\n"
-
-#: ../jpilot-sync.c:66
-msgid " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-" As preferências do J-Pilot determinam a porta, a taxa de transferência, "
-"etc.\n"
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr " -v = versão\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr " -h = ajuda\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = executar em modo de depuração\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = não carregar plug-ins.\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = Sincronizar e então fazer uma cópia, senão apenas sincronizar.\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l = loop, senão sincroniza uma vez e sai.\n"
-
-#: ../jpilot-sync.c:73
-msgid " -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr ""
-" -p {porta} = Usar esta porta para sincronizar em vez de ler as "
-"preferências.\n"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Especificação geométrica inválida: \"%s\"\n"
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Este canal não tem suporte para impressão."
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Este canal não tem suporte para importação."
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Este canal não tem suporte para exportação."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Cancelar Sincronização"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Este dispositivo não tem o mesmo nome de usuário\n"
@@ -1153,14 +1350,16 @@ msgstr ""
 "Se você não tiver certeza, leia o manual do usuário."
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Este dispositivo tem uma ID de usuário NULL.\n"
@@ -1172,245 +1371,225 @@ msgstr ""
 "de install-user a partir da linha de comando ou do menu.\n"
 "Se você não tiver certeza, leia o manual do usuário."
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Cancelar Sincronização"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Sincronizar Mesmo Assim"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Problema de Sincronização"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr " Usuário:"
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "Comando desconhecido no processo de sincronização\n"
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Arquivo/tear"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Arquivo/_Localizar"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Arquivo/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Arquivo/_Instalar"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Arquivo/Importar"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Arquivo/Exportar"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Arquivo/P_referências"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Arquivo/Im_primir"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Arquivo/Instalar Usuário"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Arquivo/Restaurar Dispositivo"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Arquivo/_Sair"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Ver"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Ver/Esconder os Registros Particulares"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Ver/Mostrar os Registros Particulares"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Ver/Encobrir Registros Particulares"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Ver/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Ver/Calendário"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Ver/Contatos"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Ver/Tarefas"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Ver/Memos"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Plug-ins"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/Netscape"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/Mozilla"
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/Galeon"
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/Opera"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/GnomeUrl"
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/Lynx"
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/Links"
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W3M"
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/Konqueror"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/Aj_uda"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/Ajuda/Fazer doação"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/Ajuda/_Sobre"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Plug-ins/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/Aj_uda/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr "Diálogo de Seleção de Fonte"
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:0"
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "Não carregando plug-ins.\n"
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "Ignorando todos os alarmes.\n"
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "Ignorando alarmes passados.\n"
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "Não foi possível abrir pipe\n"
 
-#: ../jpilot.c:2422
-msgid " User: "
-msgstr " Usuário:"
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "Limpar"
-
-#: ../jpilot.c:2649
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "Mostra registros particulares   Ctrl-Z"
 
-#: ../jpilot.c:2654
-msgid "Show private records"
-msgstr "Mostra registros particulares"
-
-#: ../jpilot.c:2659
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "Oculta registros particulares  Ctrl-Z"
 
-#: ../jpilot.c:2664
-msgid "Hide private records"
-msgstr "Oculta registros particulares"
-
-#: ../jpilot.c:2669
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "Encobre registros particulares   Ctrl-Z"
 
-#: ../jpilot.c:2674
-msgid "Mask private records"
-msgstr "Encobre registros particulares"
-
-#: ../jpilot.c:2684
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Sincroniza seu palm com o desktop   Ctrl-Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
-msgid "Font"
-msgstr "Fonte"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Endereço de sincronização"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1418,41 +1597,43 @@ msgstr ""
 "Sincroniza seu palm com o desktop\n"
 "então faz um backup"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Calendário/Ir para Hoje"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Contatos"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Tarefas"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Memos"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "Fazer agora"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Lembrar-me depois"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "Não avisar de novo!"
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 "J-Pilot usa o kit de ferramentas gráficas GTK2. Esta versão do kit usa UTF-8 "
 "para codificar caracteres.\n"
@@ -1460,746 +1641,1209 @@ msgstr ""
 "(p. ex. com acentos).\n"
 "\n"
 
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr "Ir ao menu \""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
-msgstr "\" e mudar o \""
-
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Conjunto de caracteres"
 
-#: ../jpilot.c:2898
-msgid "\"."
-msgstr "\"."
-
-#: ../jpilot.c:2900
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Selecionar uma codificação UTF-8"
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:92
 #, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "Versão de cabeçalho do PC desconhecida = %d\n"
+msgid " +D +A +T +M format like date +format.\n"
+msgstr " Formato +D +A +T +M, como date +format.\n"
 
-#: ../libplugin.c:416
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d Erro abrindo arquivo: %s\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v mostra a versão e sai.\n"
+
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h mostra a ajuda e sai.\n"
+
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -f mostra a ajuda para códigos de formato.\n"
+
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -D despeja o Calendário.\n"
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Erro lendo arquivo: %s\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
+
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N despeja compromissos de hoje do Calendário.\n"
+
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr " -NAAAA/MM/DD despeja compromissos de AAAA/MM/DD do Calendário.\n"
+
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr " -A despeja os Contatos.\n"
 
-#: ../libplugin.c:478 ../utils.c:1944
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -T despeja a lista de Tarefas como CSV.\n"
+
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M despeja os Memos.\n"
+
+#: ../jpilot-dump.c:163
+#, c-format
 msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
 msgstr ""
-"Este registro já foi excluído.\n"
-"Na próxima sincronização, será excluído do Palm.\n"
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-msgid "Unable to open PC records file\n"
-msgstr "Não foi possível abrir o arquivo de registros do PC\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "Não foi possível abrir arquivo: %s\n"
 
-#: ../libplugin.c:493 ../utils.c:1959
-msgid "Couldn't find record to delete\n"
-msgstr "Não foi possível encontrar registro a ser excluído\n"
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Unknown header version %d\n"
-msgstr "Cabeçalho desconhecido versão %d\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: ../libplugin.c:524
-msgid "Couldn't open PC records file\n"
-msgstr "Não foi possível abrir arquivo de registros do PC\n"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
+#: ../jpilot-merge.c:272
 #, c-format
-msgid "Error opening file: %s\n"
-msgstr "Erro ao abrir arquivo: %s\n"
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../libplugin.c:714
-msgid "Error reading PC file 1\n"
-msgstr "Erro ao ler arquivo 1 de PC\n"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../libplugin.c:730
-msgid "Error reading PC file 2\n"
-msgstr "Erro ao ler arquivo 2 de PC\n"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../libplugin.c:903
+#: ../jpilot-merge.c:292
 #, c-format
-msgid "Error reading %s 5\n"
-msgstr "Erro lendo %s 5\n"
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../log.c:95
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Não foi possível abrir arquivo de log, desistindo.\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../log.c:102
+#: ../jpilot-merge.c:294
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "Não foi possível abrir arquivo de log\n"
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "Texto de Memo > 65535, truncando\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:296
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "Memos Importados %s\n"
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
+msgstr ""
 
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Arquivo não parece seguir o formato memopad.dat\n"
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "Não foi possível exportar memo %d\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "Visão do Mês"
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Senha do Palm"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Incorreto; Digite Novamente a Senha do Palm"
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+" As preferências do J-Pilot determinam a porta, a taxa de transferência, "
+"etc.\n"
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "Digite a Senha do Palm"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v exibe a versão e as opções de compilação e sai.\n"
 
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "loop infinito"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d exibe informações de depuração na saída padrão.\n"
+
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr " -p não carrega os plug-ins.\n"
 
-#: ../plugins.c:213
+#: ../jpilot-sync.c:69
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "Ao ler %s%s linha 1:[%s]\n"
+msgid " -b sync, and then do a backup\n"
+msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
-msgstr "Versão Incorreta\n"
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l = loop, senão sincroniza uma vez e sai.\n"
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
-msgstr "Verifique Preferências->Canais\n"
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+" -p {porta} = Usar esta porta para sincronizar em vez de ler as "
+"preferências.\n"
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Erro ao abrir arquivo: %s\n"
 
-#: ../plugins.c:271
+#: ../jpilot-sync.c:223
 #, c-format
-msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+msgid "Error: pi_listen\n"
 msgstr ""
-"Falha ao abrir o plug-in [%s]\n"
-" erro [%s]\n"
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Erro ao abrir arquivo: next_id\n"
+
+#: ../jpilot-sync.c:231
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " plug-in é inválido: [%s]\n"
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Erro"
 
-#: ../plugins.c:296
+#: ../jpilot-sync.c:236
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "Plug-in:[%s]\n"
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
 
-#: ../plugins.c:297
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "A versão deste plug-in é (%d.%d).\n"
+msgid "as the one that was synced the last time.\n"
+msgstr ""
 
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "Velho demais para funcionar nesta versão do J-Pilot.\n"
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
-msgstr "%B %d, %Y"
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
 
-#: ../prefs.c:394
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
 
-#: ../prefs.c:395
-msgid "%d. %B %Y"
-msgstr "%d %B %Y"
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "Sua variável de ambiente HOME é longa demais para mim\n"
 
-#: ../prefs.c:396
-msgid "%d %B, %Y"
-msgstr "%d de %B de %Y"
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
 
-#: ../prefs.c:397
-msgid "%Y. %B. %d"
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, fuzzy, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+"O dispositivo PalmOS(c) precisa de um nome de usuário e um ID de usuário "
+"para sincronizar corretamente."
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"Este registro já foi excluído.\n"
+"Na próxima sincronização, será excluído do Palm.\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "Não foi possível abrir o arquivo de registros do PC\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "Não foi possível encontrar registro a ser excluído\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "Cabeçalho desconhecido versão %d\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d Erro abrindo arquivo: %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Erro lendo arquivo: %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "Erro ao abrir arquivo: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "Erro lendo %s 5\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "Erro ao ler arquivo 1 de PC\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "Erro ao ler arquivo 2 de PC\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "Versão de cabeçalho do PC desconhecida = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Não foi possível abrir arquivo de log, desistindo.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "Não foi possível abrir arquivo de log\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "Texto de Memo > 65535, truncando\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "Memos Importados %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Arquivo não parece seguir o formato memopad.dat\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "Não foi possível exportar memo %d\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Memos"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Visão do Mês"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+#, fuzzy
+msgid "last char truncated"
+msgstr "Última alteração:"
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Senha do Palm"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Incorreto; Digite Novamente a Senha do Palm"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Digite a Senha do Palm"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Erro abrindo arquivo: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "loop infinito"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "Ao ler %s%s linha 1:[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "Versão Incorreta\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "Verifique Preferências->Canais\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"Falha ao abrir o plug-in [%s]\n"
+" erro [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " plug-in é inválido: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "Plug-in:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "A versão deste plug-in é (%d.%d).\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "Velho demais para funcionar nesta versão do J-Pilot.\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr "%B %d, %Y"
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr "%d %B %Y"
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr "%d de %B de %Y"
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
 msgstr "%Y-%B-%d"
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr "%Y %B %d"
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Localidade"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Configurações"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr "Calendário"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "Tarefas"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "Memos"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Canais"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "Formato curto de data"
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "Formato longo de data"
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "Formato da hora"
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "O primeiro dia da semana é"
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "Meu arquivo de core GTK é "
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Porta serial (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Problema de Sincronização"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr "Taxa de transferência (não afeta USB)"
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Número de backups a serem arquivados"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Mostrar registros excluídos (padrão: não)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Mostrar registros excluídos modificados (padrão: não)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "Pedir confirmação para instalar arquivo (J-Pilot -> PDA) (padrão: sim)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Mostrar dicas de ferramentas (padrão: sim)"
 
-#. ********************************************************************
-#. Datebook preference tab
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Destacar no calendário dias com compromisso"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr "Anotar o dia de hoje nas visões de dia, semana e mês"
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr "Anexar o ano em aniversários nas visões de dia, semana e mês"
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "Usar etiquetas de nota DateBk"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "Suporte a DateBk desativado nesta compilação"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
-msgstr "Anotar o dia de hoje nas visões de dia, semana e mês"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
+msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
-msgstr "Anexar o ano em aniversários nas visões de dia, semana e mês"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
+msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Comando de e-mail"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s é substituído pelo endereço eletrônico"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Ocultar tarefas concluídas"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Ocultar tarefas cujo prazo não venceu"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Registrar data de conclusão"
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Usar banco de dados Manana"
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "Usar número padrão de dias após prazo"
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Usar Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Abrir janelas de alarme para lembretes de comprimossos"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Executar este comando"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "AVISO: executar comandos arbitrários de shell pode ser perigoso!!!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Comando de Alarme"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t é substituído pela hora do alarme"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d é substituído pela data do alarme"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D é substituído pela descrição do alarme"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N é substituído pela nota do alarme"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (descrição do alarme) está desativado nesta compilação"
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (nota do alarme) está desativado nesta compilação"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Sincronizar calendário"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Endereço de sincronização"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Sincronizar tarefas"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Sincronizar memos"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "Sincronizar memo32 (pedit32)"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Sincronizar Manana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Usar J-OS (PalmOS não japonês:WorkPad/CLIE)"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "Sincronizar %s (%s)"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Opções de Impressão"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Tamanho do Papel"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Impresso diário"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Impresso semanal"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Impresso mensal"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "Um registro"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Registro %s excluído."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Todos os registros nesta categoria"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Imprimir todos os registros"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Um registro por página"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " Linhas em branco entre cada registro"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Comando de impressão (p.ex. lpr, o cat > file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Restaurar Dispositivo"
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Arquivos a serem instalados"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Para restaurar seu dispositivo:"
 
-#: ../restore_gui.c:252
-msgid "1. Choose all the applications you wish to restore.  The default is all."
-msgstr "1. Escolha todas as aplicações que deseja restaurar. O padrão são todas."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
+msgstr ""
+"1. Escolha todas as aplicações que deseja restaurar. O padrão são todas."
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Digite o nome de usuário e a ID."
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Pressione o botão OK."
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Isso vai sobrescrever os dados atuais no dispositivo."
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "Nome do usuário"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "calendário"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "contatos"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "tarefas"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "memos"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "memos"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "plug-in?"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Nenhum registro encontrado"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Pesquisar por:"
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Dif. maiúsc./minúsc."
 
-#: ../sync.c:139
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "falha ao abrir o arquivo de trava\n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "falha em travar\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "arquivo de sincronização travado pelo pid %d\n"
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "falha em destravar\n"
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "sincronização travada pelo pid %d\n"
 
-#: ../sync.c:244
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "Verifique sua porta serial e as configurações\n"
+
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "Não foi possível ler a pasta pessoal\n"
+
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s: pressione o botão HotSync no berço ou \"kill %d\"\n"
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (ID de Criador '%s') é atual, ignorando.\n"
 
-#: ../sync.c:297
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
-msgid "Exiting with status %s\n"
-msgstr "Saindo com estado %s\n"
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Baixando '%s' (ID de Criador '%s')..."
 
-#: ../sync.c:298
-msgid "Finished\n"
-msgstr "Concluído\n"
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "Falha: não foi possível criar arquivo %s\n"
 
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
-msgstr "As informações do usuário foram instaladas.\n"
+#: ../sync.c:1100 ../sync.c:1438
+#, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr "Falha: não foi possível copiar o banco de dados %s\n"
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "Verifique sua porta serial e as configurações\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "OK\n"
 
-#: ../sync.c:674
+#: ../sync.c:1304
 #, c-format
-msgid " Syncing on device %s\n"
-msgstr " Sincronizando com dispositivo %s\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "Ignorando %s (ID de Criados '%s')\n"
 
-#: ../sync.c:675
-msgid " Press the HotSync button now\n"
-msgstr " Pressione o botão HotSync agora\n"
+#: ../sync.c:1498
+#, c-format
+msgid "Installing %s "
+msgstr "Instalando %s"
+
+#: ../sync.c:1504 ../sync.c:1540
+#, c-format
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Não foi possível abrir o arquivo '%s': %s!\n"
+
+#: ../sync.c:1508
+#, c-format
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Não foi possível abrir o arquivo '%s': arquivo corrompido?\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
-#, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "Nome do último usuário sincronizado-->\"%s\"\n"
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(ID do Criador é '%s')..."
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
-#, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "ID do último usuário sincronizado-->\"%d\"\n"
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(ID do Criador é '%s')..."
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:1530
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr " Nome deste usuário-->\"%s\"\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr " ID deste usuário-->\"%d\"\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"Não foi possível abrir arquivo: %s\n"
 
-#: ../sync.c:795
+#: ../sync.c:1615
 #, c-format
-msgid "Username is \"%s\"\n"
-msgstr "Nome de usuário é \"%s\"\n"
+msgid "Install %s failed"
+msgstr "Falha na instalação de %s"
 
-#: ../sync.c:796
-#, c-format
-msgid "User ID is %d\n"
-msgstr "ID de usuário é %d\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Falha.\n"
 
-#: ../sync.c:798 ../sync.c:804
-#, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "lastSyncPC = %d\n"
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s instalado"
 
-#: ../sync.c:799
+#: ../sync.c:1736
 #, c-format
-msgid "This PC = %lu\n"
-msgstr "Este PC = %lu\n"
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d Erro ao obter informações da aplicação %s\n"
 
-#: ../sync.c:800
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Último nome de usuário = [%s]\n"
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d Erro ao desempacotar informações da aplicação %s\n"
 
-#: ../sync.c:801
+#: ../sync.c:1763
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "Última ID de usuário = %d\n"
+msgid "Error reading appinfo block for %s\n"
+msgstr "Erro ao ler bloco appinfo para %s\n"
 
-#: ../sync.c:802
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "Nome de usuário = [%s]\n"
+msgid "Could not add category %s to remote.\n"
+msgstr "Não foi possível adicionar categoria %s ao dispositivo.\n"
 
-#: ../sync.c:803
+#: ../sync.c:2002 ../sync.c:2008
 #, c-format
-msgid "userID = %d\n"
-msgstr "ID de usuário = %d\n"
-
-#: ../sync.c:821
-msgid "Sync canceled\n"
-msgstr "Sincronização cancelada\n"
-
-#: ../sync.c:843
-msgid "Finished restoring handheld.\n"
-msgstr "A restauração do dispositivo foi concluída.\n"
-
-#: ../sync.c:844
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "Você pode precisar sincronizar para atualizar o J-Pilot.\n"
-
-#: ../sync.c:874
-msgid "Doing a fast sync.\n"
-msgstr "Fazendo uma sincronização rápida.\n"
-
-#: ../sync.c:913
-msgid "Doing a slow sync.\n"
-msgstr "Fazendo uma sincronização lenta.\n"
-
-#: ../sync.c:1014
-msgid "Thank you for using J-Pilot."
-msgstr "Obrigado por utilizar o J-Pilot."
+msgid "Too many categories on remote.\n"
+msgstr "Categorias demais no dispositivo.\n"
 
-#: ../sync.c:1056
-msgid "Finished.\n"
-msgstr "Concluído.\n"
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Todos os registros do computador em %s serão movidos para %s.\n"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Sincronizando %s\n"
 
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Registro %s gravado."
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Falha ao gravar um registro %s."
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Falha ao excluir um registro %s."
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Registro %s excluído."
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "Registro %s excluído."
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Registro %s gravado."
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Falha ao gravar um registro %s."
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Falha ao excluir um registro %s."
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Registro %s excluído."
 
-#: ../sync.c:1133
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "number of records = %d\n"
-msgstr "número de registros = %d\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
 
-#: ../sync.c:1260 ../sync.c:2435
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
+
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2207,779 +2851,836 @@ msgstr ""
 "Falha em dlp_DeleteRecord\n"
 "Isso pode ser causado por um registro já excluído no Palm\n"
 
-#: ../sync.c:1358 ../sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (ID de Criador '%s') é atual, ignorando.\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "As informações do usuário foram instaladas.\n"
 
-#: ../sync.c:1362 ../sync.c:1774
+#: ../sync.c:3094
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Baixando '%s' (ID de Criador '%s')..."
+msgid " Syncing on device %s\n"
+msgstr " Sincronizando com dispositivo %s\n"
 
-#: ../sync.c:1369 ../sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Falha: não foi possível criar arquivo %s\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " Pressione o botão HotSync agora\n"
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Falha: não foi possível copiar o banco de dados %s\n"
-
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "OK\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "Nome do último usuário sincronizado-->\"%s\"\n"
 
-#: ../sync.c:1687
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "Ignorando %s (ID de Criados '%s')\n"
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "ID do último usuário sincronizado-->\"%d\"\n"
 
-#: ../sync.c:1861
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid "Installing %s "
-msgstr "Instalando %s"
+msgid " This Username-->\"%s\"\n"
+msgstr " Nome deste usuário-->\"%s\"\n"
 
-#: ../sync.c:1867
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"Não foi possível abrir o arquivo '%s': %s!\n"
+msgid " This User ID-->%d\n"
+msgstr " ID deste usuário-->\"%d\"\n"
 
-#: ../sync.c:1871
+#: ../sync.c:3204
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"Não foi possível abrir o arquivo '%s': arquivo corrompido?\n"
+msgid "Username is \"%s\"\n"
+msgstr "Nome de usuário é \"%s\"\n"
 
-#: ../sync.c:1883
+#: ../sync.c:3205
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(ID do Criador é '%s')..."
+msgid "User ID is %d\n"
+msgstr "ID de usuário é %d\n"
 
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
+#: ../sync.c:3207
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"Não foi possível abrir arquivo: %s\n"
+msgid "lastSyncPC = %d\n"
+msgstr "lastSyncPC = %d\n"
 
-#: ../sync.c:1960
+#: ../sync.c:3208
 #, c-format
-msgid "Install %s failed"
-msgstr "Falha na instalação de %s"
-
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "Falha.\n"
+msgid "This PC = %lu\n"
+msgstr "Este PC = %lu\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
-#, c-format
-msgid "Installed %s "
-msgstr "%s instalado"
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "Sincronização cancelada\n"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Não foi possível abrir arquivo: %s%s\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "A restauração do dispositivo foi concluída.\n"
 
-#: ../sync.c:2180
-msgid "Unable to read home dir\n"
-msgstr "Não foi possível ler a pasta pessoal\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "Você pode precisar sincronizar para atualizar o J-Pilot.\n"
 
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: número de registros = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "Fazendo uma sincronização rápida.\n"
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "disco: número de registros = %d\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "Fazendo uma sincronização lenta.\n"
 
-#: ../sync.c:2888
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d Erro ao obter informações da aplicação %s\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "Obrigado por utilizar o J-Pilot."
 
-#: ../sync.c:2894 ../sync.c:2936
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d Erro ao desempacotar informações da aplicação %s\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "Concluído.\n"
 
-#: ../sync.c:2916 ../sync.c:2928
+#: ../sync.c:3446
 #, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Erro ao ler bloco appinfo para %s\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
+#: ../sync.c:3447
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "Não foi possível adicionar categoria %s ao dispositivo.\n"
-
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
-msgstr "Categorias demais no dispositivo.\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Todos os registros do computador em %s serão movidos para %s.\n"
+msgid "Exiting with status %s\n"
+msgstr "Saindo com estado %s\n"
 
-#: ../todo.c:248
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "Texto de descrição de tarefas > %d, truncando em %d\n"
 
-#: ../todo.c:255
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "Texto de nota da tarefa > %d, truncando em %d\n"
 
-#: ../todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Erro lendo informações de categoria %s\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Prazo"
 
-#: ../todo_gui.c:535
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Arquivo não parece ter formato todo.dat\n"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "Não foi possível exportar tarefa %d\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Prazo"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Prazo"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "Prioridade:"
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Concluída"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "Prioridade fora de faixa\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Sem data"
 
-#. The completed check box
-#: ../todo_gui.c:2206
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Concluída"
 
-#: ../todo_gui.c:2214
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../todo_gui.c:2234
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "Prazo:"
 
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "Nota"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Hoje"
 
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v exibe a versão e as opções de compilação e sai.\n"
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Não foi possível localizar arquivo DB vazio %s: %s\n"
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d exibe informações de depuração na saída padrão.\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " pode não estar instalado.\n"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "Não foi possível criar o diretório %s\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s é um diretório"
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "Não me é possível gravar arquivos no diretório %s\n"
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Salvar Registro Alterado?"
+
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Você deseja salvar as alterações deste registro?"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Salvar Novo Registro?"
 
-#: ../utils.c:75
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Você deseja salvar este novo registro?"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "loop infinito, quebrando\n"
+
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr " -p não carrega os plug-ins.\n"
 
-#: ../utils.c:76
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr " -a ignora os alarmes perdidos desde a última execução do programa.\n"
 
-#: ../utils.c:77
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A ignora todos os alarmes, passados e futuros.\n"
 
-#: ../utils.c:78
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i faz o programa ser lançado iconificado.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " As variáveis PILOTPORT e PILOTRATE são usadas para especificar\n"
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " através de qual porta sincronizar, e com que velocidade.\n"
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " Se PILOTPORT não estiver definida, o padrão é /dev/pilot.\n"
 
-#: ../utils.c:107
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Erro lendo arquivo"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Data de compilação"
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Compilado com as opções:"
 
-#: ../utils.c:110
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Caminho da instalação"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "Versão do pilot-link"
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "Suporte a USB"
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "sim"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-msgid "no"
-msgstr "não"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Suporte a registros particulares"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "não"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Suporte a datebk"
 
-#: ../utils.c:134
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Suporte a plug-ins"
 
-#: ../utils.c:140
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Suporte a manana"
 
-#: ../utils.c:146
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "Suporte a NLS (línguas estrangeiras)"
 
-#: ../utils.c:152
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "Suporte a GTK2"
 
-#: ../utils.c:207
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Hoje é %A, %x %X"
-
-#: ../utils.c:209
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Hoje é %%A, %s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "Hoje"
+msgid "Can't get HOME environment variable\n"
+msgstr "Não foi possível obter a variável HOME\n"
 
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "Salvar Registro Alterado?"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
+msgstr "Sua variável de ambiente HOME é longa demais para mim\n"
 
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "Você deseja salvar as alterações deste registro?"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Editar Categorias"
 
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "Salvar Novo Registro?"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "ID do PC é 0.\n"
 
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "Você deseja salvar este novo registro?"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Gerei uma nova ID de PC: %lu\n"
 
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
-msgid "Can't get HOME environment variable\n"
-msgstr "Não foi possível obter a variável HOME\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "Sua variável de ambiente HOME é longa demais para mim\n"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "Hoje é %A, %x %X"
 
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
+#: ../utils.c:3539
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr "Não foi possível criar o diretório %s\n"
+msgid "Today is %%A, %s %s"
+msgstr "Hoje é %%A, %s %s"
 
-#: ../utils.c:1399
+#: ../utils.c:3768
 #, c-format
 msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
-"%s não parece ser um diretório.\n"
-"Eu preciso que seja.\n"
-
-#: ../utils.c:1405
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "Não me é possível gravar arquivos no diretório %s\n"
 
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "Erro ao escrever cabeçalho de PC no arquivo: next_id\n"
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
 msgstr "Erro ao escrever próxima ID no arquivo: next_id\n"
 
-#: ../utils.c:1483
-msgid "Error opening file: next_id\n"
-msgstr "Erro ao abrir arquivo: next_id\n"
-
-#: ../utils.c:1657
-#, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Não foi possível localizar arquivo DB vazio %s: %s\n"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-msgid " may not be installed.\n"
-msgstr " pode não estar instalado.\n"
-
-#: ../utils.c:1839
-msgid "Error reading file"
-msgstr "Erro lendo arquivo"
-
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "ID do PC é 0.\n"
-
-#: ../utils.c:2517
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Gerei uma nova ID de PC: %lu\n"
-
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Visão semanal"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Austrália"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Áustria"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (Euro)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finlândia"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "França"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Alemanha"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Islândia"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Índia"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Indonésia"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Itália"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Japão"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Coréia"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Malásia"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "México"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Nova Zelândia"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "China"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Cingapura"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Espanha"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Suécia"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Suíça"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Tailândia"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Despesas"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Passagens aéreas"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Café da manhã"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Ônibus"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Refeições a negócios"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Aluguel de carro"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Jantar"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Diversão"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fax"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Combustível"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Presentes"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hotel"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Imprevistos"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Lavanderia"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limusine"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Alojamento"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Almoço"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Milhagem"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Estacionamento"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Postagem"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Lanche"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Metrô"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Material"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Táxi"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Telefone"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Gorjetas"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Taxas"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Trem"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr "Despesas: tipo de despesa desconhecido\n"
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr "Despesas: tipo de pagamento desconhecido\n"
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
 msgstr "American Express"
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Dinheiro"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Cheque"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
-msgstr "Cartão de crédito"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
+msgstr "Cartão de Crédito"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
 msgstr "MasterCard"
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Pré-pago"
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr "Despesas: categoria desconhecida\n"
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr "Despesas: tipo de despesa desconhecido\n"
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr "Despesas: tipo de pagamento desconhecido\n"
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr "American Express"
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "Cartão de Crédito"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Tipo:"
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr "MasterCard"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Quantia:"
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Categoria:"
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Tipo:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Pagamento:"
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Moeda:"
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-msgid "Date:"
-msgstr "Data:"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Mês:"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Dia:"
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Ano:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Quantia:"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Fornecedor:"
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "Cidade:"
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "KeyRing: pack_KeyRing(): buf_size pequeno demais\n"
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Incorreto, Digite Novamente Senha KeyRing"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Digite uma NOVA Senha KeyRing"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Digine Senha KeyRing"
 
-#: ../KeyRing/keyring.c:1636
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "Sua variável HOME é longa demais (>1024)\n"
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "KeyRing: arquivo %s não encontrado.\n"
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "KeyRing: Tente Sincronizar.\n"
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "KeyRing"
 
-#: ../KeyRing/keyring.c:2009
-msgid "Changed"
-msgstr "Alterado"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "Conta"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Não foi possível exportar memo %d\n"
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -2989,48 +3690,252 @@ msgstr ""
 "Senha\n"
 "KeyRing"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+msgid "Changed"
+msgstr "Alterado"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "Conta"
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "Nome:"
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "Conta:"
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "Senha:"
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr "Última alteração:"
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Gerar Senha"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 msgid "SyncTime"
 msgstr "SyncTime"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr "synctime: as versões 3.25 e 3.30 do Palm OS não suportam o SyncTime\n"
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr "synctime: NÃO está acertando as horas no pilot\n"
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr "synctime: Acertando as horas no pilot... "
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 msgid "Done\n"
 msgstr "Concluído\n"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Sobrescrever Arquivo?"
+
+#~ msgid "Field"
+#~ msgstr "Campo"
+
+#~ msgid "kana("
+#~ msgstr "kana("
+
+#~ msgid "Quick View"
+#~ msgstr "Visualização rápida"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Não foi possível abrir arquivo %s%s\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Não foi possível abrir arquivo %s.alarms\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "Você não pode editar a categoria %s.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "Você não pode excluir a categoria %s.\n"
+
+#~ msgid "category name"
+#~ msgstr "nome da categoria"
+
+#~ msgid "debug"
+#~ msgstr "depurar"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
+
+#~ msgid "none"
+#~ msgstr "nenhum"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "Foi encontrado repeatType desconhecido em DatebookDB\n"
+
+#~ msgid "W"
+#~ msgstr "Q"
+
+#~ msgid "M"
+#~ msgstr "S"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Evento sem hora específica"
+
+#~ msgid "Start Time"
+#~ msgstr "Início"
+
+#~ msgid "End Time"
+#~ msgstr "Término"
+
+#~ msgid "Dismiss"
+#~ msgstr "Descartar"
+
+#~ msgid "Done"
+#~ msgstr "Concluído"
+
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "User name"
+#~ msgstr "Nome do usuário"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = versão\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = ajuda\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = executar em modo de depuração\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = não carregar plug-ins.\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr ""
+#~ " -b = Sincronizar e então fazer uma cópia, senão apenas sincronizar.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Especificação geométrica inválida: \"%s\"\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Ajuda/Fazer doação"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "Diálogo de Seleção de Fonte"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid "Show private records"
+#~ msgstr "Mostra registros particulares"
+
+#~ msgid "Hide private records"
+#~ msgstr "Oculta registros particulares"
+
+#~ msgid "Mask private records"
+#~ msgstr "Encobre registros particulares"
+
+#~ msgid "Font"
+#~ msgstr "Fonte"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "Ir ao menu \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" e mudar o \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Não foi possível abrir arquivo de registros do PC\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "O primeiro dia da semana é"
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Porta serial (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "Taxa de transferência (não afeta USB)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "Sincronizar memo32 (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "Um registro"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s: pressione o botão HotSync no berço ou \"kill %d\"\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "Concluído\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Último nome de usuário = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Última ID de usuário = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Nome de usuário = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "ID de usuário = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: número de registros = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "disco: número de registros = %d\n"
+
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i faz o programa ser lançado iconificado.\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s não parece ser um diretório.\n"
+#~ "Eu preciso que seja.\n"
+
+#~ msgid "AmEx"
+#~ msgstr "American Express"
+
+#~ msgid "CreditCard"
+#~ msgstr "Cartão de crédito"
+
+#~ msgid "MasterCard"
+#~ msgstr "MasterCard"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "Despesas: categoria desconhecida\n"
+
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "Sua variável HOME é longa demais (>1024)\n"
diff --git a/po/ru.po b/po/ru.po
index ab2dbd79..d2103716 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,543 +8,401 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JPilot\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2010-03-07 13:52-0800\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2010-04-28 18:14+0300\n"
 "Last-Translator: Sergey Klimov <dcdarv@gmail.com>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
 
-#: ../address.c:276
-#: ../address.c:439
-#: ../alarms.c:333
-#: ../calendar.c:257
-#: ../calendar.c:496
-#: ../contact.c:324
-#: ../contact.c:727
-#: ../dat.c:189
-#: ../dat.c:664
-#: ../dat.c:867
-#: ../dat.c:1001
-#: ../dat.c:1140
-#: ../datebook.c:127
-#: ../datebook.c:178
-#: ../datebook.c:185
-#: ../datebook.c:235
-#: ../datebook.c:652
-#: ../jpilot.c:1207
-#: ../libplugin.c:209
-#: ../libplugin.c:456
-#: ../libplugin.c:535
-#: ../libplugin.c:564
-#: ../libplugin.c:812
-#: ../memo.c:205
-#: ../memo.c:278
-#: ../otherconv.c:281
-#: ../plugins.c:113
-#: ../prefs.c:345
-#: ../prefs.c:370
-#: ../prefs.c:900
-#: ../sync.c:2110
-#: ../sync.c:2127
-#: ../sync.c:2236
-#: ../sync.c:2250
-#: ../sync.c:2447
-#: ../sync.c:2586
-#: ../sync.c:3377
-#: ../todo.c:234
-#: ../todo.c:496
-#: ../utils.c:745
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Нехватка памяти"
 
-#: ../address.c:336
-#: ../address_gui.c:2246
-#: ../address_gui.c:2285
-#: ../calendar.c:211
-#: ../contact.c:586
-#: ../datebook.c:506
-#: ../datebook_gui.c:3547
-#: ../libplugin.c:406
-#: ../libplugin.c:432
-#: ../memo.c:91
-#: ../memo_gui.c:843
-#: ../todo_gui.c:1053
-#: ../Expense/expense.c:1104
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Ошибка чтения информации о категории %s\n"
+
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, fuzzy, c-format
 msgid "Error reading file: %s\n"
 msgstr "Ошибка чтения %s\n"
 
-#: ../address.c:483
-#: ../calendar.c:536
-#: ../contact.c:769
-#: ../datebook.c:879
-#: ../datebook.c:888
-#: ../libplugin.c:847
-#: ../memo.c:344
-#: ../todo.c:300
-#: ../utils.c:1088
-#: ../utils.c:1095
-#: ../utils.c:1102
-#: ../utils.c:1109
-#: ../utils.c:1116
-#: ../utils.c:1123
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
 msgid "error"
 msgstr "ошибка"
 
-#: ../address_gui.c:333
-#: ../datebook_gui.c:2713
-#: ../memo_gui.c:177
-#: ../todo_gui.c:295
-#: ../KeyRing/keyring.c:836
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
 msgstr ""
 
-#: ../address_gui.c:460
-#: ../address_gui.c:466
-#: ../address_gui.c:477
-#: ../address_gui.c:489
-#: ../address_gui.c:501
-#: ../address_gui.c:514
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
 #, c-format
 msgid "%s%s: %s"
 msgstr ""
 
-#: ../address_gui.c:550
-#: ../category.c:118
-#: ../category.c:176
-#: ../category.c:328
-#: ../category.c:334
-#: ../datebook_gui.c:432
-#: ../memo_gui.c:280
-#: ../sync.c:2069
-#: ../sync.c:2075
-#: ../sync.c:2421
-#: ../sync.c:2782
-#: ../todo_gui.c:418
-#: ../utils.c:2627
-#: ../utils.c:2664
-#: ../utils.c:2670
-#: ../utils.c:2729
-#: ../utils.c:2735
-#: ../utils.c:2789
-#: ../utils.c:2843
-#: ../utils.c:2849
-#: ../utils.c:2907
-#: ../utils.c:2914
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, fuzzy, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Не удается открыть %s\n"
 
-#: ../address_gui.c:721
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Не удается открыть %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Файл не в формате address.dat\n"
 
-#: ../address_gui.c:731
-#: ../datebook_gui.c:649
-#: ../memo_gui.c:324
-#: ../memo_gui.c:417
-#: ../todo_gui.c:544
-#: ../Expense/expense.c:1383
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Различное"
 
-#: ../address_gui.c:789
-#: ../datebook_gui.c:701
-#: ../memo_gui.c:470
-#: ../todo_gui.c:597
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
 msgid "CSV (Comma Separated Values)"
 msgstr ""
 
-#: ../address_gui.c:790
+#: ../address_gui.c:780
 msgid "DAT/ABA (Palm Archive Formats)"
 msgstr ""
 
 #. current category name
 #. previous category name
 #. entry text, in Pilot character set
-#: ../address_gui.c:879
-#: ../category.c:406
-#: ../datebook_gui.c:733
-#: ../jpilot.c:230
-#: ../jpilot.c:274
-#: ../jpilot.c:342
-#: ../jpilot.c:386
-#: ../jpilot.c:909
-#: ../memo_gui.c:509
-#: ../todo_gui.c:638
-#: ../utils.c:1269
-#: ../KeyRing/keyring.c:2111
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "ОК"
 
-#: ../address_gui.c:880
-#: ../address_gui.c:1018
-#: ../datebook_gui.c:362
-#: ../datebook_gui.c:390
-#: ../datebook_gui.c:734
-#: ../memo_gui.c:510
-#: ../memo_gui.c:613
-#: ../todo_gui.c:639
-#: ../todo_gui.c:758
-#: ../todo_gui.c:766
-#: ../utils.c:1286
-#: ../utils.c:1310
-#: ../KeyRing/keyring.c:2112
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Нет"
 
-#: ../address_gui.c:880
-#: ../address_gui.c:1018
-#: ../datebook_gui.c:362
-#: ../datebook_gui.c:390
-#: ../datebook_gui.c:734
-#: ../memo_gui.c:510
-#: ../memo_gui.c:613
-#: ../todo_gui.c:639
-#: ../todo_gui.c:758
-#: ../todo_gui.c:766
-#: ../utils.c:1286
-#: ../utils.c:1310
-#: ../KeyRing/keyring.c:2112
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Да"
 
-#: ../address_gui.c:899
-#: ../datebook_gui.c:757
-#: ../memo_gui.c:523
-#: ../todo_gui.c:657
-#: ../KeyRing/keyring.c:2125
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s является директорией"
 
-#: ../address_gui.c:901
-#: ../address_gui.c:918
-#: ../datebook_gui.c:759
-#: ../datebook_gui.c:776
-#: ../memo_gui.c:525
-#: ../memo_gui.c:542
-#: ../todo_gui.c:659
-#: ../todo_gui.c:676
-#: ../KeyRing/keyring.c:2127
-#: ../KeyRing/keyring.c:2144
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Ошибка открытия файла"
 
-#: ../address_gui.c:905
-#: ../datebook_gui.c:763
-#: ../memo_gui.c:529
-#: ../todo_gui.c:663
-#: ../KeyRing/keyring.c:2131
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Перезаписать файл %s?"
 
-#: ../address_gui.c:907
-#: ../datebook_gui.c:765
-#: ../memo_gui.c:531
-#: ../todo_gui.c:665
-#: ../KeyRing/keyring.c:2133
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Перезаписать файл?"
 
-#: ../address_gui.c:916
-#: ../datebook_gui.c:774
-#: ../memo_gui.c:540
-#: ../todo_gui.c:674
-#: ../KeyRing/keyring.c:2142
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, fuzzy, c-format
 msgid "Error opening file: %s"
 msgstr "Ошибка открытия файла"
 
-#: ../address_gui.c:933
+#: ../address_gui.c:920
 #, c-format
 msgid ""
 "Address exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../address_gui.c:936
+#: ../address_gui.c:923
 #, c-format
 msgid ""
 "Contact exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../address_gui.c:996
+#: ../address_gui.c:998
 msgid ""
 "Host character encoding is not UTF-8 based.\n"
 " Exported ldif file may not be standards-compliant\n"
 msgstr ""
 
-#: ../address_gui.c:1009
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Не могу экспортировать адрес\n"
 
-#: ../address_gui.c:1015
-#: ../memo_gui.c:610
-#: ../todo_gui.c:754
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
 #, fuzzy, c-format
 msgid "Category: %s\n"
 msgstr "Категория"
 
-#: ../address_gui.c:1017
-#: ../memo_gui.c:612
-#: ../todo_gui.c:757
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
 #, fuzzy, c-format
 msgid "Private: %s\n"
 msgstr "Личное"
 
-#: ../address_gui.c:1026
-#: ../address_gui.c:1040
-#: ../address_gui.c:1044
-#: ../address_gui.c:1053
-#: ../address_gui.c:1056
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: ../address_gui.c:1030
+#: ../address_gui.c:1031
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+#. E-mail should be the Palm dropdown menu item for email
 #. Set dial/email button text and callback data
-#: ../address_gui.c:1202
-#: ../address_gui.c:2796
-#: ../address_gui.c:4017
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../address_gui.c:1444
-#: ../datebook_gui.c:1142
-#: ../memo_gui.c:620
-#: ../todo_gui.c:827
-#: ../KeyRing/keyring.c:2200
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Неизвестный формат экспорта\n"
 
-#: ../address_gui.c:1470
-#: ../datebook_gui.c:1221
-#: ../memo_gui.c:469
-#: ../memo_gui.c:646
-#: ../todo_gui.c:853
-#: ../KeyRing/keyring.c:2212
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
 msgid "Text"
 msgstr ""
 
-#: ../address_gui.c:1471
-#: ../datebook_gui.c:1222
-#: ../memo_gui.c:647
-#: ../todo_gui.c:854
-#: ../KeyRing/keyring.c:2212
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
 msgid "CSV"
 msgstr ""
 
-#: ../address_gui.c:1472
+#: ../address_gui.c:1562
 #, fuzzy
 msgid "vCard"
 msgstr "Очистить"
 
-#: ../address_gui.c:1473
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
 msgid "ldif"
 msgstr ""
 
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
 #. Initialize variable if default case taken
-#: ../address_gui.c:1740
-#: ../address_gui.c:3748
+#: ../address_gui.c:1831 ../address_gui.c:3953
 #, fuzzy
 msgid "Last Name/Company"
 msgstr "Имя/Компания"
 
-#: ../address_gui.c:1743
-#: ../address_gui.c:3751
+#: ../address_gui.c:1834 ../address_gui.c:3956
 #, fuzzy
 msgid "First Name/Company"
 msgstr "Имя/Компания"
 
-#: ../address_gui.c:1746
-#: ../address_gui.c:3754
+#: ../address_gui.c:1837 ../address_gui.c:3959
 #, fuzzy
 msgid "Company/Last Name"
 msgstr "Компания/Имя"
 
-#: ../address_gui.c:1885
-#: ../datebook_gui.c:2777
-#: ../memo_gui.c:1016
-#: ../todo_gui.c:1312
-#: ../KeyRing/keyring.c:1183
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Вы не можете редактировать удаленную запись \n"
 
-#: ../address_gui.c:2083
-#: ../address_gui.c:2331
-#: ../address_gui.c:2759
-#: ../address_gui.c:3454
-#: ../datebook_gui.c:1930
-#: ../datebook_gui.c:3583
-#: ../memo_gui.c:880
-#: ../memo_gui.c:926
-#: ../memo_gui.c:1139
-#: ../memo_gui.c:1428
-#: ../todo_gui.c:1089
-#: ../todo_gui.c:1183
-#: ../todo_gui.c:1566
-#: ../todo_gui.c:1998
-#: ../Expense/expense.c:688
-#: ../Expense/expense.c:1142
-#: ../Expense/expense.c:1226
-#: ../Expense/expense.c:1883
-#: ../KeyRing/keyring.c:1072
-#: ../KeyRing/keyring.c:1515
-#: ../KeyRing/keyring.c:1577
-#: ../KeyRing/keyring.c:2667
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Неверная категория\n"
 
-#: ../address_gui.c:2143
-#: ../alarms.c:599
-#: ../dialer.c:165
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, fuzzy, c-format
 msgid "executing command = [%s]\n"
 msgstr "Выполнить команду\n"
 
-#: ../address_gui.c:2384
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../address_gui.c:2474
+#: ../address_gui.c:2575
 msgid "External program not found, or other error"
 msgstr ""
 
-#: ../address_gui.c:2475
+#: ../address_gui.c:2577
 msgid ""
 "J-Pilot can not find the external program \"convert\"\n"
 "or an error occurred while executing convert.\n"
 "You may need to install package ImageMagick"
 msgstr ""
 
-#: ../address_gui.c:2476
+#: ../address_gui.c:2578
 #, c-format
 msgid "Command executed was \"%s\"\n"
 msgstr ""
 
-#: ../address_gui.c:2477
+#: ../address_gui.c:2579
 #, c-format
 msgid "return code was %d\n"
 msgstr ""
 
-#: ../address_gui.c:2556
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "Ошибка.\n"
+
+#: ../address_gui.c:2660
 msgid "Add Photo"
 msgstr "Добавить фото"
 
 #. Category menu
-#: ../address_gui.c:2778
-#: ../KeyRing/keyring.c:2564
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Категория"
 
-#: ../address_gui.c:2798
-#: ../address_gui.c:4018
+#: ../address_gui.c:2902 ../address_gui.c:4237
 #, fuzzy
 msgid "Mail"
 msgstr "Бразилия"
 
 #. Dial Phone Button
-#: ../address_gui.c:2801
-#: ../address_gui.c:4021
-#: ../dialer.c:308
-#: ../dialer.c:332
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Звонить"
 
-#: ../address_gui.c:3121
-#: ../address_gui.c:3152
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-БезНазвания-"
 
-#: ../address_gui.c:3227
-#: ../memo_gui.c:1334
-#: ../todo_gui.c:1876
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 записей"
 
-#: ../address_gui.c:3230
-#: ../datebook_gui.c:2595
-#: ../memo_gui.c:1337
-#: ../todo_gui.c:1879
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d записей из %d"
 
-#: ../address_gui.c:3622
-#: ../address_gui.c:3630
-#: ../KeyRing/keyring.c:2477
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
 msgid "Name"
 msgstr "Имя"
 
-#: ../address_gui.c:3623
-#: ../address_gui.c:3624
-#: ../address_gui.c:3625
-#: ../address_gui.c:3631
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
 msgid "Address"
 msgstr "Адрес"
 
-#: ../address_gui.c:3626
-#: ../address_gui.c:3632
-#: ../Expense/expense.c:583
-#: ../Expense/expense.c:1404
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
 msgid "Other"
 msgstr "Другое"
 
 #. Note textbox
-#: ../address_gui.c:3627
-#: ../address_gui.c:3633
-#: ../todo_gui.c:2330
-#: ../Expense/expense.c:1832
-#: ../KeyRing/keyring.c:2611
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
 msgid "Note"
 msgstr "Заметка"
 
-#: ../address_gui.c:3645
+#: ../address_gui.c:3844
 msgid "Reverting to Address database\n"
 msgstr ""
 
-#: ../address_gui.c:3760
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Тел."
 
-#: ../address_gui.c:3792
+#: ../address_gui.c:3997
 #, fuzzy
 msgid "Quick Find: "
 msgstr "Быстрый поиск"
 
-#. Create Cancel button
+#. Cancel button
 #. Add record modification buttons
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:3809
-#: ../category.c:407
-#: ../datebook_gui.c:1775
-#: ../datebook_gui.c:4808
-#: ../memo_gui.c:1569
-#: ../todo_gui.c:2194
-#: ../utils.c:1310
-#: ../KeyRing/keyring.c:2507
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../address_gui.c:3809
-#: ../datebook_gui.c:4808
-#: ../memo_gui.c:1569
-#: ../todo_gui.c:2194
-#: ../KeyRing/keyring.c:2507
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 #, fuzzy
 msgid "Cancel the modifications"
 msgstr "Собрано со следующими опциями:"
@@ -555,23 +413,14 @@ msgstr "Собрано со следующими опциями:"
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:3814
-#: ../category.c:407
-#: ../category.c:850
-#: ../datebook_gui.c:4813
-#: ../memo_gui.c:1574
-#: ../todo_gui.c:2199
-#: ../Expense/expense.c:1659
-#: ../KeyRing/keyring.c:2512
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../address_gui.c:3814
-#: ../datebook_gui.c:4813
-#: ../memo_gui.c:1574
-#: ../todo_gui.c:2199
-#: ../Expense/expense.c:1659
-#: ../KeyRing/keyring.c:2512
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 #, fuzzy
 msgid "Delete the selected record"
 msgstr "Удалена запись %s"
@@ -580,236 +429,163 @@ msgstr "Удалена запись %s"
 #. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:3820
-#: ../datebook_gui.c:4819
-#: ../memo_gui.c:1580
-#: ../todo_gui.c:2205
-#: ../KeyRing/keyring.c:2518
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete"
 msgstr "Удалить"
 
-#: ../address_gui.c:3820
-#: ../datebook_gui.c:4819
-#: ../memo_gui.c:1580
-#: ../todo_gui.c:2205
-#: ../KeyRing/keyring.c:2518
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete the selected record"
 msgstr "Удалена запись %s"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:3826
-#: ../datebook_gui.c:4825
-#: ../memo_gui.c:1586
-#: ../todo_gui.c:2211
-#: ../Expense/expense.c:1664
-#: ../KeyRing/keyring.c:2524
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../address_gui.c:3826
-#: ../datebook_gui.c:4825
-#: ../memo_gui.c:1586
-#: ../todo_gui.c:2211
-#: ../Expense/expense.c:1664
-#: ../KeyRing/keyring.c:2524
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 #, fuzzy
 msgid "Copy the selected record"
 msgstr "Добавить запись"
 
-#. Create "New" button
 #. New button
 #. New Record button
-#: ../address_gui.c:3832
-#: ../datebook_gui.c:4831
-#: ../memo_gui.c:1592
-#: ../todo_gui.c:2217
-#: ../Expense/expense.c:1669
-#: ../KeyRing/keyring.c:2530
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Новая запись"
 
-#: ../address_gui.c:3832
-#: ../datebook_gui.c:4831
-#: ../memo_gui.c:1592
-#: ../todo_gui.c:2217
-#: ../Expense/expense.c:1669
-#: ../KeyRing/keyring.c:2530
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 #, fuzzy
 msgid "Add a new record"
 msgstr "Добавить запись"
 
-#. Create "Add Record" button
 #. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:3837
-#: ../datebook_gui.c:4837
-#: ../memo_gui.c:1598
-#: ../todo_gui.c:2223
-#: ../Expense/expense.c:1674
-#: ../KeyRing/keyring.c:2536
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Добавить запись"
 
-#: ../address_gui.c:3837
-#: ../datebook_gui.c:4837
-#: ../memo_gui.c:1598
-#: ../todo_gui.c:2223
-#: ../Expense/expense.c:1674
-#: ../KeyRing/keyring.c:2536
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 #, fuzzy
 msgid "Add the new record"
 msgstr "Добавить запись"
 
 #. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:3847
-#: ../datebook_gui.c:4847
-#: ../memo_gui.c:1608
-#: ../todo_gui.c:2233
-#: ../Expense/expense.c:1683
-#: ../KeyRing/keyring.c:2545
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Применить"
 
-#: ../address_gui.c:3847
-#: ../datebook_gui.c:4847
-#: ../memo_gui.c:1608
-#: ../todo_gui.c:2233
-#: ../Expense/expense.c:1683
-#: ../KeyRing/keyring.c:2545
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 #, fuzzy
 msgid "Commit the modifications"
 msgstr "Собрано со следующими опциями:"
 
 #. Private check box
 #. Private checkbox
-#: ../address_gui.c:3864
-#: ../datebook_gui.c:4871
-#: ../datebook_gui.c:4913
-#: ../memo_gui.c:1625
-#: ../todo_gui.c:2255
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Личное"
 
-#: ../address_gui.c:3952
+#: ../address_gui.c:4169
 #, fuzzy
 msgid "Change Photo"
 msgstr "Отменить"
 
-#: ../address_gui.c:3957
+#: ../address_gui.c:4174
 #, fuzzy
 msgid "Remove Photo"
 msgstr "Удалить"
 
-#: ../address_gui.c:4027
+#: ../address_gui.c:4246
 #, fuzzy
 msgid "Show In List"
 msgstr ""
 "Показать\n"
 "списком"
 
-#: ../address_gui.c:4128
+#: ../address_gui.c:4347
 #, fuzzy
 msgid "Reminder"
 msgstr "Напоминание"
 
-#: ../address_gui.c:4144
-#: ../datebook_gui.c:238
-#: ../datebook_gui.c:4901
-#: ../datebook_gui.c:5058
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
 msgid "Days"
 msgstr "Дни"
 
 #. The Quickview (ALL) page
 #. All button
-#: ../address_gui.c:4179
-#: ../datebook_gui.c:1473
-#: ../datebook_gui.c:1775
-#: ../utils.c:2481
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
 msgid "All"
 msgstr "Все"
 
-#: ../alarms.c:233
-#: ../datebook_gui.c:236
-#: ../datebook_gui.c:4895
-#: ../datebook_gui.c:5052
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Минуты"
 
-#: ../alarms.c:235
-#: ../datebook_gui.c:237
-#: ../datebook_gui.c:4899
-#: ../datebook_gui.c:5056
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Часы"
 
-#: ../alarms.c:256
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Напоминание"
 
-#: ../alarms.c:426
-#: ../alarms.c:993
-#: ../sync.c:1586
-#: ../sync.c:1592
-#: ../utils.c:3643
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, fuzzy, c-format
 msgid "Unable to open file: %s%s\n"
 msgstr "Не удается открыть %s\n"
 
-#: ../alarms.c:513
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Напоминание о встречах"
 
-#: ../alarms.c:516
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Прошлые встречи"
 
-#: ../alarms.c:519
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Пропущенные встречи"
 
-#: ../alarms.c:522
-#: ../datebook_gui.c:4710
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Встреча"
 
-#: ../alarms.c:606
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "Оповещения J-Pilot"
 
-#: ../category.c:131
-#: ../category.c:188
-#: ../sync.c:2098
-#: ../sync.c:2435
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "Файл на стороне PC поврежден?\n"
 
-#: ../category.c:138
-#: ../category.c:148
-#: ../category.c:196
-#: ../category.c:206
-#: ../category.c:216
-#: ../sync.c:2220
-#: ../sync.c:2274
-#: ../sync.c:2311
-#: ../sync.c:2326
-#: ../sync.c:2350
-#: ../sync.c:2570
-#: ../sync.c:2615
-#: ../sync.c:2652
-#: ../sync.c:2665
-#: ../sync.c:2690
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "Функция fseek провалилась - фатальная ошибка\n"
 
-#: ../category.c:362
-#: ../utils.c:2691
-#: ../utils.c:2765
-#: ../utils.c:2869
-#: ../utils.c:2934
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
 #, fuzzy
 msgid "rename failed"
 msgstr "Установку %s не удалось завершить"
@@ -818,10 +594,7 @@ msgstr "Установку %s не удалось завершить"
 msgid "Move"
 msgstr "Переместить"
 
-#: ../category.c:436
-#: ../category.c:498
-#: ../category.c:578
-#: ../category.c:767
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
 msgid "Edit Categories"
 msgstr "Редактирование категорий"
 
@@ -833,8 +606,7 @@ msgstr "Максимальное число категорий (16) уже ис
 msgid "Enter New Category"
 msgstr "Добавление новой категории"
 
-#: ../category.c:451
-#: ../category.c:475
+#: ../category.c:451 ../category.c:475
 #, fuzzy
 msgid "Edit Categories Error"
 msgstr "Редактирование категорий"
@@ -884,343 +656,301 @@ msgstr "Создать"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: ../dat.c:466
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "неизвестный тип ="
 
-#: ../dat.c:547
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "полей в строке != %d, неизвестный формат\n"
 
-#: ../dat.c:561
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "полей != %d, неизвестный формат\n"
 
-#: ../dat.c:569
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Неизвестный формат, у файла неверная схема\n"
 
-#: ../dat.c:570
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Схема файла:"
 
-#: ../dat.c:574
+#: ../dat.c:640
 #, fuzzy
 msgid "It should be:"
 msgstr "Должно быть: "
 
-#: ../dat.c:683
-#: ../dat.c:701
-#: ../dat.c:884
-#: ../dat.c:897
-#: ../dat.c:1020
-#: ../dat.c:1033
-#: ../dat.c:1157
-#: ../dat.c:1170
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 
-#: ../dat.c:684
-#: ../dat.c:702
-#: ../dat.c:885
-#: ../dat.c:898
-#: ../dat.c:1002
-#: ../dat.c:1021
-#: ../dat.c:1034
-#: ../dat.c:1158
-#: ../dat.c:1171
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "чтение файла прекращено\n"
 
-#: ../datebook.c:814
-#: ../datebook_gui.c:3457
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr ""
 
-#: ../datebook_gui.c:241
+#: ../datebook_gui.c:239
 msgid "Repeat Never"
 msgstr "Не повторять"
 
-#: ../datebook_gui.c:242
+#: ../datebook_gui.c:240
 msgid "Repeat Daily"
 msgstr "Ежедневно"
 
-#: ../datebook_gui.c:243
+#: ../datebook_gui.c:241
 msgid "Repeat Weekly"
 msgstr "Еженедельно"
 
-#: ../datebook_gui.c:244
+#: ../datebook_gui.c:242
 msgid "Repeat MonthlyByDay"
 msgstr "Ежемесячно по дню"
 
-#: ../datebook_gui.c:245
+#: ../datebook_gui.c:243
 msgid "Repeat MonthlyByDate"
 msgstr "Ежемесячно по дате"
 
-#: ../datebook_gui.c:246
+#: ../datebook_gui.c:244
 msgid "Repeat YearlyDate"
 msgstr "Повторять каждую дату"
 
-#: ../datebook_gui.c:247
+#: ../datebook_gui.c:245
 msgid "Repeat YearlyDay"
 msgstr "Ежегодно"
 
-#: ../datebook_gui.c:250
-#: ../datebook_gui.c:257
-#: ../datebook_gui.c:4514
-#: ../datebook_gui.c:4521
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Вс"
 
-#: ../datebook_gui.c:251
-#: ../datebook_gui.c:4515
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Пн"
 
-#: ../datebook_gui.c:252
-#: ../datebook_gui.c:4516
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Вт"
 
-#: ../datebook_gui.c:253
-#: ../datebook_gui.c:4517
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Ср"
 
-#: ../datebook_gui.c:254
-#: ../datebook_gui.c:4518
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Чт"
 
-#: ../datebook_gui.c:255
-#: ../datebook_gui.c:4519
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Пт"
 
-#: ../datebook_gui.c:256
-#: ../datebook_gui.c:4520
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Сб"
 
-#: ../datebook_gui.c:269
+#: ../datebook_gui.c:267
 #, c-format
 msgid ""
 "Start Date: %s\n"
 "Time: Event"
 msgstr ""
 
-#: ../datebook_gui.c:277
+#: ../datebook_gui.c:275
 #, c-format
 msgid ""
 "Start Date: %s\n"
 "Time: %s to %s"
 msgstr ""
 
-#: ../datebook_gui.c:287
-#: ../datebook_gui.c:297
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
 msgid "Unknown"
 msgstr ""
 
 #. End Date
-#: ../datebook_gui.c:300
+#: ../datebook_gui.c:298
 msgid "End Date: "
 msgstr "Дата окончания:"
 
-#: ../datebook_gui.c:302
+#: ../datebook_gui.c:300
 msgid "Never"
 msgstr ""
 
-#: ../datebook_gui.c:308
+#: ../datebook_gui.c:306
 #, c-format
 msgid "Repeat Frequency: %d\n"
 msgstr "Частота повторения: %d\n"
 
-#: ../datebook_gui.c:316
+#: ../datebook_gui.c:314
 #, c-format
 msgid "Monthly Repeat Day %d\n"
 msgstr "День ежемесечного повторения %d\n"
 
-#: ../datebook_gui.c:321
-#: ../datebook_gui.c:5200
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
 msgid "Repeat on Days:"
 msgstr "Повторяется:"
 
-#: ../datebook_gui.c:332
+#: ../datebook_gui.c:330
 #, fuzzy, c-format
 msgid "Number of exceptions: %d"
 msgstr "число записей = %d\n"
 
-#: ../datebook_gui.c:338
+#: ../datebook_gui.c:336
 msgid ""
 "\n"
 "more..."
 msgstr ""
 
-#: ../datebook_gui.c:359
-#: ../datebook_gui.c:386
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
 msgid "Description:"
 msgstr ""
 
-#: ../datebook_gui.c:360
-#: ../datebook_gui.c:387
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
 msgid "Note:"
 msgstr "Заметка:"
 
-#: ../datebook_gui.c:362
-#: ../datebook_gui.c:390
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
 msgid "Alarm:"
 msgstr "Оповещение:"
 
-#: ../datebook_gui.c:363
-#: ../datebook_gui.c:391
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
 msgid "Repeat Type:"
 msgstr "Тип повторения:"
 
-#: ../datebook_gui.c:366
-#: ../datebook_gui.c:394
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
 msgid "Start of Week:"
 msgstr "Начало недели:"
 
-#: ../datebook_gui.c:388
-#: ../datebook_gui.c:5023
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
 msgid "Location:"
 msgstr ""
 
-#: ../datebook_gui.c:622
-#: ../datebook_gui.c:2249
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Описание события длиннее %d символов, обрезано до %d символов\n"
 
-#: ../datebook_gui.c:633
-#: ../datebook_gui.c:1143
-#: ../datebook_gui.c:2309
-#: ../datebook_gui.c:2316
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../datebook_gui.c:634
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Файл не в формате datebook.dat\n"
 
-#: ../datebook_gui.c:702
+#: ../datebook_gui.c:699
 msgid "DAT/DBA (Palm Archive Formats)"
 msgstr ""
 
-#: ../datebook_gui.c:791
+#: ../datebook_gui.c:787
 #, c-format
 msgid ""
 "Datebook exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../datebook_gui.c:794
+#: ../datebook_gui.c:790
 #, c-format
 msgid ""
 "Calendar exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../datebook_gui.c:821
+#: ../datebook_gui.c:817 ../todo_gui.c:701
 msgid ""
 "Host character encoding is not UTF-8 based.\n"
 " Exported ical file may not be standards-compliant\n"
 msgstr ""
 
-#: ../datebook_gui.c:1143
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr ""
 
-#: ../datebook_gui.c:1223
-#: ../todo_gui.c:855
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
 msgid "iCalendar"
 msgstr "iCalendar"
 
-#: ../datebook_gui.c:1235
-#: ../export_gui.c:251
-#: ../jpilot.c:419
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Экспортировать"
 
 #. Label for instructions
-#: ../datebook_gui.c:1252
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Экспортировать все записи Datebook"
 
-#: ../datebook_gui.c:1271
-#: ../export_gui.c:316
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Сохранить как"
 
 #. Browse button
-#: ../datebook_gui.c:1281
-#: ../export_gui.c:329
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Просмотреть"
 
-#: ../datebook_gui.c:1427
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Категории календаря"
 
 #. None button
-#. labels for notebook tabs
-#: ../datebook_gui.c:1479
-#: ../datebook_gui.c:2016
-#: ../datebook_gui.c:5129
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Нет"
 
-#: ../datebook_gui.c:1628
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Начало"
 
-#: ../datebook_gui.c:1634
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Окончание"
 
-#: ../datebook_gui.c:1744
-#: ../prefs.c:446
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: ../datebook_gui.c:1745
-#: ../prefs.c:447
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Понедельник"
 
-#: ../datebook_gui.c:1746
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: ../datebook_gui.c:1747
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Среда"
 
-#: ../datebook_gui.c:1748
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Четверг"
 
-#: ../datebook_gui.c:1749
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Пятница"
 
-#: ../datebook_gui.c:1750
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Субота"
 
-#: ../datebook_gui.c:1753
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4-й"
 
-#: ../datebook_gui.c:1753
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Последний"
 
-#: ../datebook_gui.c:1756
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -1230,65 +960,73 @@ msgid ""
 "Which do you want?"
 msgstr ""
 
-#: ../datebook_gui.c:1763
-#: ../datebook_gui.c:1779
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "Вопрос?"
 
-#: ../datebook_gui.c:1770
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Это повторяющееся событие.\n"
 "Хотите ли Вы использовать указанные\n"
 "настройки только для ЭТОЙ даты или\n"
 "также и для ВСЕХ последующих?"
 
-#: ../datebook_gui.c:1775
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Текущее"
 
-#: ../datebook_gui.c:2017
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
+
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "день"
 
-#: ../datebook_gui.c:2018
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "неделя"
 
-#: ../datebook_gui.c:2019
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "месяц"
 
-#: ../datebook_gui.c:2020
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "год"
 
-#: ../datebook_gui.c:2304
-#: ../datebook_gui.c:2307
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Невозможно назначить встречи с периодом повторения %d %s\n"
 
-#: ../datebook_gui.c:2317
-msgid "You cannot have a weekly repeating appointment that doesn't repeat on any day of the week."
+#: ../datebook_gui.c:2339
+msgid ""
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
+"day of the week."
 msgstr "Невозможно назначить еженедельную встречу без выбора дня недели."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2482
-#: ../datebook_gui.c:4944
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Нет времени"
 
-#: ../datebook_gui.c:2813
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Неверная встреча"
 
-#: ../datebook_gui.c:2814
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -1297,197 +1035,172 @@ msgstr ""
 "предшествует дате начала."
 
 #. "No Date" check box
-#: ../datebook_gui.c:3154
-#: ../datebook_gui.c:5162
-#: ../datebook_gui.c:5193
-#: ../datebook_gui.c:5246
-#: ../datebook_gui.c:5294
-#: ../todo_gui.c:145
-#: ../todo_gui.c:2298
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Нет даты"
 
-#: ../datebook_gui.c:3303
+#: ../datebook_gui.c:3491
 #, c-format
 msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:3490
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3495
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr "(СЕГОДНЯ)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4618
-#: ../datebook_gui.c:5131
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Неделя"
 
-#. Accelerator key to use for starting Weekview GUI
-#: ../datebook_gui.c:4625
+#: ../datebook_gui.c:4940
 #, fuzzy
-msgid "W"
-msgstr "Ср"
-
-#: ../datebook_gui.c:4627
-msgid "View appointments by week"
+msgid "View appointments by week   Ctrl+W"
 msgstr "Просмотреть события, запланированные на эту неделю"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4630
-#: ../datebook_gui.c:5132
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Месяц"
 
-#. Accelerator key to use for starting Monthview GUI
-#: ../datebook_gui.c:4638
+#: ../datebook_gui.c:4952
 #, fuzzy
-msgid "M"
-msgstr "Пн"
-
-#: ../datebook_gui.c:4640
-msgid "View appointments by month"
+msgid "View appointments by month   Ctrl+M"
 msgstr "Просмотреть события, запланированные на этот месяц"
 
 #  Make Category button
 #. Make Category button
-#: ../datebook_gui.c:4645
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Категории"
 
-#: ../datebook_gui.c:4709
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Время"
 
-#. Show ToDos button
-#: ../datebook_gui.c:4752
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Показать задачи"
 
-#: ../datebook_gui.c:4766
-#: ../todo_gui.c:2135
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Задача"
 
-#: ../datebook_gui.c:4767
-#: ../todo_gui.c:2136
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Цель"
 
-#: ../datebook_gui.c:4881
-#: ../datebook_gui.c:5038
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Будильник"
 
 #. Date Spinners
-#: ../datebook_gui.c:4921
-#: ../Expense/expense.c:1732
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
 msgid "Date:"
 msgstr "Дата:"
 
 #. Start date and time
-#: ../datebook_gui.c:4963
+#: ../datebook_gui.c:5280
 msgid "Start"
 msgstr "Начинается:"
 
 #. End date and time
-#: ../datebook_gui.c:4980
+#: ../datebook_gui.c:5297
 msgid "End"
 msgstr "Заканчивается:"
 
-#: ../datebook_gui.c:5113
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "Тэги DateBk"
 
-#: ../datebook_gui.c:5130
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "День"
 
-#: ../datebook_gui.c:5133
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Год"
 
-#. No Repeat page for notebook
-#: ../datebook_gui.c:5136
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Это событие не повторится"
 
-#: ../datebook_gui.c:5145
-#: ../datebook_gui.c:5178
-#: ../datebook_gui.c:5231
-#: ../datebook_gui.c:5277
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Частота повторения:"
 
-#: ../datebook_gui.c:5151
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "день (дней)"
 
-#: ../datebook_gui.c:5154
-#: ../datebook_gui.c:5187
-#: ../datebook_gui.c:5240
-#: ../datebook_gui.c:5286
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Заканчивается:"
 
-#: ../datebook_gui.c:5184
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "неделя (недель)"
 
-#: ../datebook_gui.c:5237
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "месяц(ы)"
 
-#: ../datebook_gui.c:5254
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Повторяется:"
 
-#: ../datebook_gui.c:5258
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "День недели"
 
-#: ../datebook_gui.c:5267
-#: ../Expense/expense.c:1614
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Дата"
 
-#: ../datebook_gui.c:5283
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "год(ы)"
 
-#: ../dialer.c:196
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Номеронабиратель"
 
-#: ../dialer.c:231
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Префикс 1"
 
-#: ../dialer.c:253
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Префикс 2"
 
-#: ../dialer.c:275
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Префикс 3"
 
-#: ../dialer.c:290
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Номер телефона:"
 
-#: ../dialer.c:320
+#: ../dialer.c:319
 msgid "Extension"
 msgstr "Расширение"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "Команда дозвона"
 
-#: ../export_gui.c:122
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Просмотр файлов"
 
@@ -1501,11 +1214,8 @@ msgid "Use Ctrl and Shift Keys"
 msgstr "Используйте клавиши Ctrl и Shift"
 
 #. Import button
-#: ../import_gui.c:300
-#: ../import_gui.c:369
-#: ../import_gui.c:426
-#: ../import_gui.c:471
-#: ../jpilot.c:375
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Импортировать"
 
@@ -1539,8 +1249,7 @@ msgstr "Импортировать все"
 msgid "Skip"
 msgstr "Пропустить"
 
-#: ../import_gui.c:457
-#: ../install_gui.c:303
+#: ../import_gui.c:457 ../install_gui.c:427
 msgid "To change to a hidden directory type it below and hit TAB"
 msgstr "Для перехода в скрытую директорию, наберите ее имя ниже и нажмите TAB"
 
@@ -1548,74 +1257,82 @@ msgstr "Для перехода в скрытую директорию, набе
 msgid "Import File Type"
 msgstr "Тип импортируемого файла"
 
-#: ../install_gui.c:247
-msgid "Files to be installed"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
 msgstr "Файлы для установки"
 
-#: ../install_gui.c:255
+#: ../install_gui.c:372
 msgid "Install"
 msgstr "Установить"
 
-#: ../install_user.c:113
-#: ../install_user.c:215
+#: ../install_user.c:116 ../install_user.c:218
 msgid "Install User"
 msgstr "Установить ID пользователя"
 
-#: ../install_user.c:134
-msgid "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
+#: ../install_user.c:137
+msgid ""
+"A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:141
-msgid "If you want to sync more than 1 PalmOS(c) device each one should have a different ID and preferably a different user name."
+#: ../install_user.c:144
+msgid ""
+"If you want to sync more than 1 PalmOS(c) device each one should have a "
+"different ID and preferably a different user name."
 msgstr ""
 
 #. Instruction label
-#: ../install_user.c:163
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
-msgstr "Большинство людей выбирают имя или ник, но мы советуем поставить вам 'kracked dude', чтобы проще было ломать программы"
+msgstr ""
+"Большинство людей выбирают имя или ник, но мы советуем поставить вам "
+"'kracked dude', чтобы проще было ломать программы"
 
-#: ../install_user.c:171
-#: ../restore_gui.c:277
+#: ../install_user.c:174 ../restore_gui.c:276
 msgid "User Name"
 msgstr "Имя пользователя"
 
-#: ../install_user.c:181
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr "ID должен быть случайным числом."
 
-#: ../install_user.c:189
-#: ../restore_gui.c:290
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: ../jpilot.c:315
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Печать"
 
-#: ../jpilot.c:316
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Этот кондуит не поддерживает печать."
 
-#: ../jpilot.c:376
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Этот кондуит не поддерживает импорт."
 
-#: ../jpilot.c:420
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Этот кондуит не поддерживает экспорт."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Отменить синхронизацию"
+
 #. -------------------------------------------
-#: ../jpilot.c:631
+#: ../jpilot.c:673
 msgid ""
 "This handheld does not have the same user name or user ID\n"
 "as the one that was synced the last time.\n"
-"Syncing could have unwanted effects.\n"
+"Syncing could have unwanted effects including data loss.\n"
 "\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:638
+#: ../jpilot.c:680
 msgid ""
 "This handheld has a NULL user ID.\n"
 "Every handheld must have a unique user ID in order to sync properly.\n"
@@ -1627,236 +1344,226 @@ msgid ""
 "Read the user manual if you are uncertain."
 msgstr ""
 
-#: ../jpilot.c:646
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Отменить синхронизацию"
 
-#: ../jpilot.c:646
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Синхронизировать в любом случае"
 
-#: ../jpilot.c:655
-#: ../jpilot.c:659
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Проблема синхронизации"
 
-#: ../jpilot.c:888
-#: ../jpilot.c:1739
+#: ../jpilot.c:932 ../jpilot.c:1787
 msgid " User: "
 msgstr "ID пользователя:"
 
-#: ../jpilot.c:900
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr ""
 
-#: ../jpilot.c:919
-#: ../Expense/expense.c:528
-#: ../KeyRing/keyring.c:1892
-#: ../SyncTime/synctime.c:55
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "О %s"
 
-#: ../jpilot.c:1060
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../jpilot.c:1061
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Файл/tear"
 
-#: ../jpilot.c:1062
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Файл/_Поиск"
 
-#: ../jpilot.c:1063
-#: ../jpilot.c:1069
-#: ../jpilot.c:1072
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Файл/sep1"
 
-#: ../jpilot.c:1064
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Файл/Установить"
 
-#: ../jpilot.c:1065
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Файл/Импорт"
 
-#: ../jpilot.c:1066
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Файл/Экспорт"
 
-#: ../jpilot.c:1067
-#: ../jpilot.c:2120
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Файл/Настройки"
 
-#: ../jpilot.c:1068
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Файл/Печать"
 
-#: ../jpilot.c:1070
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Файл/Установить HotSync ID"
 
-#: ../jpilot.c:1071
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Файл/Восстановить Palm"
 
-#: ../jpilot.c:1073
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Файл/Выход"
 
-#: ../jpilot.c:1074
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/Просмотр"
 
-#: ../jpilot.c:1075
-#: ../jpilot.c:1076
-#: ../jpilot.c:1077
-#: ../jpilot.c:1322
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Просмотр/Спрятать личные записи"
 
-#: ../jpilot.c:1076
-#: ../jpilot.c:1325
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Просмотр/Показать личные записи"
 
-#: ../jpilot.c:1077
-#: ../jpilot.c:1328
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Просмотр/Замаскировать личные записи"
 
-#: ../jpilot.c:1078
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Просмотр/sep1"
 
-#: ../jpilot.c:1079
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Просмотр/Календарь"
 
-#: ../jpilot.c:1080
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Просмотр/Адреса"
 
-#: ../jpilot.c:1081
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Просмотр/Задачи"
 
-#: ../jpilot.c:1082
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Просмотр/Заметки"
 
-#: ../jpilot.c:1083
-#: ../jpilot.c:1212
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Дополнения"
 
-#: ../jpilot.c:1085
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Сеть"
 
 #. web
-#: ../jpilot.c:1086
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Сеть/Netscape"
 
-#: ../jpilot.c:1090
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Сеть/Mozilla"
 
-#: ../jpilot.c:1095
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Сеть/Galeon"
 
-#: ../jpilot.c:1100
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Сеть/Opera"
 
-#: ../jpilot.c:1104
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Сеть/GnomeUrl"
 
-#: ../jpilot.c:1106
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Сеть/Lynx"
 
-#: ../jpilot.c:1108
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "Сеть/Links"
 
-#: ../jpilot.c:1110
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Сеть/W3M"
 
-#: ../jpilot.c:1112
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Сеть/Konqueror"
 
-#: ../jpilot.c:1115
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/Справка"
 
-#: ../jpilot.c:1116
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/Справка/J-Pilot"
 
-#: ../jpilot.c:1180
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Дополнения/%s"
 
-#: ../jpilot.c:1190
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/Справка/%s"
 
-#: ../jpilot.c:1545
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:1588
-#: ../jpilot-sync.c:170
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr ""
 
-#: ../jpilot.c:1592
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:1596
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:1684
-#: ../jpilot.c:1692
+#: ../jpilot.c:1732 ../jpilot.c:1740
 #, fuzzy
 msgid "Unable to open pipe\n"
 msgstr "Не удается открыть %s\n"
 
-#: ../jpilot.c:1895
+#: ../jpilot.c:1949
 #, fuzzy
-msgid "Show private records   Ctrl-Z"
+msgid "Show private records   Ctrl+Z"
 msgstr "Показать личные записи"
 
-#: ../jpilot.c:1900
+#: ../jpilot.c:1954
 #, fuzzy
-msgid "Hide private records   Ctrl-Z"
+msgid "Hide private records   Ctrl+Z"
 msgstr "Спрятать-показать личные записи"
 
-#: ../jpilot.c:1905
+#: ../jpilot.c:1959
 #, fuzzy
-msgid "Mask private records   Ctrl-Z"
+msgid "Mask private records   Ctrl+Z"
 msgstr "Скрыть личные записи"
 
-#: ../jpilot.c:1916
+#: ../jpilot.c:1971
 #, fuzzy
-msgid "Sync your palm to the desktop   Ctrl-Y"
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Синхронизировать Palm с десктоп"
 
-#: ../jpilot.c:1930
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Синхронизировать адресную книгу"
+
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1864,208 +1571,400 @@ msgstr ""
 "Синхронизировать вначале Palm и десктоп,\n"
 "а затем выполнить архивирование"
 
-#: ../jpilot.c:2064
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Календарь/Сегодня"
 
-#: ../jpilot.c:2065
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: ../jpilot.c:2066
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Список задач"
 
-#: ../jpilot.c:2067
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Заметки"
 
-#: ../jpilot.c:2102
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr ""
 
-#: ../jpilot.c:2102
+#: ../jpilot.c:2174
 #, fuzzy
 msgid "Remind me later"
 msgstr "Напоминание"
 
-#: ../jpilot.c:2102
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr ""
 
-#: ../jpilot.c:2115
+#: ../jpilot.c:2187
 #, c-format
 msgid ""
-"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so that you can see non-ASCII characters (accents for example).\n"
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
+"(accents for example).\n"
 "\n"
 "Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 
 #. Character Set
-#: ../jpilot.c:2120
-#: ../prefs_gui.c:505
+#: ../jpilot.c:2192 ../prefs_gui.c:509
 #, fuzzy
 msgid "Character Set"
 msgstr "Кодировка "
 
-#: ../jpilot.c:2122
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr ""
 
-#: ../jpilot-dump.c:88
+#: ../jpilot-dump.c:92
+#, c-format
 msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
 
-#: ../jpilot-dump.c:89
-msgid " -v displays version and exits.\n"
+#: ../jpilot-dump.c:93
+#, c-format
+msgid " -v display version and exit\n"
 msgstr ""
 
-#: ../jpilot-dump.c:90
-#: ../jpilot-sync.c:66
-#: ../utils.c:1838
-msgid " -h displays help and exits.\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, c-format
+msgid " -h display help text\n"
 msgstr ""
 
-#: ../jpilot-dump.c:91
-msgid " -f displays help for format codes.\n"
+#: ../jpilot-dump.c:95
+#, c-format
+msgid " -f display help for format codes\n"
 msgstr ""
 
-#: ../jpilot-dump.c:92
-#, fuzzy
-msgid " -D dump DateBook.\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
 msgstr "Адресная книга"
 
-#: ../jpilot-dump.c:93
-#, fuzzy
-msgid " -i dump DateBook in iCalendar format.\n"
+#: ../jpilot-dump.c:97
+#, fuzzy, c-format
+msgid " -i dump DateBook in iCalendar format\n"
 msgstr "Адресная книга"
 
-#: ../jpilot-dump.c:94
-msgid " -N dump appts for today in DateBook.\n"
-msgstr ""
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr "Адресная книга"
 
-#: ../jpilot-dump.c:95
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
+#: ../jpilot-dump.c:99
+#, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr ""
 
-#: ../jpilot-dump.c:96
-#, fuzzy
-msgid " -A dump Address book.\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
 msgstr "Адресная книга"
 
-#: ../jpilot-dump.c:97
-msgid " -T dump ToDo list as CSV.\n"
+#: ../jpilot-dump.c:101
+#, c-format
+msgid " -T dump ToDo list as CSV\n"
 msgstr ""
 
-#: ../jpilot-dump.c:98
-msgid " -M dump Memos.\n"
-msgstr ""
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr "Адресная книга"
 
-#: ../jpilot-dump.c:166
+#: ../jpilot-dump.c:163
 #, c-format
 msgid ""
 "Warning: Host character encoding is not UTF-8 based.\n"
 "Exported ical file may not be standards-compliant\n"
 msgstr ""
 
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "Не удается открыть %s\n"
+
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:270
+#, c-format
+msgid "Records added         = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
+
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
+
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
+
+#: ../jpilot-merge.c:293
+#, c-format
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
+
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
+
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:296
+#, c-format
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
+msgstr ""
+
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
+
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
+
 #: ../jpilot-sync.c:64
-msgid " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
+#, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
 msgstr ""
 
-#: ../jpilot-sync.c:65
-#: ../utils.c:1837
-msgid " -v displays version and compile options and exits.\n"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, c-format
+msgid " -v display version and compile options\n"
 msgstr ""
 
-#: ../jpilot-sync.c:67
-#: ../utils.c:1839
-msgid " -d displays debug info to stdout.\n"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, c-format
+msgid " -d display debug info to stdout\n"
 msgstr ""
 
 #: ../jpilot-sync.c:68
-msgid " -P skips loading plugins.\n"
+#, c-format
+msgid " -P skip loading plugins\n"
 msgstr ""
 
 #: ../jpilot-sync.c:69
-#, fuzzy
-msgid " -b sync and then do a backup\n"
+#, fuzzy, c-format
+msgid " -b sync, and then do a backup\n"
 msgstr ""
 "Синхронизировать вначале Palm и десктоп,\n"
 "а затем выполнить архивирование"
 
 #: ../jpilot-sync.c:70
-msgid " -l loop, otherwise sync once and exit.\n"
+#, c-format
+msgid " -l loop, otherwise sync once and exit\n"
 msgstr ""
 
 #: ../jpilot-sync.c:71
-msgid " -p {port} use this port to sync with instead of default.\n"
+#, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Ошибка открытия файла"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Ошибка открытия файла"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Ошибка"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
 msgstr ""
 
-#: ../libplugin.c:65
-#: ../utils.c:1018
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr ""
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
 msgid ""
 "This record is already deleted.\n"
 "It is scheduled to be deleted from the Palm on the next sync.\n"
 msgstr ""
 
-#: ../libplugin.c:74
-#: ../libplugin.c:111
-#: ../utils.c:1028
-#: ../utils.c:1070
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
 #, fuzzy
 msgid "Unable to open PC records file\n"
 msgstr "Не удается открыть %s\n"
 
-#: ../libplugin.c:80
-#: ../utils.c:1035
+#: ../libplugin.c:77 ../utils.c:1069
 #, fuzzy
 msgid "Couldn't find record to delete\n"
 msgstr "Невозможно добавить категорию %s удалённо.\n"
 
-#: ../libplugin.c:98
-#: ../utils.c:1055
+#: ../libplugin.c:95 ../utils.c:1089
 #, c-format
 msgid "Unknown header version %d\n"
 msgstr ""
 
-#: ../libplugin.c:183
+#: ../libplugin.c:180
 #, fuzzy, c-format
 msgid "%s:%d Error opening file: %s\n"
 msgstr "%s:%d Ошибка чтения %s\n"
 
-#: ../libplugin.c:189
-#: ../libplugin.c:218
-#: ../sync.c:1661
-#: ../todo.c:101
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
 #, fuzzy, c-format
 msgid "%s:%d Error reading file: %s\n"
 msgstr "%s:%d Ошибка чтения %s\n"
 
-#: ../libplugin.c:341
-#: ../libplugin.c:399
-#: ../utils.c:2082
-#: ../utils.c:2095
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
 #, fuzzy, c-format
 msgid "Error opening file: %s\n"
 msgstr "Ошибка открытия файла"
 
-#: ../libplugin.c:527
+#: ../libplugin.c:524
 #, fuzzy, c-format
 msgid "Error reading %s 5\n"
 msgstr "Ошибка чтения %s\n"
 
-#: ../libplugin.c:802
+#: ../libplugin.c:799
 #, fuzzy
 msgid "Error reading PC file 1\n"
 msgstr "Ошибка чтения %s\n"
 
-#: ../libplugin.c:818
+#: ../libplugin.c:815
 #, fuzzy
 msgid "Error reading PC file 2\n"
 msgstr "Ошибка чтения %s\n"
 
-#: ../libplugin.c:924
+#: ../libplugin.c:921
 #, c-format
 msgid "Unknown PC header version = %d\n"
 msgstr ""
@@ -2089,44 +1988,44 @@ msgstr ""
 msgid "Imported Memo %s\n"
 msgstr ""
 
-#: ../memo_gui.c:400
+#: ../memo_gui.c:402
 msgid "File doesn't appear to be memopad.dat format\n"
 msgstr "Файл не в формате memopad.dat\n"
 
-#: ../memo_gui.c:471
+#: ../memo_gui.c:473
 msgid "DAT/MPA (Palm Archive Formats)"
 msgstr ""
 
-#: ../memo_gui.c:557
+#: ../memo_gui.c:558
 #, c-format
 msgid ""
 "Memo exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../memo_gui.c:560
+#: ../memo_gui.c:561
 #, c-format
 msgid ""
 "Memos exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../memo_gui.c:581
+#: ../memo_gui.c:597 ../memo_gui.c:679
 #, c-format
 msgid "Can't export memo %d\n"
 msgstr ""
 
-#: ../memo_gui.c:608
+#: ../memo_gui.c:641
 #, fuzzy, c-format
 msgid "Memo: %ld\n"
 msgstr "Заметки"
 
-#: ../memo_gui.c:614
+#: ../memo_gui.c:647
 #, c-format
 msgid "----- Start of Memo -----\n"
 msgstr ""
 
-#: ../memo_gui.c:616
+#: ../memo_gui.c:649
 #, c-format
 msgid ""
 "\n"
@@ -2134,628 +2033,645 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../monthview_gui.c:435
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
 msgid "Monthly View"
 msgstr "Весь месяц"
 
-#: ../otherconv.c:77
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
 #, c-format
 msgid "%s: error exit from g_iconv_close(%s)\n"
 msgstr ""
 
-#: ../otherconv.c:202
+#: ../otherconv.c:199
 #, c-format
 msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
 msgstr ""
 
-#: ../otherconv.c:204
+#: ../otherconv.c:201
 msgid "last char truncated"
 msgstr ""
 
-#: ../otherconv.c:281
+#: ../otherconv.c:278
 #, c-format
 msgid "UTF_to_other: %s\n"
 msgstr ""
 
-#: ../otherconv.c:295
+#: ../otherconv.c:292
 #, c-format
 msgid "iconv: unconvertible sequence at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:299
+#: ../otherconv.c:296
 #, c-format
 msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:302
+#: ../otherconv.c:299
 #, c-format
 msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
 msgstr ""
 
-#: ../otherconv.c:305
+#: ../otherconv.c:302
 #, c-format
 msgid "iconv: unexpected error at place %d in '%s'\n"
 msgstr ""
 
-#: ../password.c:283
+#: ../password.c:281
 msgid "Palm Password"
 msgstr "Пароль Palm"
 
-#: ../password.c:308
+#: ../password.c:306
 msgid "Incorrect, Reenter PalmOS Password"
 msgstr "Неверно, введите пароль PalmOS"
 
-#: ../password.c:310
+#: ../password.c:308
 msgid "Enter PalmOS Password"
 msgstr "Введите пароль PalmOS"
 
-#: ../pidfile.c:64
+#: ../pidfile.c:69
 #, fuzzy
 msgid "removing stale pidfile\n"
 msgstr "_to_install файл\n"
 
-#: ../pidfile.c:88
+#: ../pidfile.c:95
 #, fuzzy, c-format
 msgid "create pidfile failed: %s\n"
 msgstr "Ошибка чтения %s\n"
 
-#: ../pidfile.c:89
+#: ../pidfile.c:96
 msgid "Warning: hotplug syncing disabled.\n"
 msgstr ""
 
-#: ../plugins.c:91
-#: ../plugins.c:205
-#: ../restore_gui.c:133
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
 msgid "infinite loop"
 msgstr ""
 
-#: ../plugins.c:218
+#: ../plugins.c:214
 #, c-format
 msgid "While reading %s%s line 1:[%s]\n"
 msgstr ""
 
-#: ../plugins.c:219
+#: ../plugins.c:215
 msgid "Wrong Version\n"
 msgstr ""
 
-#: ../plugins.c:220
+#: ../plugins.c:216
 msgid "Check preferences->conduits\n"
 msgstr ""
 
-#: ../plugins.c:276
+#: ../plugins.c:272
 #, c-format
 msgid ""
 "Open failed on plugin [%s]\n"
 " error [%s]\n"
 msgstr ""
 
-#: ../plugins.c:293
-#: ../plugins.c:318
+#: ../plugins.c:289 ../plugins.c:314
 #, c-format
 msgid " plugin is invalid: [%s]\n"
 msgstr ""
 
-#: ../plugins.c:301
+#: ../plugins.c:297
 #, fuzzy, c-format
 msgid "Plugin:[%s]\n"
 msgstr "/_Дополнения/%s"
 
-#: ../plugins.c:302
+#: ../plugins.c:298
 #, c-format
 msgid "This plugin is version (%d.%d).\n"
 msgstr ""
 
-#: ../plugins.c:304
+#: ../plugins.c:300
 msgid "It is too old to work with this version of J-Pilot.\n"
 msgstr ""
 
-#: ../prefs.c:415
+#: ../prefs.c:418
 msgid "%B %d, %Y"
 msgstr ""
 
-#: ../prefs.c:416
+#: ../prefs.c:419
 msgid "%d %B %Y"
 msgstr ""
 
-#: ../prefs.c:417
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr ""
 
-#: ../prefs.c:418
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr ""
 
-#: ../prefs.c:419
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr ""
 
-#: ../prefs.c:420
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr ""
 
-#: ../prefs_gui.c:448
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Предпочтения"
 
-#: ../prefs_gui.c:479
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Локализация"
 
-#: ../prefs_gui.c:481
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Установки"
 
-#: ../prefs_gui.c:483
+#: ../prefs_gui.c:487
 #, fuzzy
 msgid "Datebook"
 msgstr "календарь"
 
-#: ../prefs_gui.c:487
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "Список задач"
 
-#: ../prefs_gui.c:489
+#: ../prefs_gui.c:493
 #, fuzzy
 msgid "Memo"
 msgstr "заметки"
 
-#: ../prefs_gui.c:491
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Будильники"
 
-#: ../prefs_gui.c:493
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Кондуиты"
 
 #. Shortdate
-#: ../prefs_gui.c:518
+#: ../prefs_gui.c:522
 #, fuzzy
 msgid "Short date format"
 msgstr "Краткий формат даты "
 
 #. Longdate
-#: ../prefs_gui.c:531
+#: ../prefs_gui.c:535
 #, fuzzy
 msgid "Long date format"
 msgstr "Полный формат даты "
 
 #. Time
-#: ../prefs_gui.c:544
+#: ../prefs_gui.c:548
 #, fuzzy
 msgid "Time format"
 msgstr "Формат времени "
 
 #. GTK colors file
-#: ../prefs_gui.c:564
+#: ../prefs_gui.c:568
 #, fuzzy
 msgid "GTK color theme file"
 msgstr "Файл цветовых настроек GTK+ "
 
 #. Port
-#: ../prefs_gui.c:577
+#: ../prefs_gui.c:581
 #, fuzzy
-msgid "Serial Port"
-msgstr "Скорость порта "
+msgid "Sync Port"
+msgstr "Проблема синхронизации"
 
 #. Serial Rate
-#: ../prefs_gui.c:601
+#: ../prefs_gui.c:605
 #, fuzzy
 msgid "Serial Rate"
 msgstr "Скорость порта "
 
 #. Number of backups
-#: ../prefs_gui.c:614
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Количество архивных копий"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:632
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Показывать удаленные записи (по умолчанию -- НЕТ)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:636
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Показывать модифицированные удаленные записи (по умолчанию -- НЕТ)"
 
-#: ../prefs_gui.c:641
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr ""
 
 #. Show tooltips check box
-#: ../prefs_gui.c:645
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr ""
 
-#: ../prefs_gui.c:655
+#: ../prefs_gui.c:666
 msgid "Use Datebook database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:658
+#: ../prefs_gui.c:669
 msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr ""
 
 #. Show highlight days check box
-#: ../prefs_gui.c:684
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Подсвечивать дни со встречами в календаре"
 
 #. Highlight today on month and week view
-#: ../prefs_gui.c:689
+#: ../prefs_gui.c:700
 msgid "Annotate today in day, week, and month views"
 msgstr ""
 
 #. Show number of years on anniversaries in month and week view
-#: ../prefs_gui.c:693
+#: ../prefs_gui.c:704
 msgid "Append years on anniversaries in day, week, and month views"
 msgstr ""
 
 #. Show use DateBk check box
-#: ../prefs_gui.c:699
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "Использовать тэги DateBk для заметок"
 
-#: ../prefs_gui.c:702
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "Данная сборка не поддерживает DateBk"
 
-#: ../prefs_gui.c:714
+#: ../prefs_gui.c:725
 msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:717
+#: ../prefs_gui.c:728
 msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:746
+#: ../prefs_gui.c:757
 #, fuzzy
 msgid "Mail Command"
 msgstr "Команда дозвона"
 
-#: ../prefs_gui.c:760
+#: ../prefs_gui.c:771
 #, fuzzy, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%t будет заменено временем напоминания"
 
-#: ../prefs_gui.c:772
+#: ../prefs_gui.c:783
 msgid "Use ToDo database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:775
+#: ../prefs_gui.c:786
 msgid "Use Task database (Palm OS > 5.2)"
 msgstr ""
 
 #. hide completed check box
-#: ../prefs_gui.c:802
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Не показывать завершенные задачи"
 
 #. hide todos not yet due check box
-#: ../prefs_gui.c:806
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Скрыть задачи для которых еще не пришло время"
 
 #. record todo completion date check box
-#: ../prefs_gui.c:810
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Сохранять дату выполнения задачи"
 
 #. Use Manana check box
-#: ../prefs_gui.c:815
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Использовать базу данных Manana"
 
-#: ../prefs_gui.c:823
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr ""
 
-#: ../prefs_gui.c:845
+#: ../prefs_gui.c:856
 msgid "Use Memo database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:848
+#: ../prefs_gui.c:859
 msgid "Use Memos database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:851
+#: ../prefs_gui.c:862
 #, fuzzy
 msgid "Use Memo32 database (pedit32)"
 msgstr "Использовать Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
 #. Open alarm windows check box
-#: ../prefs_gui.c:888
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Открывать окна напоминаний для встреч"
 
 #. Execute alarm command check box
-#: ../prefs_gui.c:892
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Выполнить команду"
 
 #. Shell warning label
-#: ../prefs_gui.c:896
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
-msgstr "ВНИМАНИЕ: выполнение произвольных команд системной оболочки может быть опасным!!!"
+msgstr ""
+"ВНИМАНИЕ: выполнение произвольных команд системной оболочки может быть "
+"опасным!!!"
 
-#: ../prefs_gui.c:904
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Команда для напоминания"
 
-#: ../prefs_gui.c:917
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t будет заменено временем напоминания"
 
-#: ../prefs_gui.c:921
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d будет заменено датой напоминания"
 
-#: ../prefs_gui.c:926
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D заменено описанием напоминания"
 
-#: ../prefs_gui.c:930
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N заменено примечанием к напоминанию"
 
-#: ../prefs_gui.c:934
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (макрос описания) запрещен в этой сборке"
 
-#: ../prefs_gui.c:939
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (макрос заметки) запрещен в этой сборке"
 
 #. ********************************************************************
 #. Conduits preference tab
 #. Sync datebook check box
-#: ../prefs_gui.c:949
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Синхронизировать календарь"
 
 #. Sync address check box
-#: ../prefs_gui.c:953
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Синхронизировать адресную книгу"
 
 #. Sync todo check box
-#: ../prefs_gui.c:957
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Синхронизировать список задач"
 
 #. Sync memo check box
-#: ../prefs_gui.c:961
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Синхронизировать заметки"
 
 #. Show sync Manana check box
-#: ../prefs_gui.c:966
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Синхронизировать Manana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:972
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Использовать J-OS (Не японскую PalmOS:WorkPad/CLIE)"
 
 #. Make a Sync checkbox for each plugin
-#: ../prefs_gui.c:985
+#: ../prefs_gui.c:1020
 #, fuzzy, c-format
 msgid "Sync %s (%s)"
 msgstr "Синхронизация %s\n"
 
-#: ../print_gui.c:185
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Опции печати"
 
-#: ../print_gui.c:198
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Размер бумаги"
 
-#: ../print_gui.c:214
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Дневной отчет"
 
-#: ../print_gui.c:220
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Еженедельный отчет"
 
-#: ../print_gui.c:226
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Месячный отчет"
 
-#: ../print_gui.c:266
+#: ../print_gui.c:264
 #, fuzzy
 msgid "Selected record"
 msgstr "Удалена запись %s"
 
-#: ../print_gui.c:270
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Все записи в этой категории"
 
-#: ../print_gui.c:274
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Напечатать все записи"
 
-#: ../print_gui.c:296
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Одна запись на страницу"
 
-#: ../print_gui.c:312
+#: ../print_gui.c:310
 #, fuzzy
 msgid "Blank lines between each record"
 msgstr " Пустые строки между записями"
 
 #. Print Command
-#: ../print_gui.c:321
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Команда для печати (например, lpr или cat > file.ps)"
 
-#: ../restore_gui.c:71
-#: ../restore_gui.c:228
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Восстановить наладонник"
 
-#: ../restore_gui.c:176
-#: ../restore_gui.c:178
+#: ../restore_gui.c:174 ../restore_gui.c:176
 msgid "Unable to convert filename for GTK display\n"
 msgstr ""
 
-#: ../restore_gui.c:177
-msgid "See console log to find which file will not be restored"
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
 msgstr ""
 
-#: ../restore_gui.c:179
+#: ../restore_gui.c:177
 #, fuzzy, c-format
 msgid "File %s will not be restored\n"
 msgstr "Файлы для установки"
 
 #. Label for instructions
-#: ../restore_gui.c:245
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Чтобы восстановить Ваш наладоник:"
 
-#: ../restore_gui.c:248
+#: ../restore_gui.c:247
 #, fuzzy
 msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1. Выберите приложения, подлежащие восстановлению (по умолчанию все)."
 
-#: ../restore_gui.c:251
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Введите имя пользователя и пользовательский ID."
 
-#: ../restore_gui.c:254
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Нажмите кнопку OK."
 
-#: ../restore_gui.c:257
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Все данные на наладоннике будут перезаписаны."
 
-#: ../search_gui.c:150
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "календарь"
 
-#: ../search_gui.c:152
+#: ../search_gui.c:144
 #, fuzzy
 msgid "calendar"
 msgstr "Очистить"
 
-#: ../search_gui.c:239
+#: ../search_gui.c:231
 msgid "address"
 msgstr "адрес"
 
-#: ../search_gui.c:241
+#: ../search_gui.c:233
 msgid "contact"
 msgstr ""
 
-#: ../search_gui.c:310
+#: ../search_gui.c:302
 #, fuzzy
 msgid "todo"
 msgstr "Синхронизировать список задач"
 
-#: ../search_gui.c:363
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "заметки"
 
-#: ../search_gui.c:420
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "заметки"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "дополнение ?"
 
-#: ../search_gui.c:500
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Записей не найдено"
 
-#: ../search_gui.c:599
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Поиск"
 
 #. Search label
-#: ../search_gui.c:616
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Найти: "
 
 #. Case Sensitive checkbox
-#: ../search_gui.c:625
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "С учетом регистра"
 
-#: ../sync.c:110
+#: ../sync.c:118
 #, fuzzy
 msgid "open lock file failed\n"
 msgstr "Невозможно открыть файл протокола\n"
 
-#: ../sync.c:123
+#: ../sync.c:131
 #, fuzzy
 msgid "lock failed\n"
 msgstr "Ошибка.\n"
 
-#: ../sync.c:126
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:161
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr ""
 
-#: ../sync.c:164
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:399
-msgid "Check your serial port and settings\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
 msgstr "Проверьте настройки серийного порта\n"
 
-#: ../sync.c:658
+#: ../sync.c:677
 #, fuzzy
 msgid "Unable to read home dir\n"
 msgstr "Не удается открыть %s\n"
 
-#: ../sync.c:1053
-#: ../sync.c:1390
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
 msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
 msgstr "%s (ID автора '%s') не изменялась, пропускается.\n"
 
-#: ../sync.c:1057
-#: ../sync.c:1394
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
 msgid "Fetching '%s' (Creator ID '%s')... "
 msgstr "Получение '%s' (ID автора '%s')... "
 
-#: ../sync.c:1064
-#: ../sync.c:1400
+#: ../sync.c:1096 ../sync.c:1433
 #, c-format
 msgid "Failed, unable to create file %s\n"
 msgstr "Не удалось создать файл %s\n"
 
-#: ../sync.c:1068
-#: ../sync.c:1405
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
 msgid "Failed, unable to back up database %s\n"
 msgstr "Не удалось выполнить архивацию базы данных %s\n"
 
-#: ../sync.c:1072
-#: ../sync.c:1409
-#: ../sync.c:1567
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
 msgid "OK\n"
 msgstr "ОК\n"
 
-#: ../sync.c:1271
+#: ../sync.c:1304
 #, c-format
 msgid "Skipping %s (Creator ID '%s')\n"
 msgstr "Пропуск '%s' (ID автора '%s')\n"
 
-#: ../sync.c:1462
+#: ../sync.c:1498
 #, c-format
 msgid "Installing %s "
 msgstr "Установка %s "
 
-#: ../sync.c:1468
+#: ../sync.c:1504 ../sync.c:1540
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2764,7 +2680,7 @@ msgstr ""
 "\n"
 "Невозможно открыть '%s': %s!\n"
 
-#: ../sync.c:1472
+#: ../sync.c:1508
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2773,152 +2689,134 @@ msgstr ""
 "\n"
 "Невозможно синхронизировать '%s': файл поврежден?\n"
 
-#: ../sync.c:1484
+#: ../sync.c:1524
 #, fuzzy, c-format
 msgid "(Creator ID '%s')... "
 msgstr "(ID автора '%s')..."
 
-#: ../sync.c:1500
-#: ../sync.c:1513
 #: ../sync.c:1528
-#: ../sync.c:1541
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(ID автора '%s')..."
+
+#: ../sync.c:1530
+#, fuzzy, c-format
+msgid "(SDcard dir %s)... "
+msgstr "(ID автора '%s')..."
+
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Unable to open file: %s\n"
 msgstr "Не удается открыть %s\n"
 
-#: ../sync.c:1553
+#: ../sync.c:1615
 #, c-format
 msgid "Install %s failed"
 msgstr "Установку %s не удалось завершить"
 
-#: ../sync.c:1557
+#: ../sync.c:1619
 msgid "Failed.\n"
 msgstr "Ошибка.\n"
 
-#: ../sync.c:1563
+#: ../sync.c:1625
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "Установлен %s"
 
-#: ../sync.c:1666
+#: ../sync.c:1736
 #, c-format
 msgid "%s:%d Error getting app info %s\n"
 msgstr "%s:%d Ошибка получения app info %s\n"
 
-#: ../sync.c:1672
-#: ../sync.c:1702
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
 msgid "%s:%d Error unpacking app info %s\n"
 msgstr "%s:%d Ошибка распаковки app info %s\n"
 
-#: ../sync.c:1693
+#: ../sync.c:1763
 #, c-format
 msgid "Error reading appinfo block for %s\n"
 msgstr "Ошибка чтения блока appinfo для %s\n"
 
 #. Fix - need a func for this logging
-#: ../sync.c:1931
-#: ../sync.c:1935
+#: ../sync.c:2001 ../sync.c:2005
 #, c-format
 msgid "Could not add category %s to remote.\n"
 msgstr "Невозможно добавить категорию %s удалённо.\n"
 
-#: ../sync.c:1932
-#: ../sync.c:1938
+#: ../sync.c:2002 ../sync.c:2008
 #, c-format
 msgid "Too many categories on remote.\n"
 msgstr "Слишком много категорий на удалённом.\n"
 
-#: ../sync.c:1933
-#: ../sync.c:1941
+#: ../sync.c:2003 ../sync.c:2011
 #, c-format
 msgid "All records on desktop in %s will be moved to %s.\n"
 msgstr "Все записи на десктопе в %s перемещены на %s.\n"
 
-#: ../sync.c:2036
-#: ../sync.c:2754
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Синхронизация %s\n"
 
-#: ../sync.c:2044
-#: ../sync.c:2397
-#: ../sync.c:2762
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Запись %s сохранена."
 
-#: ../sync.c:2046
-#: ../sync.c:2399
-#: ../sync.c:2764
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Не удалось напечатать запись %s."
 
-#: ../sync.c:2048
-#: ../sync.c:2401
-#: ../sync.c:2766
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Не удалось удалить запись %s."
 
-#: ../sync.c:2050
-#: ../sync.c:2403
-#: ../sync.c:2768
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Запись %s удалена."
 
-#: ../sync.c:2052
-#: ../sync.c:2405
+#: ../sync.c:2122 ../sync.c:2475
 #, fuzzy, c-format
 msgid "Sync Conflict: duplicated an %s record."
 msgstr "Запись %s удалена."
 
-#: ../sync.c:2055
-#: ../sync.c:2408
-#: ../sync.c:2771
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Запись %s переписана."
 
-#: ../sync.c:2057
-#: ../sync.c:2410
-#: ../sync.c:2773
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Не удалось переписать запись %s."
 
-#: ../sync.c:2059
-#: ../sync.c:2412
-#: ../sync.c:2775
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Не удалось удалить запись %s."
 
-#: ../sync.c:2061
-#: ../sync.c:2414
-#: ../sync.c:2777
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Удалена запись %s"
 
-#: ../sync.c:2063
-#: ../sync.c:2416
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
 msgid "Sync Conflict: duplicated a %s record."
 msgstr ""
 
-#: ../sync.c:2167
-#: ../sync.c:2497
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
 msgid "Sync Conflict: a %s record must be manually merged\n"
 msgstr ""
 
-#: ../sync.c:2298
-#: ../sync.c:2638
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2926,121 +2824,106 @@ msgstr ""
 "dlp_DeleteRecord завершилась неудачно\n"
 "Причина, возможно, в том, что запись уже была удалена с Palm\n"
 
-#: ../sync.c:2866
+#: ../sync.c:2937
 msgid "Finished installing user information.\n"
 msgstr ""
 
-#: ../sync.c:3023
+#: ../sync.c:3094
 #, c-format
 msgid " Syncing on device %s\n"
 msgstr " Синхронизация с устройством %s\n"
 
-#: ../sync.c:3024
+#: ../sync.c:3095
 msgid " Press the HotSync button now\n"
 msgstr " Нажмите кнопку HotSync\n"
 
-#: ../sync.c:3066
-#: ../sync.c:3088
-#: ../sync.c:3109
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
 msgid "Last Synced Username-->\"%s\"\n"
 msgstr "Последний пользователь-->\"%s\"\n"
 
-#: ../sync.c:3067
-#: ../sync.c:3089
-#: ../sync.c:3110
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
 msgid "Last Synced UserID-->\"%d\"\n"
 msgstr "ID последнего пользователя-->\"%d\"\n"
 
-#: ../sync.c:3068
-#: ../sync.c:3090
-#: ../sync.c:3111
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
 msgid " This Username-->\"%s\"\n"
 msgstr "Имя пользователя-->\"%s\"\n"
 
-#: ../sync.c:3069
-#: ../sync.c:3091
-#: ../sync.c:3112
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
 msgid " This User ID-->%d\n"
 msgstr "ID пользователя-->%d\n"
 
-#: ../sync.c:3133
+#: ../sync.c:3204
 #, c-format
 msgid "Username is \"%s\"\n"
 msgstr "Имя пользователя \"%s\"\n"
 
-#: ../sync.c:3134
+#: ../sync.c:3205
 #, c-format
 msgid "User ID is %d\n"
 msgstr "ID пользователя %d\n"
 
-#: ../sync.c:3136
+#: ../sync.c:3207
 #, c-format
 msgid "lastSyncPC = %d\n"
 msgstr "Последний PC, использовавшийся для синхронизации = %d\n"
 
-#: ../sync.c:3137
+#: ../sync.c:3208
 #, c-format
 msgid "This PC = %lu\n"
 msgstr "Этот PC = %lu\n"
 
-#: ../sync.c:3161
+#: ../sync.c:3232
 msgid "Sync canceled\n"
 msgstr "Синхронизация отменена\n"
 
 #  Do not translate this text
-#: ../sync.c:3184
+#: ../sync.c:3255
 msgid "Finished restoring handheld.\n"
 msgstr "Восстановление компьютера завершено\n"
 
-#: ../sync.c:3185
+#: ../sync.c:3256
 msgid "You may need to sync to update J-Pilot.\n"
 msgstr "Проведите синхронизацию для обновления информации в J-Pilot.\n"
 
-#: ../sync.c:3207
+#: ../sync.c:3278
 msgid "Doing a fast sync.\n"
 msgstr "Выполнение быстрой синхронизации.\n"
 
-#: ../sync.c:3220
+#: ../sync.c:3291
 msgid "Doing a slow sync.\n"
 msgstr "Выполнение медленной синхронизации.\n"
 
-#: ../sync.c:3295
+#: ../sync.c:3366
 msgid "Thank you for using J-Pilot."
 msgstr "Спасибо Вам за использование J-Pilot."
 
-#: ../sync.c:3340
-#: ../sync.c:3405
+#: ../sync.c:3411 ../sync.c:3479
 msgid "Finished.\n"
 msgstr "Завершено\n"
 
-#: ../sync.c:3368
+#: ../sync.c:3446
 #, c-format
-msgid ""
-"%s: sync process already in progress (process ID = %d\n"
-")"
+msgid "%s: sync process already in progress (process ID = %d)\n"
 msgstr ""
 
-#: ../sync.c:3369
+#: ../sync.c:3447
 #, fuzzy, c-format
 msgid ""
-"%s: press the hotsync button on the cradle\n"
-"      or stop the sync by typing \"kill %d\" at the command line\n"
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
 msgstr " Нажмите кнопку HotSync\n"
 
-#: ../sync.c:3404
+#: ../sync.c:3478
 #, c-format
 msgid "Exiting with status %s\n"
 msgstr "Выход со статусом %s\n"
 
-#: ../todo.c:90
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Ошибка чтения информации о категории %s\n"
-
 #: ../todo.c:264
 #, fuzzy, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
@@ -3051,278 +2934,284 @@ msgstr "Описание события длиннее %d символов, об
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "Заметка ToDo слишком длинная, обрезана до %d символов\n"
 
-#: ../todo_gui.c:164
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Дата исполнения"
 
-#: ../todo_gui.c:534
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Файл не в формате todo.dat\n"
 
-#: ../todo_gui.c:598
+#: ../todo_gui.c:596
 msgid "DAT/TDA (Palm Archive Formats)"
 msgstr ""
 
-#: ../todo_gui.c:690
+#: ../todo_gui.c:688
 #, c-format
 msgid ""
 "ToDo exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../todo_gui.c:720
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr ""
 
-#: ../todo_gui.c:760
+#: ../todo_gui.c:766
 #, fuzzy, c-format
 msgid "Due Date: None\n"
 msgstr "Дата исполнения"
 
-#: ../todo_gui.c:763
+#: ../todo_gui.c:769
 #, fuzzy, c-format
 msgid "Due Date: %s\n"
 msgstr "Дата исполнения"
 
-#: ../todo_gui.c:765
+#: ../todo_gui.c:771
 #, fuzzy, c-format
 msgid "Priority: %d\n"
 msgstr "Приоритет: "
 
-#: ../todo_gui.c:766
+#: ../todo_gui.c:772
 #, fuzzy, c-format
 msgid "Completed: %s\n"
 msgstr "Завершена"
 
-#: ../todo_gui.c:768
+#: ../todo_gui.c:774
 #, c-format
 msgid "Description: %s\n"
 msgstr ""
 
-#: ../todo_gui.c:771
+#: ../todo_gui.c:777
 #, c-format
 msgid ""
 "Note: %s\n"
 "\n"
 msgstr ""
 
-#: ../todo_gui.c:1587
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr ""
 
-#: ../todo_gui.c:1796
-#: ../KeyRing/keyring.c:1312
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Нет даты"
 
 #. Completed checkbox
-#: ../todo_gui.c:2259
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Завершена"
 
-#: ../todo_gui.c:2267
+#: ../todo_gui.c:2418
 #, fuzzy
 msgid "Priority:"
 msgstr "Приоритет: "
 
-#: ../todo_gui.c:2288
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "Дата завершения:"
 
-#: ../utils.c:329
+#: ../utils.c:330
 msgid "Today"
 msgstr "Сегодня"
 
-#: ../utils.c:574
+#: ../utils.c:575
 #, c-format
 msgid "Couldn't find empty DB file %s: %s\n"
 msgstr "Невозможно найти заготовку пустого файла базы данных %s: %s\n"
 
-#: ../utils.c:577
+#: ../utils.c:578
 msgid " may not be installed.\n"
 msgstr " не был корректно установлен.\n"
 
 #. Can't create directory
-#: ../utils.c:612
-#: ../utils.c:616
+#: ../utils.c:613 ../utils.c:617
 #, fuzzy, c-format
 msgid "Can't create directory %s\n"
 msgstr "Нельзя удалять категорию %s.\n"
 
-#: ../utils.c:622
+#: ../utils.c:623
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "%s является директорией"
 
-#: ../utils.c:627
+#: ../utils.c:628
 #, fuzzy, c-format
 msgid "Unable to get write permission for directory %s\n"
 msgstr "Нельзя удалять категорию %s.\n"
 
-#: ../utils.c:1294
-#: ../utils.c:1318
+#: ../utils.c:1328 ../utils.c:1352
 msgid "Save Changed Record?"
 msgstr "Сохранить измененную запись?"
 
-#: ../utils.c:1295
-#: ../utils.c:1319
+#: ../utils.c:1329 ../utils.c:1353
 msgid "Do you want to save the changes to this record?"
 msgstr "Сохранить изменения в этой записи?"
 
-#: ../utils.c:1300
-#: ../utils.c:1324
+#: ../utils.c:1334 ../utils.c:1358
 msgid "Save New Record?"
 msgstr "Сохранить новую запись?"
 
-#: ../utils.c:1301
-#: ../utils.c:1325
+#: ../utils.c:1335 ../utils.c:1359
 msgid "Do you want to save this new record?"
 msgstr "Сохранить эту новую запись?"
 
-#: ../utils.c:1616
+#: ../utils.c:1650
 msgid "infinite loop, breaking\n"
 msgstr "бесконечный цикл, выходим\n"
 
-#: ../utils.c:1840
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1874
+#, c-format
+msgid " -p skip loading plugins\n"
 msgstr ""
 
-#: ../utils.c:1841
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr ""
 
-#: ../utils.c:1842
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr ""
 
-#: ../utils.c:1843
-msgid " -i makes program iconify itself upon launch.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
 msgstr ""
 
-#: ../utils.c:1844
-msgid " -geometry applies X geometry argument to main window\n"
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
 msgstr ""
 
-#: ../utils.c:1845
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
+
+#: ../utils.c:1880
+#, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr ""
 
-#: ../utils.c:1846
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr ""
 
-#: ../utils.c:1847
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr ""
 
-#: ../utils.c:1884
+#: ../utils.c:1921
 #, fuzzy
 msgid "Error reading file"
 msgstr "Ошибка чтения %s\n"
 
-#: ../utils.c:1934
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Дата скомпилирована"
 
-#: ../utils.c:1935
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Собрано со следующими опциями:"
 
-#: ../utils.c:1937
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Установленный Путь"
 
-#: ../utils.c:1939
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "версия pilot-link"
 
-#: ../utils.c:1943
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "Поддержка USB"
 
-#: ../utils.c:1944
-#: ../utils.c:1947
-#: ../utils.c:1953
-#: ../utils.c:1959
-#: ../utils.c:1965
-#: ../utils.c:1971
-#: ../utils.c:1976
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "да"
 
-#: ../utils.c:1945
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Поддержка личных записей"
 
-#: ../utils.c:1949
-#: ../utils.c:1955
-#: ../utils.c:1961
-#: ../utils.c:1967
-#: ../utils.c:1973
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
 msgid "no"
 msgstr "нет"
 
-#: ../utils.c:1951
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Поддержка Datebk"
 
-#: ../utils.c:1957
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Поддержка дополнений"
 
-#: ../utils.c:1963
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Поддерка Macana"
 
-#: ../utils.c:1969
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "Поддержка NSL (иностранные языки)"
 
-#: ../utils.c:1975
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "Поддержка GTK2"
 
 #. No HOME var
-#: ../utils.c:2018
-#: ../KeyRing/keyring.c:1779
+#: ../utils.c:2057
+#, c-format
 msgid "Can't get HOME environment variable\n"
 msgstr ""
 
-#: ../utils.c:2025
+#: ../utils.c:2064
+#, c-format
 msgid "HOME environment variable is too long to process\n"
 msgstr ""
 
-#: ../utils.c:2510
+#: ../utils.c:2567
 #, fuzzy
 msgid "Edit Categories..."
 msgstr "Редактирование категорий"
 
-#: ../utils.c:3177
+#: ../utils.c:3233
 msgid "PC ID is 0.\n"
 msgstr "PC ID равен 0.\n"
 
-#: ../utils.c:3178
+#: ../utils.c:3234
 #, fuzzy, c-format
 msgid "Generated a new PC ID.  It is %lu\n"
 msgstr "Сгенерирован новый PC ID, равный %lu\n"
 
-#: ../utils.c:3263
+#: ../utils.c:3376
 msgid "Invalid UTF-8 encoding in export string\n"
 msgstr ""
 
-#: ../utils.c:3397
+#: ../utils.c:3537
 #, c-format
 msgid "Today is %A, %x %X"
 msgstr "Сегодня %A, %x %X"
 
-#: ../utils.c:3399
+#: ../utils.c:3539
 #, c-format
 msgid "Today is %%A, %s %s"
 msgstr "Сегодня %%A, %s %s"
 
-#: ../utils.c:3627
+#: ../utils.c:3768
 #, c-format
 msgid ""
 "Incorrect header format for CSV import\n"
@@ -3330,481 +3219,458 @@ msgid ""
 "Aborting import\n"
 msgstr ""
 
-#: ../utils.c:3664
+#: ../utils.c:3805
 #, fuzzy, c-format
 msgid "Error writing version header to file: %s%s\n"
 msgstr "Ошибка чтения %s\n"
 
-#: ../utils.c:3669
+#: ../utils.c:3810
 #, fuzzy, c-format
 msgid "Error writing next id to file: %s%s"
 msgstr "Ошибка чтения %s\n"
 
-#: ../weekview_gui.c:293
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Вся неделя"
 
-#: ../Expense/expense.c:96
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Австралия"
 
-#: ../Expense/expense.c:97
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Австрия"
 
-#: ../Expense/expense.c:98
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Бельгия"
 
-#: ../Expense/expense.c:99
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Канада"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Дания"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "ЕС (Евро)"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Финляндия"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Франция"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Германия"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Гонконг"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Исландия"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Индия"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Индонезия"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Ирландия"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Италия"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Япония"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Корея"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Люксембург"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Малайзия"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Мексика"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Нидерланды"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Новая Зеландия"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "Китайская Народная Республика"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Филиппины"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Испания"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Таиланд"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Соединённое Королевство"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "США"
 
-#: ../Expense/expense.c:517
-#: ../Expense/expense.c:528
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Затраты"
 
-#: ../Expense/expense.c:549
-#: ../Expense/expense.c:1387
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Авиабилеты"
 
-#: ../Expense/expense.c:551
-#: ../Expense/expense.c:1388
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Завтрак"
 
-#: ../Expense/expense.c:553
-#: ../Expense/expense.c:1389
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Автобус"
 
-#: ../Expense/expense.c:555
-#: ../Expense/expense.c:1390
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Обеды по работе"
 
-#: ../Expense/expense.c:557
-#: ../Expense/expense.c:1391
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Аренда машины"
 
-#: ../Expense/expense.c:559
-#: ../Expense/expense.c:1392
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Ужины"
 
-#: ../Expense/expense.c:561
-#: ../Expense/expense.c:1393
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Развлечение"
 
-#: ../Expense/expense.c:563
-#: ../Expense/expense.c:1394
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Факс"
 
-#: ../Expense/expense.c:565
-#: ../Expense/expense.c:1395
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Топливо"
 
-#: ../Expense/expense.c:567
-#: ../Expense/expense.c:1396
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Подарки"
 
-#: ../Expense/expense.c:569
-#: ../Expense/expense.c:1397
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Отель"
 
-#: ../Expense/expense.c:571
-#: ../Expense/expense.c:1398
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Неожиданности"
 
-#: ../Expense/expense.c:573
-#: ../Expense/expense.c:1399
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Прачечная"
 
-#: ../Expense/expense.c:575
-#: ../Expense/expense.c:1400
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limo"
 
-#: ../Expense/expense.c:577
-#: ../Expense/expense.c:1401
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Квартира"
 
-#: ../Expense/expense.c:579
-#: ../Expense/expense.c:1402
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Обеды"
 
-#: ../Expense/expense.c:581
-#: ../Expense/expense.c:1403
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Расстояние"
 
-#: ../Expense/expense.c:585
-#: ../Expense/expense.c:1405
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Стоянка"
 
-#: ../Expense/expense.c:587
-#: ../Expense/expense.c:1406
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Почтовые расходы"
 
-#: ../Expense/expense.c:589
-#: ../Expense/expense.c:1407
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Закуски"
 
-#: ../Expense/expense.c:591
-#: ../Expense/expense.c:1408
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Метро"
 
-#: ../Expense/expense.c:593
-#: ../Expense/expense.c:1409
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Расходники"
 
-#: ../Expense/expense.c:595
-#: ../Expense/expense.c:1410
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Такси"
 
-#: ../Expense/expense.c:597
-#: ../Expense/expense.c:1411
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../Expense/expense.c:599
-#: ../Expense/expense.c:1412
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "На чай"
 
-#: ../Expense/expense.c:601
-#: ../Expense/expense.c:1413
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Пошлина"
 
-#: ../Expense/expense.c:603
-#: ../Expense/expense.c:1414
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Поезд"
 
-#: ../Expense/expense.c:1238
+#: ../Expense/expense.c:1237
 msgid "Expense: Unknown expense type\n"
 msgstr ""
 
-#: ../Expense/expense.c:1244
+#: ../Expense/expense.c:1243
 msgid "Expense: Unknown payment type\n"
 msgstr ""
 
-#: ../Expense/expense.c:1376
+#: ../Expense/expense.c:1375
 msgid "American Express"
 msgstr "American Express"
 
-#: ../Expense/expense.c:1377
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Наличными"
 
-#: ../Expense/expense.c:1378
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Чеком"
 
-#: ../Expense/expense.c:1379
+#: ../Expense/expense.c:1378
 msgid "Credit Card"
 msgstr "Кредитная карта"
 
-#: ../Expense/expense.c:1380
+#: ../Expense/expense.c:1379
 msgid "Master Card"
 msgstr "Master Card"
 
-#: ../Expense/expense.c:1381
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Предоплачено"
 
-#: ../Expense/expense.c:1382
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: ../Expense/expense.c:1615
+#: ../Expense/expense.c:1617
 #, fuzzy
 msgid "Type"
 msgstr "Тип: "
 
-#: ../Expense/expense.c:1616
+#: ../Expense/expense.c:1618
 #, fuzzy
 msgid "Amount"
 msgstr "Сумма: "
 
 #. Category Menu
-#: ../Expense/expense.c:1700
+#: ../Expense/expense.c:1702
 #, fuzzy
 msgid "Category:"
 msgstr "Категория"
 
 #. Type Menu
-#: ../Expense/expense.c:1708
+#: ../Expense/expense.c:1710
 #, fuzzy
 msgid "Type:"
 msgstr "Тип: "
 
 #. Payment Menu
-#: ../Expense/expense.c:1716
+#: ../Expense/expense.c:1718
 #, fuzzy
 msgid "Payment:"
 msgstr "Платеж: "
 
 #. Currency Menu
-#: ../Expense/expense.c:1724
+#: ../Expense/expense.c:1726
 #, fuzzy
 msgid "Currency:"
 msgstr "Валюта: "
 
-#: ../Expense/expense.c:1744
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Месяц:"
 
-#: ../Expense/expense.c:1758
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "День:"
 
-#: ../Expense/expense.c:1772
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Год:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1785
+#: ../Expense/expense.c:1787
 #, fuzzy
 msgid "Amount:"
 msgstr "Сумма: "
 
 #. Vendor Entry
-#: ../Expense/expense.c:1795
+#: ../Expense/expense.c:1797
 #, fuzzy
 msgid "Vendor:"
 msgstr "Поставщик: "
 
 #. City
-#: ../Expense/expense.c:1805
+#: ../Expense/expense.c:1807
 #, fuzzy
 msgid "City:"
 msgstr "Город: "
 
 #. Attendees
-#: ../Expense/expense.c:1815
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Посетители"
 
 #. -------------------------------------------
-#: ../Expense/expense.c:2097
+#: ../Expense/expense.c:2100
 #, fuzzy, c-format
 msgid ""
 "%s\n"
 "\n"
 "Expense plugin for J-Pilot was written by\n"
 "Judd Montgomery (c) 1999.\n"
-"judd@jpilot.org\n"
-"http://jpilot.org"
+"judd@jpilot.org, http://jpilot.org"
 msgstr ""
 "%s %s был написан\n"
 "Джаддом Монтгомери (c) 1999-2002\n"
 "judd@jpilot.org\n"
 "http://jpilot.org\n"
 
-#: ../KeyRing/keyring.c:293
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1702
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Неверно, введите пароль для KeyRing"
 
-#: ../KeyRing/keyring.c:1704
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Введите НОВЫЙ пароль для KeyRing"
 
-#: ../KeyRing/keyring.c:1706
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Введите пароль для KeyRing"
 
-#: ../KeyRing/keyring.c:1784
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr ""
-
-#: ../KeyRing/keyring.c:1789
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1790
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1881
-#: ../KeyRing/keyring.c:1892
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr ""
 
 #. -------------------------------------------
-#: ../KeyRing/keyring.c:1920
-#, c-format
+#: ../KeyRing/keyring.c:1898
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "\n"
 "KeyRing plugin for J-Pilot was written by\n"
 "Judd Montgomery (c) 2001.\n"
-"judd@jpilot.org\n"
-"http://jpilot.org\n"
+"judd@jpilot.org, http://jpilot.org\n"
 "\n"
 "KeyRing is a free PalmOS program for storing\n"
 "passwords and other information in encrypted form\n"
 "http://gnukeyring.sourceforge.net"
 msgstr ""
+"%s %s был написан\n"
+"Джаддом Монтгомери (c) 1999-2002\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
 
-#: ../KeyRing/keyring.c:2158
+#: ../KeyRing/keyring.c:2136
 #, c-format
 msgid ""
 "Keys exported from %s %s on %s\n"
 "\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2174
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
 #, fuzzy, c-format
 msgid "Can't export key %d\n"
 msgstr "Не могу экспортировать адрес\n"
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2364
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3815,55 +3681,54 @@ msgstr ""
 "KeyRing"
 
 #. Clist
-#: ../KeyRing/keyring.c:2476
+#: ../KeyRing/keyring.c:2564
 #, fuzzy
 msgid "Changed"
 msgstr "Отменить"
 
-#: ../KeyRing/keyring.c:2478
+#: ../KeyRing/keyring.c:2566
 msgid "Account"
 msgstr "Учетная запись"
 
 #. Name entry
-#: ../KeyRing/keyring.c:2572
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "имя: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2580
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "учетная запись: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2588
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "пароль: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2595
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2605
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Сгенерировать пароль"
 
-#: ../SyncTime/synctime.c:55
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "Синхронизировать заметки"
 
 #. -------------------------------------------
-#: ../SyncTime/synctime.c:66
+#: ../SyncTime/synctime.c:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
 "\n"
 "SyncTime plugin for J-Pilot was written by\n"
 "Judd Montgomery (c) 1999.\n"
-"judd@jpilot.org\n"
-"http://jpilot.org\n"
+"judd@jpilot.org, http://jpilot.org\n"
 "\n"
 "SyncTime WILL NOT work with PalmOS 3.3!"
 msgstr ""
@@ -3872,28 +3737,46 @@ msgstr ""
 "judd@jpilot.org\n"
 "http://jpilot.org\n"
 
-#: ../SyncTime/synctime.c:101
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:102
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:107
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:112
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "Завершить"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Перезаписать файл"
+
+#, fuzzy
+#~ msgid "W"
+#~ msgstr "Ср"
+
+#, fuzzy
+#~ msgid "M"
+#~ msgstr "Пн"
+
+#, fuzzy
+#~ msgid "Serial Port"
+#~ msgstr "Скорость порта "
+
 #, fuzzy
 #~ msgid "Field"
 #~ msgstr "Финляндия"
+
 #~ msgid "kana("
 #~ msgstr "kana("
+
 #~ msgid "Quick View"
 #~ msgstr "Быстрый просмотр"
 
@@ -3904,34 +3787,47 @@ msgstr "Завершить"
 #, fuzzy
 #~ msgid "Unable to open %s.alarms file\n"
 #~ msgstr "Не удается открыть %s\n"
+
 #~ msgid "You can't edit category %s.\n"
 #~ msgstr "Редактировать категорию %s нельзя.\n"
+
 #~ msgid "You can't delete category %s.\n"
 #~ msgstr "Нельзя удалять категорию %s.\n"
+
 #~ msgid "category name"
 #~ msgstr "название категории"
+
 #~ msgid "debug"
 #~ msgstr "debug"
+
 #~ msgid "Close"
 #~ msgstr "Закрыть"
+
 #~ msgid "none"
 #~ msgstr "нет"
+
 #~ msgid "This Event has no particular time"
 #~ msgstr "Для этого события не назначено время"
+
 #~ msgid "Start Time"
 #~ msgstr "Время начала"
+
 #~ msgid "End Time"
 #~ msgstr "Время окончания"
+
 #~ msgid "Dismiss"
 #~ msgstr "Отмена"
+
 #~ msgid "Done"
 #~ msgstr "Завершить"
+
 #~ msgid "Add"
 #~ msgstr "Добавить"
 
 #, fuzzy
 #~ msgid "User name"
 #~ msgstr "Имя пользователя"
+
 #~ msgid "/Help/PayBack program"
 #~ msgstr "/Справка/Программа PayBack"
 
@@ -3946,34 +3842,47 @@ msgstr "Завершить"
 #, fuzzy
 #~ msgid "Mask private records"
 #~ msgstr "Скрыть личные записи"
+
 #~ msgid "Font"
 #~ msgstr "Шрифт"
 
 #, fuzzy
 #~ msgid "Couldn't open PC records file\n"
 #~ msgstr "Невозможно открыть файл %s\n"
+
 #~ msgid "The first day of the week is "
 #~ msgstr "Первый день недели "
+
 #~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
 #~ msgstr "Порт (/dev/ttyS0, /dev/pilot)"
+
 #~ msgid "Serial Rate (Does not affect USB)"
 #~ msgstr "Скорость обмена по последовательному порту (не влияет на USB)"
+
 #~ msgid "Sync memo32 (pedit32)"
 #~ msgstr "Синхронизировать заметки memo32 (pedit32)"
+
 #~ msgid "One record"
 #~ msgstr "Одна запись"
+
 #~ msgid "Finished\n"
 #~ msgstr "Завершено\n"
+
 #~ msgid "Last Username = [%s]\n"
 #~ msgstr "Последний пользователь = [%s]\n"
+
 #~ msgid "Last UserID = %d\n"
 #~ msgstr "ID последнего пользователя = %d\n"
+
 #~ msgid "Username = [%s]\n"
 #~ msgstr "Имя пользователя = [%s]\n"
+
 #~ msgid "userID = %d\n"
 #~ msgstr "ID пользователя = %d\n"
+
 #~ msgid "palm: number of records = %d\n"
 #~ msgstr "palm: количество записей = %d\n"
+
 #~ msgid "disk: number of records = %d\n"
 #~ msgstr "disk: количество записей = %d\n"
 
@@ -3983,29 +3892,29 @@ msgstr "Завершить"
 #~ "I need it to be.\n"
 #~ msgstr "Файл не в формате address.dat\n"
 
-#, fuzzy
-#~ msgid "Error opening file: next_id\n"
-#~ msgstr "Ошибка открытия файла"
 #~ msgid "AmEx"
 #~ msgstr "AmEx"
+
 #~ msgid "CreditCard"
 #~ msgstr "Кредитной картой"
+
 #~ msgid "MasterCard"
 #~ msgstr "MasterCard"
+
 #~ msgid "Quit"
 #~ msgstr "Выход"
+
 #~ msgid "Help"
 #~ msgstr "Справка"
 
 #, fuzzy
 #~ msgid "Directory"
 #~ msgstr "%s является директорией"
-#~ msgid "Overwrite File"
-#~ msgstr "Перезаписать файл"
 
 #, fuzzy
 #~ msgid "Filename"
 #~ msgstr "Переименовать"
+
 #~ msgid "Sync"
 #~ msgstr "Синхронизация"
 
@@ -4016,20 +3925,26 @@ msgstr "Завершить"
 #, fuzzy
 #~ msgid "Add the new record   Ctrl+Enter"
 #~ msgstr "Спрятать-показать личные записи"
+
 #~ msgid "Backup"
 #~ msgstr "Архив"
+
 #~ msgid "Quit!"
 #~ msgstr "Выход!"
+
 #~ msgid "Show Preferences"
 #~ msgstr "Показывать настройки"
+
 #~ msgid "About Expense"
 #~ msgstr "О Затратах"
 
 #, fuzzy
 #~ msgid "About KeyRing"
 #~ msgstr "О Затратах"
+
 #~ msgid "\n"
 #~ msgstr "\n"
+
 #~ msgid ""
 #~ " [-v] || [-h] || [-d] || [-a] || [-A] || [-i]\n"
 #~ " -v displays version and compile options and exits.\n"
@@ -4055,80 +3970,115 @@ msgstr "Завершить"
 #~ " Переменные окружения PILOTPORT и PILOTRATE используются для указания\n"
 #~ " порта и скорости синхронизации.\n"
 #~ " При отсутствии PILOTPORT по умолчанию будет использован /dev/pilot.\n"
+
 #~ msgid "slow_sync_application(): Out of memory\n"
 #~ msgstr "slow_sync_application(): нехватка памяти\n"
+
 #~ msgid "dlp_WriteRecord failed\n"
 #~ msgstr "Процедура dlp_WriteRecord провалилась\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Unable to open '%s'!\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Невозможно открыть '%s'!\n"
+
 #~ msgid "Cannot open %s_to_install file\n"
 #~ msgstr "Невозможно открыть файл %s_to_install\n"
+
 #~ msgid "Cannot open %s_to_install.tmp file\n"
 #~ msgstr "Невозможно открыть файл %s_to_install.tmp\n"
+
 #~ msgid "fast_sync_local_recs(): Out of memory\n"
 #~ msgstr "fast_sync_local_recs(): нехватка памяти\n"
+
 #~ msgid "Error reading at %s : %s %d\n"
 #~ msgstr "Ошибка чтения %s : %s %d\n"
+
 #~ msgid "Warning ToDo description too long, truncating to %d\n"
 #~ msgstr "Описание ToDo слишком длинное, обрезано до %d символов\n"
+
 #~ msgid "/Web/Netscape/%s"
 #~ msgstr "/Сеть/Netscape/%s"
+
 #~ msgid "/Web/Mozilla/%s"
 #~ msgstr "/Сеть/Mozilla/%s"
+
 #~ msgid "/Web/Galeon/%s"
 #~ msgstr "/Сеть/Galeon/%s"
+
 #~ msgid "/Web/Opera/%s"
 #~ msgstr "/Сеть/Opera/%s"
+
 #~ msgid "/Web/GnomeUrl/%s"
 #~ msgstr "/Сеть/GnomeUrl/%s"
+
 #~ msgid "/Web/Lynx/%s"
 #~ msgstr "/Сеть/Lynx/%s"
+
 #~ msgid "/Web/Links/%s"
 #~ msgstr "Сеть/Links/%s"
+
 #~ msgid "/Web/W3M/%s"
 #~ msgstr "/Сеть/W3M/%s"
+
 #~ msgid "/Web/Konqueror/%s"
 #~ msgstr "/Сеть/Konqueror/%s"
+
 #~ msgid "Holland"
 #~ msgstr "Голландия"
+
 #~ msgid "U.K."
 #~ msgstr "Великобритания"
+
 #~ msgid "U.S.A."
 #~ msgstr "США"
+
 #~ msgid "Open jpilot.org in existing"
 #~ msgstr "Открыть jpilot.org в текущем окне"
+
 #~ msgid "Open jpilot.org in new window"
 #~ msgstr "Открыть jpilot.org в новом окне"
+
 #~ msgid "Open jpilot.org in new Netscape"
 #~ msgstr "Открыть jpilot.org в новом Netscape"
+
 #~ msgid "Open jpilot.org in new tab"
 #~ msgstr "Открыть jpilot.org в новой вкладке"
+
 #~ msgid "Open jpilot.org in new Mozilla"
 #~ msgstr "Открыть jpilot.org в новой Mozilla"
+
 #~ msgid "Open jpilot.org in new Galeon"
 #~ msgstr "Открыть jpilot.org в новом Galeon"
+
 #~ msgid "Open jpilot.org in new Opera"
 #~ msgstr "Открыть jpilot.org в новой Opera"
+
 #~ msgid "Gnome URL Handler for jpilot.org"
 #~ msgstr "Обработчик ссылок Gnome для jpilot.org"
+
 #~ msgid "Lynx jpilot.org"
 #~ msgstr "Lynx jpilot.org"
+
 #~ msgid "Links jpilot.org"
 #~ msgstr "Links jpilot.org"
+
 #~ msgid "w3m jpilot.org"
 #~ msgstr "w3m jpilot.org"
+
 #~ msgid "Konqueror jpilot.org"
 #~ msgstr "Konqueror jpilot.org"
+
 #~ msgid "Cannot open "
 #~ msgstr "Невозможно открыть "
+
 #~ msgid "RTh"
 #~ msgstr "Чт"
+
 #~ msgid "Time:"
 #~ msgstr "Время:"
+
 #~ msgid "Last Syned UserID-->\"%d\"\n"
 #~ msgstr "ID последнего пользователя-->\"%d\"\n"
-
diff --git a/po/rw.po b/po/rw.po
index 27316c65..fa164181 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,691 +16,977 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.8-pre3\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Ububiko bwarenzwe"
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-#, fuzzy
-msgid "error"
-msgstr "Ikosa"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%dIcyiciro Ibisobanuro"
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, fuzzy, c-format
 msgid "Error reading file: %s\n"
 msgstr "Ikosa mu gusoma idosiye"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+#, fuzzy
+msgid "error"
+msgstr "Ikosa"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 #, fuzzy
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
 msgstr "Icyabitswe ni Cyasibwe Cyangwa Gukoporora Kuri Ubwoko Amahinduka"
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, fuzzy, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Kuri Gufungura IDOSIYE"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Kuri Gufungura IDOSIYE"
+
+#: ../address_gui.c:713
 #, fuzzy
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Idosiye Kugaragara Kuri Aderesi"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr ""
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "OKE"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Oya"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Yego"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, fuzzy, c-format
 msgid "%s is a directory"
 msgstr "%sni a bushyinguro"
 
 # basctl/source\basicide\basidesh.src:RID_STR_ERROROPENSTORAGE.text
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Hari ikibazo mu gufungura dosiye"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, fuzzy, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Kuri Guhindura IDOSIYE"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 #, fuzzy
 msgid "Overwrite File?"
 msgstr "Gusimbuza Idosiye"
 
 # basctl/source\basicide\basidesh.src:RID_STR_ERROROPENSTORAGE.text
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, fuzzy, c-format
 msgid "Error opening file: %s"
 msgstr "Hari ikibazo mu gufungura dosiye"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, fuzzy, c-format
 msgid "Can't export address %d\n"
 msgstr "Kohereza Aderesi"
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-msgid "Field"
-msgstr "Umwanya"
+# so3/src\svuidlg.src:MD_DDE_LINKEDIT.FT_DDE_ITEM.text
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Icyiciro"
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "By'umwihariko"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "ubutumwa nterineti/elegitoroniki"
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 #, fuzzy
 msgid "Unknown export type\n"
 msgstr "Kohereza"
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-#, fuzzy
-msgid "Company/Name"
-msgstr "Izina ry'Ikigo:"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+msgid "Last Name/Company"
+msgstr ""
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+msgid "First Name/Company"
 msgstr ""
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Izina ry'Ikigo:"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 #, fuzzy
 msgid "You can't modify a record that is deleted\n"
 msgstr "Guhindura a Icyabitswe ni"
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 #, fuzzy
 msgid "Category is not legal\n"
 msgstr "ni OYA"
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, fuzzy, c-format
 msgid "executing command = [%s]\n"
 msgstr "Gukora: %s]%s Komandi:"
 
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
+
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+msgid "chdir() failed\n"
+msgstr ""
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
 # so3/src\svuidlg.src:MD_DDE_LINKEDIT.FT_DDE_ITEM.text
 #. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 #, fuzzy
 msgid "Category: "
 msgstr "Icyiciro"
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
-msgstr ""
-
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
-msgstr "ubutumwa nterineti/elegitoroniki"
-
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Ubutumwa"
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr ""
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 #, fuzzy
 msgid "-Unnamed-"
 msgstr "-kitiswe-"
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 #, fuzzy
 msgid "0 records"
 msgstr "0 Ibyabitswe"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, fuzzy, c-format
 msgid "%d of %d records"
 msgstr "%dBya Ibyabitswe"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
-msgstr "Kwandika ibyiciro"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Izina"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Aderesi"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Ikindi"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Igisobanuro"
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
+
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr ""
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Kureka"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 #, fuzzy
 msgid "Cancel the modifications"
 msgstr "i"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Gusiba"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 #, fuzzy
 msgid "Delete the selected record"
 msgstr "i Byahiswemo Icyabitswe"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr ""
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete the selected record"
 msgstr "i Byahiswemo Icyabitswe"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Guporora"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 #, fuzzy
 msgid "Copy the selected record"
 msgstr "i Byahiswemo Icyabitswe"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Icyabitswe Gishya"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 #, fuzzy
 msgid "Add a new record"
 msgstr "a Gishya Icyabitswe"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr ""
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 #, fuzzy
 msgid "Add the new record"
 msgstr "i Gishya Icyabitswe"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr ""
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 #, fuzzy
 msgid "Commit the modifications"
 msgstr "i"
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "By'umwihariko"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "Izina"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "Aderesi"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "Ikindi"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "Kureka"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "Byose"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Gukuraho"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+msgid "Show In List"
 msgstr ""
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
+#: ../address_gui.c:4347
+msgid "Reminder"
 msgstr ""
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "Iminsi"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Byose"
+
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Iminota"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "amasaha"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr ""
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, fuzzy, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "Kuri Gufungura"
+msgid "Unable to open file: %s%s\n"
+msgstr "Kuri Gufungura IDOSIYE"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr ""
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr ""
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr ""
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr ""
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr ""
 
-#: ../alarms.c:1163
-#, fuzzy
-msgid "infinite loop, breaking\n"
-msgstr "Bidashira"
-
-#: ../alarms.c:1531
-#, fuzzy, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Kuri Gufungura"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-#, fuzzy
-msgid "rename failed"
-msgstr "Guhindura izina Byanze"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 #, fuzzy
 msgid "PC file corrupt?\n"
 msgstr "IDOSIYE"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 #, fuzzy
 msgid "fseek failed - fatal error\n"
 msgstr "Byanze"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+#, fuzzy
+msgid "rename failed"
+msgstr "Guhindura izina Byanze"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Kwimura"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Kwandika ibyiciro"
+
+#: ../category.c:437
 #, fuzzy
 msgid "The maximum number of categories (16) are already used"
 msgstr "Kinini Umubare Bya Ibyiciro"
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr ""
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 #, fuzzy
 msgid "Edit Categories Error"
 msgstr "Kwandika ibyiciro"
 
-#: ../category.c:465
+#: ../category.c:452
 #, fuzzy
 msgid "You must select a category to rename"
 msgstr "Guhitamo a Icyiciro Kuri Guhindura izina"
 
-#: ../category.c:469
-#, fuzzy, c-format
-msgid "You can't edit category %s.\n"
-msgstr "Guhindura Icyiciro"
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr ""
 
-#: ../category.c:490
+#: ../category.c:476
 #, fuzzy
 msgid "You must select a category to delete"
 msgstr "Guhitamo a Icyiciro Kuri Gusiba"
 
 #: ../category.c:494
 #, fuzzy, c-format
-msgid "You can't delete category %s.\n"
-msgstr "Gusiba Icyiciro"
-
-#: ../category.c:510
-#, fuzzy, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
 msgstr "Ibyabitswe in Kuri Kwimura Kuri Cyangwa Gusiba"
 
-#: ../category.c:569
+#: ../category.c:554
 #, fuzzy, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "Sibyo Leta IDOSIYE Umurongo"
 
-#: ../category.c:591
+#: ../category.c:576
 #, fuzzy, c-format
 msgid "The category %s can't be used more than once"
 msgstr "Icyiciro Birenzeho Rimwe"
 
-#. correctly translate title
-#: ../category.c:813
+# so3/src\svuidlg.src:MD_DDE_LINKEDIT.FT_DDE_ITEM.text
+#. Category names in host character set
+#: ../category.c:733
 #, fuzzy
-msgid "category name"
-msgstr "Icyiciro Izina:"
+msgid "Category"
+msgstr "Icyiciro"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "Gishya"
 
-#: ../category.c:845
+#: ../category.c:841
 msgid "Rename"
 msgstr "Guhindura izina"
 
-# Debug menu items
-#: ../category.c:960
-#, fuzzy
-msgid "debug"
-msgstr "Kosora amakosa"
-
-#: ../dat.c:455
+#: ../dat.c:512
 #, fuzzy
 msgid "unknown type ="
 msgstr "Kitazwi Ubwoko"
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, fuzzy, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "Imyanya Urubariro IBARA Kitazwi"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, fuzzy, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "Umwanya IBARA Kitazwi"
 
-#: ../dat.c:558
+#: ../dat.c:635
 #, fuzzy
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Imiterere IDOSIYE"
 
-#: ../dat.c:559
+#: ../dat.c:636
 #, fuzzy
 msgid "File schema is:"
 msgstr "Idosiye Igishushanyo ni"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+msgid "It should be:"
 msgstr ""
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, fuzzy, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr "%s:%dUmwanya Ubwoko Itegerejwe Byabonetse"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 #, fuzzy
 msgid "read of file terminated\n"
 msgstr "Gusoma Bya IDOSIYE"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, fuzzy, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "Byabonetse in"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "ku"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "ku"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "ku"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "ku"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "ku"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "ku"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr ""
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 #, fuzzy
 msgid "Mo"
 msgstr "ukwezi"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr ""
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Twebwe"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr ""
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr ""
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr ""
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Impera"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+#, fuzzy
+msgid "Repeat on Days:"
+msgstr "ku"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "Umubare Bya Ibyabitswe"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Igisobanuro"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+msgid "Alarm:"
+msgstr ""
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "ku"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Bya Icyumweru"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, fuzzy, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Isobanuramiterere Umwandiko Kuri"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Ikosa"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 #, fuzzy
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Idosiye Kugaragara Kuri"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 #, fuzzy
 msgid "Unknown export type"
 msgstr "Kohereza Ubwoko"
 
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
 # filter/source\pdf\impdialog.src:RID_PDF_EXPORT_DLG.BT_OK.text
 # filter/source\xsltdialog\xmlfiltertestdialog.src:DLG_XML_FILTER_TEST_DIALOG.FL_EXPORT.text
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Kohereza"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr ""
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "kubika nka"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Gushakisha"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr ""
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "Gufunga"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Ntacyo"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr ""
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 #, fuzzy
 msgid "End On Date"
 msgstr "Impera"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr ""
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr ""
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr ""
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr ""
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr ""
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr ""
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr ""
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr ""
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Iheruka"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, fuzzy, c-format
 msgid ""
 "This appointment can either\n"
@@ -710,267 +996,243 @@ msgid ""
 "Which do you want?"
 msgstr "ku i Bya i Ukwezi Cyangwa ku i Bya i Ukwezi"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr ""
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
 #, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr "ni a Icyabaye Kuri Gukurikiza Kuri i Cyangwa Bya Bya iyi Icyabaye"
 
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_CURRENT.text
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 #, fuzzy
 msgid "Current"
 msgstr "KIGEZWEHO"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "ntacyo"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "umunsi"
 
 # svtools/source\control\calendar.src:STR_SVT_CALENDAR_WEEK.text
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 #, fuzzy
 msgid "week"
 msgstr "Icyumweru"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "ukwezi"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "umwaka"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, fuzzy, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "buri S"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
 #, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr "OYA a Buri kyumweru Gusubiramo ku UMUNSI Bya i Icyumweru"
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr ""
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr ""
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 #, fuzzy
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
 msgstr "Impera Bya iyi Mbere i Gutangira Itariki"
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr ""
 
-#: ../datebook_gui.c:3021
+#: ../datebook_gui.c:3491
 #, fuzzy, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "in"
 
-#: ../datebook_gui.c:3192
-#, fuzzy
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "Byabonetse in"
-
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr ""
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Icyumweru"
 
-#: ../datebook_gui.c:4206
-msgid "W"
-msgstr "W"
-
-#: ../datebook_gui.c:4208
+#: ../datebook_gui.c:4940
 #, fuzzy
-msgid "View appointments by week"
+msgid "View appointments by week   Ctrl+W"
 msgstr "ku Icyumweru"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Ukwezi"
 
-#: ../datebook_gui.c:4218
-msgid "M"
-msgstr "M"
-
-#: ../datebook_gui.c:4220
+#: ../datebook_gui.c:4952
 #, fuzzy
-msgid "View appointments by month"
+msgid "View appointments by month   Ctrl+M"
 msgstr "ku Ukwezi"
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr ""
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Igihe"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr ""
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Igikorwa"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr ""
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr ""
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "Iminsi"
-
-#: ../datebook_gui.c:4485
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
 #, fuzzy
-msgid "This Event has no particular time"
-msgstr "Oya Igihe"
+msgid "Date:"
+msgstr "Itariki"
 
-#: ../datebook_gui.c:4493
+#. Start date and time
+#: ../datebook_gui.c:5280
 #, fuzzy
-msgid "Starts on"
+msgid "Start"
 msgstr "ku"
 
-#: ../datebook_gui.c:4507
-#, fuzzy
-msgid "Start Time"
-msgstr "Gutangira"
-
-#: ../datebook_gui.c:4525
+#. End date and time
+#: ../datebook_gui.c:5297
 #, fuzzy
-msgid "End Time"
-msgstr "Impera"
+msgid "End"
+msgstr "Impera ku"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr ""
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Umunsi"
 
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Umwaka"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 #, fuzzy
 msgid "This event will not repeat"
 msgstr "Icyabaye OYA Gusubiramo"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 #, fuzzy
 msgid "Frequency is Every"
 msgstr "ni"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "U(I)munsi"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 #, fuzzy
 msgid "End on"
 msgstr "Impera ku"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 #, fuzzy
 msgid "Week(s)"
 msgstr "ibyumweru"
 
-#: ../datebook_gui.c:4710
-#, fuzzy
-msgid "Repeat on Days:"
-msgstr "ku"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 #, fuzzy
 msgid "Month(s)"
 msgstr "amezi"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 #, fuzzy
 msgid "Repeat by:"
 msgstr "ku"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 #, fuzzy
 msgid "Day of week"
 msgstr "Bya Icyumweru"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Itariki"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 #, fuzzy
 msgid "Year(s)"
 msgstr "S"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "uterefona"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 #, fuzzy
 msgid "Prefix 1"
 msgstr "1."
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 #, fuzzy
 msgid "Prefix 2"
 msgstr "2."
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 #, fuzzy
 msgid "Prefix 3"
 msgstr "3."
@@ -978,7 +1240,7 @@ msgstr "3."
 # VCARD_LDAP_PHONE_NUMBER
 # # @name VCARD_LDAP_PHONE_NUMBER
 # # @loc None
-#: ../dialer.c:288
+#: ../dialer.c:289
 #, fuzzy
 msgid "Phone number:"
 msgstr "Nomero ya terefoni"
@@ -987,271 +1249,160 @@ msgstr "Nomero ya terefoni"
 msgid "Extension"
 msgstr "Umugereka"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr ""
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr ""
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 #, fuzzy
 msgid "File Browser"
 msgstr "Idosiye"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 #, fuzzy
 msgid "Select records to be exported"
 msgstr "Ibyabitswe Kuri"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 #, fuzzy
 msgid "Use Ctrl and Shift Keys"
 msgstr "Na"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Kuzana"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-#, fuzzy
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Guhindura>> Kuri a gihishwe bushyinguro Ubwoko munsi Na kanda"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "Byakozwe"
-
-#: ../import_gui.c:328
-#, fuzzy
-msgid "Import File Type"
-msgstr "Idosiye"
-
-#: ../import_gui.c:442
-#, fuzzy
+#: ../import_gui.c:317
+#, fuzzy, c-format
 msgid "Record was marked as private"
 msgstr "cy/ byagarajwe Nka By'umwihariko"
 
-#: ../import_gui.c:444
-#, fuzzy
+#: ../import_gui.c:319
+#, fuzzy, c-format
 msgid "Record was not marked as private"
 msgstr "OYA cy/ byagarajwe Nka By'umwihariko"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, fuzzy, c-format
 msgid "Category before import was: [%s]"
 msgstr "Mbere Kuzana"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, fuzzy, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Gushyira in Icyiciro"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr ""
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr ""
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Kora iyinjizaporogaramu"
+#: ../import_gui.c:457 ../install_gui.c:427
+#, fuzzy
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "Guhindura>> Kuri a gihishwe bushyinguro Ubwoko munsi Na kanda"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
+#: ../import_gui.c:484
 #, fuzzy
-msgid "Files to be installed"
-msgstr "Kuri"
+msgid "Import File Type"
+msgstr "Idosiye"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Kongera"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Kuri"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Gukuraho"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Kora iyinjizaporogaramu"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/Idosiye"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "Izinakoresha"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "koresha Indango"
 
-#: ../jpilot-dump.c:95
-#, fuzzy
-msgid " +D +A +T +M format like date +format.\n"
-msgstr ""
-"+A Imiterere nka Itariki Imiterere Gukoresha kugirango Birenzeho Ibisobanuro"
-
-#: ../jpilot-dump.c:96
-#, fuzzy
-msgid " -v displays version and exits.\n"
-msgstr "-v Verisiyo Na"
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-#, fuzzy
-msgid " -h displays help and exits.\n"
-msgstr "-h Ifashayobora Na"
-
-#: ../jpilot-dump.c:98
-#, fuzzy
-msgid " -f displays help for format codes.\n"
-msgstr "-h Ifashayobora Na"
-
-#: ../jpilot-dump.c:99
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr "-A Igitabo"
-
-#: ../jpilot-dump.c:100
-#, fuzzy
-msgid " -N dump appts for today in DateBook.\n"
-msgstr "-ku UYUMUNSI in"
-
-#: ../jpilot-dump.c:101
-#, fuzzy
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr "-ku in"
-
-#: ../jpilot-dump.c:102
-#, fuzzy
-msgid " -A dump Address book.\n"
-msgstr "-A Igitabo"
-
-#: ../jpilot-dump.c:103
-#, fuzzy
-msgid " -T dump ToDo list as CSV.\n"
-msgstr "-Urutonde Nka"
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:66
-#, fuzzy
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-"Ibyahiswemo Gusoma Kuri Kubona Umuyoboro Igipimo Umubare Bya Ibyashyinguwe"
-
-#: ../jpilot-sync.c:67
-#, fuzzy
-msgid " -v = version\n"
-msgstr "-v"
-
-#: ../jpilot-sync.c:68
-#, fuzzy
-msgid " -h = help\n"
-msgstr "-h"
-
-#: ../jpilot-sync.c:69
-#, fuzzy
-msgid " -d = run in debug mode\n"
-msgstr "-D Gukoresha in Kosora amakosa"
-
-#: ../jpilot-sync.c:70
-#, fuzzy
-msgid " -P = do not load plugins.\n"
-msgstr "-OYA Ibirimo"
-
-#: ../jpilot-sync.c:71
-#, fuzzy
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr "-B a Na Hanyuma a Inyibutsa a"
-
-#: ../jpilot-sync.c:72
-#, fuzzy
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr "-L Rimwe Na Gusohoka"
-
-#: ../jpilot-sync.c:73
-#, fuzzy
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr "-P Umuyoboro iyi Umuyoboro Kuri Na: Bya Ibyahiswemo"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, fuzzy, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Iyigamashusho"
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Gucapa"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 #, fuzzy
 msgid "There is no print support for this conduit."
 msgstr "ni Oya Gucapa Gushigikira kugirango iyi"
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 #, fuzzy
 msgid "There is no import support for this conduit."
 msgstr "ni Oya Kuzana Gushigikira kugirango iyi"
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 #, fuzzy
 msgid "There is no export support for this conduit."
 msgstr "ni Oya Kohereza Gushigikira kugirango iyi"
 
+#: ../jpilot.c:657
+msgid " Cancelling HotSync\n"
+msgstr ""
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
 #, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Palm i Ukoresha: Ukoresha: Nka i Igihe Ingaruka i Ukoresha: Bikorwa NIBA"
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
 #, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Palm a Ukoresha: ID Palm a Cyo nyine Ukoresha: ID in Itondekanya Kuri "
@@ -1260,510 +1411,854 @@ msgstr ""
 "porogaramu Ukoresha: i E Kwinjiza porogaramu Ukoresha: Izina: i Ukoresha: "
 "Bikorwa NIBA"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr ""
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr ""
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr ""
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+#, fuzzy
+msgid " User: "
+msgstr "Ukoresha:"
+
+#: ../jpilot.c:944
 #, fuzzy
 msgid "Unknown command from sync process\n"
 msgstr "Komandi: Bivuye"
 
 # offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Ibyerekeye"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 #, fuzzy
 msgid "/_File"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 #, fuzzy
 msgid "/File/tear"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 #, fuzzy
 msgid "/File/_Find"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 #, fuzzy
 msgid "/File/sep1"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 #, fuzzy
 msgid "/File/_Install"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 #, fuzzy
 msgid "/File/Import"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 #, fuzzy
 msgid "/File/Export"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 #, fuzzy
 msgid "/File/Preferences"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 #, fuzzy
 msgid "/File/_Print"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 #, fuzzy
 msgid "/File/Install User"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 #, fuzzy
 msgid "/File/Restore Handheld"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 #, fuzzy
 msgid "/File/_Quit"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr ""
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 #, fuzzy
 msgid "/View/Hide Private Records"
 msgstr "By'umwihariko Ibyabitswe"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 #, fuzzy
 msgid "/View/Show Private Records"
 msgstr "By'umwihariko Ibyabitswe"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 #, fuzzy
 msgid "/View/Mask Private Records"
 msgstr "By'umwihariko Ibyabitswe"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 #, fuzzy
 msgid "/View/sep1"
 msgstr "/Idosiye"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr ""
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 #, fuzzy
 msgid "/View/Addresses"
 msgstr "/Aderesi"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr ""
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr ""
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr ""
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr ""
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 #, fuzzy
 msgid "/Web/Netscape"
 msgstr "/Netscape"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 #, fuzzy
 msgid "/Web/Mozilla"
 msgstr "/Mozilla"
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr ""
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr ""
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr ""
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr ""
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr ""
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr ""
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr ""
 
 # sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 #, fuzzy
 msgid "/_Help"
 msgstr "/Kugoboka"
 
-#: ../jpilot.c:1462
-#, fuzzy
-msgid "/Help/PayBack program"
-msgstr "/Porogaramu"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr ""
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr ""
 
 # sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, fuzzy, c-format
 msgid "/_Help/%s"
 msgstr "/Kugoboka"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr ""
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 #, fuzzy
 msgid "calendar:week_start:0"
 msgstr "Kalindari 0"
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 #, fuzzy
 msgid "Not loading plugins.\n"
 msgstr "Itangira..."
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 #, fuzzy
 msgid "Ignoring all alarms.\n"
 msgstr "Kwirengagiza Byose"
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 #, fuzzy
 msgid "Ignoring past alarms.\n"
 msgstr "Kwirengagiza"
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 #, fuzzy
 msgid "Unable to open pipe\n"
 msgstr "Kuri Gufungura"
 
-#: ../jpilot.c:2422
-#, fuzzy
-msgid " User: "
-msgstr "Ukoresha:"
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "bigaragara,kigaragara"
-
-#: ../jpilot.c:2649
-#, fuzzy
-msgid "Show private records   Ctrl-Z"
-msgstr "By'umwihariko Ibyabitswe"
-
-#: ../jpilot.c:2654
-#, fuzzy
-msgid "Show private records"
-msgstr "By'umwihariko Ibyabitswe"
-
-#: ../jpilot.c:2659
-#, fuzzy
-msgid "Hide private records   Ctrl-Z"
-msgstr "By'umwihariko Ibyabitswe"
-
-#: ../jpilot.c:2664
+#: ../jpilot.c:1949
 #, fuzzy
-msgid "Hide private records"
+msgid "Show private records   Ctrl+Z"
 msgstr "By'umwihariko Ibyabitswe"
 
-#: ../jpilot.c:2669
+#: ../jpilot.c:1954
 #, fuzzy
-msgid "Mask private records   Ctrl-Z"
+msgid "Hide private records   Ctrl+Z"
 msgstr "By'umwihariko Ibyabitswe"
 
-#: ../jpilot.c:2674
+#: ../jpilot.c:1959
 #, fuzzy
-msgid "Mask private records"
+msgid "Mask private records   Ctrl+Z"
 msgstr "By'umwihariko Ibyabitswe"
 
-#: ../jpilot.c:2684
+#: ../jpilot.c:1971
 #, fuzzy
-msgid "Sync your palm to the desktop   Ctrl-Y"
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Palm Kuri i Ibiro"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
-msgid "Font"
-msgstr "Umukono"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Aderesi"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 #, fuzzy
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
 msgstr "Palm Kuri i Hanyuma a Inyibutsa"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 #, fuzzy
 msgid "Datebook/Go to Today"
 msgstr "Kuri"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Agatabondanganturo"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr ""
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr ""
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr ""
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr ""
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr ""
 
-#: ../jpilot.c:2891
-#, fuzzy
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 "ni ikoresha i Verisiyo Bya i 8 Kuri Inyuguti Guhitamo a 8 i Inyuguti "
 "kugirango Urugero"
 
-#: ../jpilot.c:2894
-#, fuzzy
-msgid "Go to the menu \""
-msgstr "Kuri i Ibikubiyemo"
-
-#: ../jpilot.c:2896
-#, fuzzy
-msgid "\" and change the \""
-msgstr "\"Na Guhindura>> i"
-
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
+#: ../jpilot.c:2192 ../prefs_gui.c:509
 #, fuzzy
-msgid "Character Set "
+msgid "Character Set"
 msgstr "Ishyirahamwe ry'Inyuguti"
 
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-#: ../jpilot.c:2898
-#, fuzzy
-msgid "\"."
-msgstr "\"."
-
-#: ../jpilot.c:2900
+#: ../jpilot.c:2194
 #, fuzzy
 msgid "Select a UTF-8 encoding"
 msgstr "8 Imisobekere:"
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:92
 #, fuzzy, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "Umutwempangano Verisiyo"
+msgid " +D +A +T +M format like date +format.\n"
+msgstr ""
+"+A Imiterere nka Itariki Imiterere Gukoresha kugirango Birenzeho Ibisobanuro"
 
-#: ../libplugin.c:416
+#: ../jpilot-dump.c:93
 #, fuzzy, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%dGufungura %s%S IDOSIYE"
+msgid " -v display version and exit\n"
+msgstr "-v Verisiyo Na"
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
 #, fuzzy, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%dIDOSIYE"
+msgid " -h display help text\n"
+msgstr "-h Ifashayobora Na"
 
-#: ../libplugin.c:478 ../utils.c:1944
-#, fuzzy
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
-msgstr "Icyabitswe ni Cyasibwe ni Kuri Cyasibwe Bivuye i ku i Komeza>>"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr "-h Ifashayobora Na"
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-#, fuzzy
-msgid "Unable to open PC records file\n"
-msgstr "Kuri Gufungura Ibyabitswe"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr "-A Igitabo"
 
-#: ../libplugin.c:493 ../utils.c:1959
-#, fuzzy
-msgid "Couldn't find record to delete\n"
-msgstr "Gushaka Icyabitswe Kuri"
+#: ../jpilot-dump.c:97
+#, c-format
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:98
 #, fuzzy, c-format
-msgid "Unknown header version %d\n"
-msgstr "Umutwempangano Verisiyo"
+msgid " -N dump appts for today in DateBook\n"
+msgstr "-ku UYUMUNSI in"
 
-#: ../libplugin.c:524
-#, fuzzy
-msgid "Couldn't open PC records file\n"
-msgstr "Gufungura Ibyabitswe"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr "-ku in"
 
-# basctl/source\basicide\basidesh.src:RID_STR_ERROROPENSTORAGE.text
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
+#: ../jpilot-dump.c:100
 #, fuzzy, c-format
-msgid "Error opening file: %s\n"
-msgstr "Hari ikibazo mu gufungura dosiye"
+msgid " -A dump Address book\n"
+msgstr "-A Igitabo"
 
-#: ../libplugin.c:714
-#, fuzzy
-msgid "Error reading PC file 1\n"
-msgstr "IDOSIYE"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr "-Urutonde Nka"
 
-#: ../libplugin.c:730
-#, fuzzy
-msgid "Error reading PC file 2\n"
-msgstr "IDOSIYE"
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr "-A Igitabo"
 
-#: ../libplugin.c:903
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Error reading %s 5\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
 msgstr ""
 
-#: ../log.c:95
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
 #, fuzzy, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Kuri Gufungura LOG IDOSIYE Hejuru"
+msgid "%s: Unable to open file:%s\n"
+msgstr "Kuri Gufungura IDOSIYE"
 
-#: ../log.c:102
-#, fuzzy, c-format
-msgid "Unable to open log file\n"
-msgstr "Kuri Gufungura LOG"
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-#, fuzzy
-msgid "Memo text > 65535, truncating\n"
-msgstr "Umwandiko"
+#: ../jpilot-merge.c:270
+#, c-format
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:271
 #, c-format
-msgid "Imported Memo %s\n"
+msgid "Records deleted       = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:400
-#, fuzzy
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Idosiye Kugaragara Kuri"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
-#, fuzzy, c-format
-msgid "Can't export memo %d\n"
-msgstr "Kohereza Umwandikorusobe..."
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
 msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
 msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
+#: ../jpilot-merge.c:293
+#, c-format
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
 msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
 msgstr ""
 
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-#, fuzzy
-msgid "infinite loop"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:296
+#, c-format
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
+msgstr ""
+
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
+
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
+
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+"Ibyahiswemo Gusoma Kuri Kubona Umuyoboro Igipimo Umubare Bya Ibyashyinguwe"
+
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr "-v Verisiyo Na Gukusanya Amahitamo Na"
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr "-D Kosora amakosa Ibisobanuro Kuri"
+
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr "Itangira..."
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr "-L Rimwe Na Gusohoka"
+
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr "-P Umuyoboro iyi Umuyoboro Kuri Na: Bya Ibyahiswemo"
+
+# basctl/source\basicide\basidesh.src:RID_STR_ERROROPENSTORAGE.text
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Hari ikibazo mu gufungura dosiye"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Gufungura%S IDOSIYE"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Ikosa"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "IMPINDURAGACIRO ni kugirango"
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+#, fuzzy
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr "Icyabitswe ni Cyasibwe ni Kuri Cyasibwe Bivuye i ku i Komeza>>"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+#, fuzzy
+msgid "Unable to open PC records file\n"
+msgstr "Kuri Gufungura Ibyabitswe"
+
+#: ../libplugin.c:77 ../utils.c:1069
+#, fuzzy
+msgid "Couldn't find record to delete\n"
+msgstr "Gushaka Icyabitswe Kuri"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, fuzzy, c-format
+msgid "Unknown header version %d\n"
+msgstr "Umutwempangano Verisiyo"
+
+#: ../libplugin.c:180
+#, fuzzy, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%dGufungura %s%S IDOSIYE"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, fuzzy, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%dIDOSIYE"
+
+# basctl/source\basicide\basidesh.src:RID_STR_ERROROPENSTORAGE.text
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, fuzzy, c-format
+msgid "Error opening file: %s\n"
+msgstr "Hari ikibazo mu gufungura dosiye"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr ""
+
+#: ../libplugin.c:799
+#, fuzzy
+msgid "Error reading PC file 1\n"
+msgstr "IDOSIYE"
+
+#: ../libplugin.c:815
+#, fuzzy
+msgid "Error reading PC file 2\n"
+msgstr "IDOSIYE"
+
+#: ../libplugin.c:921
+#, fuzzy, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "Umutwempangano Verisiyo"
+
+#: ../log.c:98
+#, fuzzy, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Kuri Gufungura LOG IDOSIYE Hejuru"
+
+#: ../log.c:108
+#, fuzzy, c-format
+msgid "Unable to open log file\n"
+msgstr "Kuri Gufungura LOG"
+
+#: ../memo_gui.c:302
+#, fuzzy
+msgid "Memo text > 65535, truncating\n"
+msgstr "Umwandiko"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr ""
+
+#: ../memo_gui.c:402
+#, fuzzy
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Idosiye Kugaragara Kuri"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, fuzzy, c-format
+msgid "Can't export memo %d\n"
+msgstr "Kohereza Umwandikorusobe..."
+
+#: ../memo_gui.c:641
+#, c-format
+msgid "Memo: %ld\n"
+msgstr ""
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr ""
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr ""
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr ""
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr ""
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+# svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Ikosa mu gusoma idosiye"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+#, fuzzy
+msgid "infinite loop"
 msgstr "Bidashira"
 
-#: ../plugins.c:213
+#: ../plugins.c:214
 #, fuzzy, c-format
 msgid "While reading %s%s line 1:[%s]\n"
 msgstr "Umurongo 1."
 
-#: ../plugins.c:214
+#: ../plugins.c:215
 msgid "Wrong Version\n"
 msgstr ""
 
-#: ../plugins.c:215
+#: ../plugins.c:216
 #, fuzzy
 msgid "Check preferences->conduits\n"
 msgstr "Ibyahiswemo"
 
-#: ../plugins.c:271
+#: ../plugins.c:272
 #, fuzzy, c-format
 msgid ""
 "Open failed on plugin [%s]\n"
 " error [%s]\n"
 msgstr "Byanze ku Ikosa"
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../plugins.c:289 ../plugins.c:314
 #, fuzzy, c-format
 msgid " plugin is invalid: [%s]\n"
 msgstr "ni Sibyo"
 
-#: ../plugins.c:296
+#: ../plugins.c:297
 #, c-format
 msgid "Plugin:[%s]\n"
 msgstr ""
 
-#: ../plugins.c:297
+#: ../plugins.c:298
 #, fuzzy, c-format
 msgid "This plugin is version (%d.%d).\n"
 msgstr ""
@@ -1776,1368 +2271,1461 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: ../plugins.c:299
+#: ../plugins.c:300
 #, fuzzy
 msgid "It is too old to work with this version of J-Pilot.\n"
 msgstr "ni ki/ bishaje Kuri Akazi Na: iyi Verisiyo Bya"
 
-#: ../prefs.c:393
+#: ../prefs.c:418
 msgid "%B %d, %Y"
 msgstr ""
 
-#: ../prefs.c:394
+#: ../prefs.c:419
 msgid "%d %B %Y"
 msgstr ""
 
-#: ../prefs.c:395
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr ""
 
-#: ../prefs.c:396
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr ""
 
-#: ../prefs.c:397
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr ""
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr ""
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Ibyahisemo"
 
 # officecfg/registry\schema\org\openoffice\Setup.xcs:....L10N.ooLocale.text
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Umwanya"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Amagenamiterere"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr ""
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr ""
 
 # sysui/oounix\office\cde\writer.lng:<memo_action_label>.text
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "Ubutumwa"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr ""
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr ""
 
 #. Shortdate
-#: ../prefs_gui.c:403
+#: ../prefs_gui.c:522
 #, fuzzy
-msgid "Short date format "
+msgid "Short date format"
 msgstr "Itariki Imiterere"
 
 #. Longdate
-#: ../prefs_gui.c:416
+#: ../prefs_gui.c:535
 #, fuzzy
-msgid "Long date format "
+msgid "Long date format"
 msgstr "Itariki Imiterere"
 
 #. Time
-#: ../prefs_gui.c:429
+#: ../prefs_gui.c:548
 #, fuzzy
-msgid "Time format "
+msgid "Time format"
 msgstr "Imiterere y'igihe"
 
-#: ../prefs_gui.c:443
-#, fuzzy
-msgid "The first day of the week is "
-msgstr "Itangira UMUNSI Bya i Icyumweru ni"
-
 #. GTK colors file
-#: ../prefs_gui.c:464
+#: ../prefs_gui.c:568
 #, fuzzy
-msgid "My GTK colors file is "
+msgid "GTK color theme file"
 msgstr "Amabara IDOSIYE ni"
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr ""
-
-#. Rate
-#: ../prefs_gui.c:494
+#: ../prefs_gui.c:581
 #, fuzzy
-msgid "Serial Rate (Does not affect USB)"
-msgstr "OYA"
+msgid "Sync Port"
+msgstr "Umwandikorusobe..."
+
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 #, fuzzy
 msgid "Number of backups to be archived"
 msgstr "Bya Ibyashyinguwe Kuri"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 #, fuzzy
 msgid "Show deleted records (default NO)"
 msgstr "Cyasibwe Ibyabitswe Mburabuzi"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 #, fuzzy
 msgid "Show modified deleted records (default NO)"
 msgstr "Byahinduwe Cyasibwe Ibyabitswe Mburabuzi"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 #, fuzzy
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "Iyemeza kugirango IDOSIYE iyinjizaporogaramu Mburabuzi"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
+#: ../prefs_gui.c:656
 #, fuzzy
-msgid "Show popup tooltips (default YES)"
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Mburabuzi"
 
-#. ********************************************************************
-#. Datebook preference tab
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 #, fuzzy
 msgid "Highlight calendar days with appointments"
 msgstr "Kalindari Iminsi Na:"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr ""
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr ""
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 #, fuzzy
 msgid "Use DateBk note tags"
 msgstr "Impugukirwa"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 #, fuzzy
 msgid "DateBk support disabled in this build"
 msgstr "Gushigikira Yahagaritswe in iyi"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr ""
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, fuzzy, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%sni ku i E Ubutumwa Aderesi"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr ""
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 #, fuzzy
 msgid "Hide ToDos not yet due"
 msgstr "OYA"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr ""
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 #, fuzzy
 msgid "Use Manana database"
 msgstr "Ububikoshingiro"
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 #, fuzzy
 msgid "Use default number of days due"
 msgstr "Mburabuzi Umubare Bya Iminsi"
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+msgid "Use Memo32 database (pedit32)"
+msgstr ""
+
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
 msgstr ""
 
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 #, fuzzy
 msgid "Open alarm windows for appointment reminders"
 msgstr "kugirango"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 #, fuzzy
 msgid "Execute this command"
 msgstr "iyi Komandi:"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 #, fuzzy
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "Gukora:%s Igikonoshwa Amabwiriza"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr ""
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 #, fuzzy
 msgid "%t is replaced with the alarm time"
 msgstr "%tni Na: i Igihe"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, fuzzy, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%dni Na: i Itariki"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 #, fuzzy
 msgid "%D is replaced with the alarm description"
 msgstr "%Dni Na: i Isobanuramiterere"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 #, fuzzy
 msgid "%N is replaced with the alarm note"
 msgstr "%Nni Na: i Impugukirwa"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 #, fuzzy
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D(Isobanuramiterere ni Yahagaritswe in iyi"
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 #, fuzzy
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N(Impugukirwa ni Yahagaritswe in iyi"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr ""
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 #, fuzzy
 msgid "Sync address"
 msgstr "Aderesi"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr ""
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 #, fuzzy
 msgid "Sync memo"
 msgstr "Umwandikorusobe..."
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr ""
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr ""
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr ""
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr ""
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Ihitamo ry'Ishyirwa-Rupapuro"
 
 # padmin/source\rtsetup.src:RID_RTS_PAPERPAGE.RID_RTS_PAPER_PAPER_TXT.text
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 #, fuzzy
 msgid "Paper Size"
 msgstr "Ingano y'urupapuro"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr ""
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr ""
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr ""
 
-#: ../print_gui.c:261
+#: ../print_gui.c:264
 #, fuzzy
-msgid "One record"
-msgstr "Icyabitswe"
+msgid "Selected record"
+msgstr "a Icyabitswe"
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 #, fuzzy
 msgid "All records in this category"
 msgstr "Ibyabitswe in iyi Icyiciro"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 #, fuzzy
 msgid "Print all records"
 msgstr "Byose Ibyabitswe"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 #, fuzzy
 msgid "One record per page"
 msgstr "Icyabitswe Ipaji"
 
-#: ../print_gui.c:308
+#: ../print_gui.c:310
 #, fuzzy
-msgid " Blank lines between each record"
+msgid "Blank lines between each record"
 msgstr "Imirongo hagati Icyabitswe"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 #, fuzzy
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "g."
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr ""
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Kuri"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 #, fuzzy
 msgid "To restore your handheld:"
 msgstr "Kugarura"
 
-#: ../restore_gui.c:252
+#: ../restore_gui.c:247
 #, fuzzy
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1.."
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 #, fuzzy
 msgid "2. Enter the User Name and User ID."
 msgstr "2.."
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 #, fuzzy
 msgid "3. Press the OK button."
 msgstr "3.."
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 #, fuzzy
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Guhindura Ibyatanzwe ni ku i"
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "Izinakoresha"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr ""
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 #, fuzzy
 msgid "address"
 msgstr "Aderesi"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr ""
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "ubutumwa"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "ubutumwa"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr ""
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 #, fuzzy
 msgid "No records found"
 msgstr "Ibyabitswe Byabonetse"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Gushaka"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 #, fuzzy
 msgid "Search for: "
 msgstr "Gushakisha:"
 
 # officecfg/registry\schema\org\openoffice\Office\Calc.xcs:....Calculate.Other.CaseSensitive.text
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Imyandikire y'inyuguti nkuru/ nto"
 
-#: ../sync.c:139
+#: ../sync.c:118
 #, fuzzy
 msgid "open lock file failed\n"
 msgstr "Gufungura IDOSIYE"
 
-#: ../sync.c:152
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr ""
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, fuzzy, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "IDOSIYE ni Gifunze ku"
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr ""
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, fuzzy, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "ni Gifunze ku"
 
-#: ../sync.c:244
-#, fuzzy, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s:Kanda i Akabuto ku i Cyangwa"
-
-#: ../sync.c:297
-#, fuzzy, c-format
-msgid "Exiting with status %s\n"
-msgstr "Na: Imimerere"
-
-#: ../sync.c:298
-msgid "Finished\n"
-msgstr ""
-
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
-msgstr ""
-
-#: ../sync.c:457 ../sync.c:575
+#: ../sync.c:418
 #, fuzzy
-msgid "Check your serial port and settings\n"
+msgid "Check your sync port and settings\n"
 msgstr "Umuyoboro Na"
 
-#: ../sync.c:674
-#, fuzzy, c-format
-msgid " Syncing on device %s\n"
-msgstr "ku APAREYE"
-
-#: ../sync.c:675
+#: ../sync.c:677
 #, fuzzy
-msgid " Press the HotSync button now\n"
-msgstr "i Akabuto"
+msgid "Unable to read home dir\n"
+msgstr "Kuri Gusoma Ku Ntangiriro"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
-#, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr ""
+#: ../sync.c:1085 ../sync.c:1423
+#, fuzzy, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s(ni Hejuru Kuri Itariki"
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
+msgid "Fetching '%s' (Creator ID '%s')... "
 msgstr ""
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
-#, c-format
-msgid " This Username-->\"%s\"\n"
+#: ../sync.c:1096 ../sync.c:1433
+#, fuzzy, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "Kuri Kurema IDOSIYE"
+
+#: ../sync.c:1100 ../sync.c:1438
+#, fuzzy, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr "Kuri Inyuma Hejuru Ububikoshingiro"
+
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
 msgstr ""
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:1304
 #, c-format
-msgid " This User ID-->%d\n"
+msgid "Skipping %s (Creator ID '%s')\n"
 msgstr ""
 
-#: ../sync.c:795
+#: ../sync.c:1498
 #, fuzzy, c-format
-msgid "Username is \"%s\"\n"
-msgstr "ni"
+msgid "Installing %s "
+msgstr "Gukora iyinjizaporogaramu..."
 
-#: ../sync.c:796
+#: ../sync.c:1504 ../sync.c:1540
 #, fuzzy, c-format
-msgid "User ID is %d\n"
-msgstr "ni"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr "Kuri Gufungura IDOSIYE"
 
-#: ../sync.c:798 ../sync.c:804
-#, c-format
-msgid "lastSyncPC = %d\n"
-msgstr ""
+#: ../sync.c:1508
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr "Kuri IDOSIYE IDOSIYE"
 
-#: ../sync.c:799
-#, c-format
-msgid "This PC = %lu\n"
-msgstr ""
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(ni"
 
-#: ../sync.c:800
-#, c-format
-msgid "Last Username = [%s]\n"
-msgstr ""
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(ni"
 
-#: ../sync.c:801
+#: ../sync.c:1530
 #, c-format
-msgid "Last UserID = %d\n"
+msgid "(SDcard dir %s)... "
 msgstr ""
 
-#: ../sync.c:802
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, fuzzy, c-format
-msgid "Username = [%s]\n"
-msgstr "Izina ry'ukoresha"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr "Kuri Gufungura IDOSIYE"
 
-#: ../sync.c:803
-#, c-format
-msgid "userID = %d\n"
-msgstr ""
+#: ../sync.c:1615
+#, fuzzy, c-format
+msgid "Install %s failed"
+msgstr "Byanze"
 
-#: ../sync.c:821
-msgid "Sync canceled\n"
-msgstr ""
+#: ../sync.c:1619
+#, fuzzy
+msgid "Failed.\n"
+msgstr "Byanze"
 
-#: ../sync.c:843
-msgid "Finished restoring handheld.\n"
-msgstr ""
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "Gukora iyinjizaporogaramu..."
 
-#: ../sync.c:844
-#, fuzzy
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "Gicurasi Kuri Kuri Kuvugurura"
+#: ../sync.c:1736
+#, fuzzy, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%dIbisobanuro"
 
-#: ../sync.c:874
-#, fuzzy
-msgid "Doing a fast sync.\n"
-msgstr "a Byihuta"
+#: ../sync.c:1742 ../sync.c:1772
+#, fuzzy, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%dIbisobanuro"
 
-#: ../sync.c:913
-#, fuzzy
-msgid "Doing a slow sync.\n"
-msgstr "a Buhoro"
+#: ../sync.c:1763
+#, fuzzy, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Funga kugirango"
 
-#: ../sync.c:1014
-#, fuzzy
-msgid "Thank you for using J-Pilot."
-msgstr "kugirango ikoresha"
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, fuzzy, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "OYA Kongeramo Icyiciro Kuri"
 
-# wizards/source\importwizard\importwi.src:sReady.text
-#: ../sync.c:1056
-#, fuzzy
-msgid "Finished.\n"
-msgstr "Byarangiye"
+#: ../sync.c:2002 ../sync.c:2008
+#, fuzzy, c-format
+msgid "Too many categories on remote.\n"
+msgstr "Ibyiciro ku"
+
+#: ../sync.c:2003 ../sync.c:2011
+#, fuzzy, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Ibyabitswe ku Ibiro in Kuri"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr ""
 
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, fuzzy, c-format
 msgid "Wrote an %s record."
 msgstr "Icyabitswe"
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, fuzzy, c-format
 msgid "Writing an %s record failed."
 msgstr "Icyabitswe Byanze"
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, fuzzy, c-format
 msgid "Deleting an %s record failed."
 msgstr "Icyabitswe Byanze"
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, fuzzy, c-format
 msgid "Deleted an %s record."
 msgstr "Icyabitswe"
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "Icyabitswe"
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, fuzzy, c-format
 msgid "Wrote a %s record."
 msgstr "a Icyabitswe"
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, fuzzy, c-format
 msgid "Writing a %s record failed."
 msgstr "a Icyabitswe Byanze"
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, fuzzy, c-format
 msgid "Deleting a %s record failed."
 msgstr "a Icyabitswe Byanze"
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, fuzzy, c-format
 msgid "Deleted a %s record."
 msgstr "a Icyabitswe"
 
-#: ../sync.c:1133
-#, fuzzy, c-format
-msgid "number of records = %d\n"
-msgstr "Umubare Bya Ibyabitswe"
-
-#: ../sync.c:1260 ../sync.c:2435
-#, fuzzy
-msgid ""
-"dlp_DeleteRecord failed\n"
-"This could be because the record was already deleted on the Palm\n"
-msgstr "i Icyabitswe Cyasibwe ku i"
-
-#: ../sync.c:1358 ../sync.c:1770
-#, fuzzy, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s(ni Hejuru Kuri Itariki"
-
-#: ../sync.c:1362 ../sync.c:1774
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
+msgid "Sync Conflict: duplicated a %s record."
 msgstr ""
 
-#: ../sync.c:1369 ../sync.c:1780
-#, fuzzy, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Kuri Kurema IDOSIYE"
-
-#: ../sync.c:1380 ../sync.c:1789
-#, fuzzy, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Kuri Inyuma Hejuru Ububikoshingiro"
-
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr ""
-
-#: ../sync.c:1687
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
+msgid "Sync Conflict: a %s record must be manually merged\n"
 msgstr ""
 
-#: ../sync.c:1861
-#, fuzzy, c-format
-msgid "Installing %s "
-msgstr "Gukora iyinjizaporogaramu..."
-
-#: ../sync.c:1867
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr "Kuri Gufungura IDOSIYE"
-
-#: ../sync.c:1871
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr "Kuri IDOSIYE IDOSIYE"
-
-#: ../sync.c:1883
-#, fuzzy, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(ni"
-
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
-#, fuzzy, c-format
+#: ../sync.c:2368 ../sync.c:2708
+#, fuzzy
 msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr "Kuri Gufungura IDOSIYE"
+"dlp_DeleteRecord failed\n"
+"This could be because the record was already deleted on the Palm\n"
+msgstr "i Icyabitswe Cyasibwe ku i"
+
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr ""
 
-#: ../sync.c:1960
+#: ../sync.c:3094
 #, fuzzy, c-format
-msgid "Install %s failed"
-msgstr "Byanze"
+msgid " Syncing on device %s\n"
+msgstr "ku APAREYE"
 
-#: ../sync.c:1964
+#: ../sync.c:3095
 #, fuzzy
-msgid "Failed.\n"
-msgstr "Byanze"
+msgid " Press the HotSync button now\n"
+msgstr "i Akabuto"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Installed %s "
+msgid "Last Synced Username-->\"%s\"\n"
 msgstr ""
 
-#: ../sync.c:1995 ../sync.c:2001
-#, fuzzy, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Kuri Gufungura IDOSIYE"
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
+#, c-format
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr ""
 
-#: ../sync.c:2180
-#, fuzzy
-msgid "Unable to read home dir\n"
-msgstr "Kuri Gusoma Ku Ntangiriro"
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
+#, c-format
+msgid " This Username-->\"%s\"\n"
+msgstr ""
 
-#: ../sync.c:2709
-#, fuzzy, c-format
-msgid "palm: number of records = %d\n"
-msgstr "Palm Umubare Bya Ibyabitswe"
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
+#, c-format
+msgid " This User ID-->%d\n"
+msgstr ""
 
-#: ../sync.c:2710
+#: ../sync.c:3204
 #, fuzzy, c-format
-msgid "disk: number of records = %d\n"
-msgstr "Umubare Bya Ibyabitswe"
+msgid "Username is \"%s\"\n"
+msgstr "ni"
 
-#: ../sync.c:2888
+#: ../sync.c:3205
 #, fuzzy, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%dIbisobanuro"
+msgid "User ID is %d\n"
+msgstr "ni"
 
-#: ../sync.c:2894 ../sync.c:2936
-#, fuzzy, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%dIbisobanuro"
+#: ../sync.c:3207
+#, c-format
+msgid "lastSyncPC = %d\n"
+msgstr ""
 
-#: ../sync.c:2916 ../sync.c:2928
-#, fuzzy, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Funga kugirango"
+#: ../sync.c:3208
+#, c-format
+msgid "This PC = %lu\n"
+msgstr ""
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
-#, fuzzy, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "OYA Kongeramo Icyiciro Kuri"
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr ""
 
-#: ../sync.c:3073 ../sync.c:3079
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr ""
+
+#: ../sync.c:3256
 #, fuzzy
-msgid "Too many categories on remote.\n"
-msgstr "Ibyiciro ku"
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "Gicurasi Kuri Kuri Kuvugurura"
+
+#: ../sync.c:3278
+#, fuzzy
+msgid "Doing a fast sync.\n"
+msgstr "a Byihuta"
+
+#: ../sync.c:3291
+#, fuzzy
+msgid "Doing a slow sync.\n"
+msgstr "a Buhoro"
+
+#: ../sync.c:3366
+#, fuzzy
+msgid "Thank you for using J-Pilot."
+msgstr "kugirango ikoresha"
+
+# wizards/source\importwizard\importwi.src:sReady.text
+#: ../sync.c:3411 ../sync.c:3479
+#, fuzzy
+msgid "Finished.\n"
+msgstr "Byarangiye"
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../sync.c:3446
+#, c-format
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
+
+#: ../sync.c:3447
+#, c-format
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
+
+#: ../sync.c:3478
 #, fuzzy, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Ibyabitswe ku Ibiro in Kuri"
+msgid "Exiting with status %s\n"
+msgstr "Na: Imimerere"
 
-#: ../todo.c:248
+#: ../todo.c:264
 #, fuzzy, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "Isobanuramiterere Umwandiko Kuri"
 
-#: ../todo.c:255
+#: ../todo.c:270
 #, fuzzy, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "Impugukirwa Umwandiko Kuri"
 
-#: ../todo.c:380
-#, fuzzy, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%dIcyiciro Ibisobanuro"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr ""
 
-#: ../todo_gui.c:535
+#: ../todo_gui.c:532
 #, fuzzy
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Idosiye Kugaragara Kuri"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, fuzzy, c-format
 msgid "Can't export todo %d\n"
 msgstr "Kohereza"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, c-format
+msgid "Due Date: None\n"
+msgstr ""
+
+#: ../todo_gui.c:769
+#, c-format
+msgid "Due Date: %s\n"
+msgstr ""
+
+# sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.FT_MAILWIN_PRIO.text
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "By'ibanze"
+
+#: ../todo_gui.c:772
+#, c-format
+msgid "Completed: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 #, fuzzy
 msgid "Priority out of range\n"
 msgstr "Inyuma Bya"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, fuzzy, c-format
 msgid "No date"
 msgstr "Itariki"
 
-#. The completed check box
-#: ../todo_gui.c:2206
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr ""
 
 # sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.FT_MAILWIN_PRIO.text
-#: ../todo_gui.c:2214
+#: ../todo_gui.c:2418
 #, fuzzy
-msgid "Priority: "
+msgid "Priority:"
 msgstr "By'ibanze"
 
-#: ../todo_gui.c:2234
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr ""
 
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "Igisobanuro"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Uyu munsi"
 
-#: ../utils.c:72
-#, fuzzy
-msgid " -v displays version and compile options and exits.\n"
-msgstr "-v Verisiyo Na Gukusanya Amahitamo Na"
+#: ../utils.c:575
+#, fuzzy, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Gushaka ubusa IDOSIYE"
 
-#: ../utils.c:74
+#: ../utils.c:578
 #, fuzzy
-msgid " -d displays debug info to stdout.\n"
-msgstr "-D Kosora amakosa Ibisobanuro Kuri"
+msgid " may not be installed.\n"
+msgstr "Gicurasi OYA"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, fuzzy, c-format
+msgid "Can't create directory %s\n"
+msgstr "Kurema bushyinguro"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%sni a bushyinguro"
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "Kwandika Idosiye in bushyinguro"
 
-#: ../utils.c:75
+#: ../utils.c:1328 ../utils.c:1352
 #, fuzzy
-msgid " -p skips loading plugins.\n"
-msgstr "Itangira..."
+msgid "Save Changed Record?"
+msgstr "Kubika"
 
-#: ../utils.c:76
+#: ../utils.c:1329 ../utils.c:1353
 #, fuzzy
-msgid " -a ignores missed alarms since the last time program was run.\n"
-msgstr "-a Kwirengagiza guhera i Iheruka Igihe iyi Porogaramu Gukoresha"
+msgid "Do you want to save the changes to this record?"
+msgstr "Kuri Kubika i Amahinduka Kuri iyi Icyabitswe"
 
-#: ../utils.c:77
+#: ../utils.c:1334 ../utils.c:1358
 #, fuzzy
-msgid " -A ignores all alarms past and future.\n"
-msgstr "-A Kwirengagiza Byose Na"
+msgid "Save New Record?"
+msgstr "Kubika"
 
-#: ../utils.c:78
+#: ../utils.c:1335 ../utils.c:1359
 #, fuzzy
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr "-i"
+msgid "Do you want to save this new record?"
+msgstr "Kuri Kubika iyi Gishya Icyabitswe"
 
-#: ../utils.c:79
+#: ../utils.c:1650
 #, fuzzy
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+msgid "infinite loop, breaking\n"
+msgstr "Bidashira"
+
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
+msgstr "Itangira..."
+
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
+msgstr "-a Kwirengagiza guhera i Iheruka Igihe iyi Porogaramu Gukoresha"
+
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
+msgstr "-A Kwirengagiza Byose Na"
+
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
+
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr "Na Ibihinduka Kuri"
 
-#: ../utils.c:80
-#, fuzzy
+#: ../utils.c:1881
+#, fuzzy, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr "Umuyoboro Kuri ku Na ku Umuvuduko"
 
-#: ../utils.c:81
-#, fuzzy
+#: ../utils.c:1882
+#, fuzzy, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr "ni OYA Gushyiraho Hanyuma Kuri"
 
-#: ../utils.c:107
+# svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
+#: ../utils.c:1921
+#, fuzzy
+msgid "Error reading file"
+msgstr "Ikosa mu gusoma idosiye"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr ""
 
-#: ../utils.c:108
+#: ../utils.c:1974
 #, fuzzy
 msgid "Compiled with these options:"
 msgstr "Na: Amahitamo"
 
-#: ../utils.c:110
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr ""
 
-#: ../utils.c:112
+#: ../utils.c:1978
 #, fuzzy
 msgid "pilot-link version"
 msgstr "Ihuza Verisiyo"
 
-#: ../utils.c:116
+#: ../utils.c:1982
 #, fuzzy
 msgid "USB support"
 msgstr "Gushigikira"
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "Yego"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-#, fuzzy
-msgid "no"
-msgstr "Oya"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 #, fuzzy
 msgid "Private record support"
 msgstr "Icyabitswe Gushigikira"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+#, fuzzy
+msgid "no"
+msgstr "Oya"
+
+#: ../utils.c:1990
 #, fuzzy
 msgid "Datebk support"
 msgstr "Gushigikira"
 
-#: ../utils.c:134
+#: ../utils.c:1996
 #, fuzzy
 msgid "Plugin support"
 msgstr "Gushigikira"
 
-#: ../utils.c:140
+#: ../utils.c:2002
 #, fuzzy
 msgid "Manana support"
 msgstr "Gushigikira"
 
-#: ../utils.c:146
+#: ../utils.c:2008
 #, fuzzy
 msgid "NLS support (foreign languages)"
 msgstr "Gushigikira Mvamahanga Indimi"
 
-#: ../utils.c:152
+#: ../utils.c:2014
 #, fuzzy
 msgid "GTK2 support"
 msgstr "Gushigikira"
 
-#: ../utils.c:207
+#. No HOME var
+#: ../utils.c:2057
 #, fuzzy, c-format
-msgid "Today is %A, %x %X"
-msgstr "ni"
-
-#: ../utils.c:209
-#, fuzzy, c-format
-msgid "Today is %%A, %s %s"
-msgstr "ni"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "Uyu munsi"
-
-#: ../utils.c:1330
-#, fuzzy
-msgid "Save Changed Record?"
-msgstr "Kubika"
-
-#: ../utils.c:1331
-#, fuzzy
-msgid "Do you want to save the changes to this record?"
-msgstr "Kuri Kubika i Amahinduka Kuri iyi Icyabitswe"
-
-#: ../utils.c:1336
-#, fuzzy
-msgid "Save New Record?"
-msgstr "Kubika"
-
-#: ../utils.c:1337
-#, fuzzy
-msgid "Do you want to save this new record?"
-msgstr "Kuri Kubika iyi Gishya Icyabitswe"
-
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
-#, fuzzy
 msgid "Can't get HOME environment variable\n"
 msgstr "Kubona"
 
-#: ../utils.c:1364
-#, fuzzy
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "IMPINDURAGACIRO ni kugirango"
-
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
-#, fuzzy, c-format
-msgid "Can't create directory %s\n"
-msgstr "Kurema bushyinguro"
-
-#: ../utils.c:1399
-#, fuzzy, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr "%sKugaragara Kuri a bushyinguro Kuri"
-
-#: ../utils.c:1405
-#, fuzzy, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "Kwandika Idosiye in bushyinguro"
-
-#: ../utils.c:1461 ../utils.c:1470
-#, fuzzy
-msgid "Error writing PC header to file: next_id\n"
-msgstr "Umutwempangano Kuri IDOSIYE"
-
-#: ../utils.c:1466
-#, fuzzy
-msgid "Error writing next id to file: next_id\n"
-msgstr "Komeza>> ID Kuri IDOSIYE"
-
-#: ../utils.c:1483
-#, fuzzy
-msgid "Error opening file: next_id\n"
-msgstr "Gufungura%S IDOSIYE"
-
-#: ../utils.c:1657
+#: ../utils.c:2064
 #, fuzzy, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Gushaka ubusa IDOSIYE"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-#, fuzzy
-msgid " may not be installed.\n"
-msgstr "Gicurasi OYA"
+msgid "HOME environment variable is too long to process\n"
+msgstr "IMPINDURAGACIRO ni kugirango"
 
-# svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: ../utils.c:1839
+#: ../utils.c:2567
 #, fuzzy
-msgid "Error reading file"
-msgstr "Ikosa mu gusoma idosiye"
+msgid "Edit Categories..."
+msgstr "Kwandika ibyiciro"
 
-#: ../utils.c:2516
+#: ../utils.c:3233
 #, fuzzy
 msgid "PC ID is 0.\n"
 msgstr "ni 0"
 
-#: ../utils.c:2517
+#: ../utils.c:3234
 #, fuzzy, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
+msgid "Generated a new PC ID.  It is %lu\n"
 msgstr "a Gishya ni"
 
-#: ../weekview_gui.c:326
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
+
+#: ../utils.c:3537
+#, fuzzy, c-format
+msgid "Today is %A, %x %X"
+msgstr "ni"
+
+#: ../utils.c:3539
+#, fuzzy, c-format
+msgid "Today is %%A, %s %s"
+msgstr "ni"
+
+#: ../utils.c:3768
+#, c-format
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
+msgstr ""
+
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
+msgstr "Umutwempangano Kuri IDOSIYE"
+
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
+msgstr "Komeza>> ID Kuri IDOSIYE"
+
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr ""
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Ositaraliya"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Ositiriya"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Ububiligi"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Burezile"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Danimarike"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr ""
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finilande"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Ubufaransa"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Ubudage"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hongo Kongo"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Isilande"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Ubuhinde"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Indonesiya"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Irilande"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Ubutariyani"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Ubuyapani"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr ""
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Lugizamburu"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Malesiya"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Megizike"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Nederilande"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Nuveli Zelande"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Noruveje"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 #, fuzzy
 msgid "P.R.C."
 msgstr "C."
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Filipine"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Esipanye"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Suwede"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Ubusuwisi"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Tayiwani"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Tayilande"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Ubwongereza (UK)"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "Leta Zunze Ubumwe"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr ""
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr ""
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr ""
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr ""
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr ""
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr ""
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr ""
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr ""
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fagisi"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr ""
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr ""
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr ""
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr ""
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr ""
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr ""
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr ""
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr ""
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr ""
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr ""
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr ""
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr ""
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr ""
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr ""
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr ""
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "terefoni"
 
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Help.Tip.text
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Inyobora"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr ""
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr ""
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
 msgstr ""
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr ""
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Kugenzura"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
-msgstr ""
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
+msgstr "ikarita y'inguzanyo"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
 msgstr ""
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr ""
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr ""
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr ""
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr ""
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "ikarita y'inguzanyo"
+# sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_TYP.text
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Ubwoko"
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr ""
+# sw/source\ui\table\insrc.src:DLG_INS_ROW_COL.FT_COUNT.text
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Igiteranyo"
 
 # so3/src\svuidlg.src:MD_DDE_LINKEDIT.FT_DDE_ITEM.text
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 #, fuzzy
 msgid "Category:"
 msgstr "Icyiciro"
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_TYP.text
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 #, fuzzy
 msgid "Type:"
 msgstr "Ubwoko"
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr ""
 
@@ -3146,47 +3734,41 @@ msgstr ""
 # #-#-#-#-#  svx.pot (PACKAGE VERSION)  #-#-#-#-#
 # svx/source\dialog\sdstring.src:RID_SVXSTR_TBLAFMT_CURRENCY.text
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 #, fuzzy
 msgid "Currency:"
 msgstr "Ifaranga"
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-#, fuzzy
-msgid "Date:"
-msgstr "Itariki"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 #, fuzzy
 msgid "Month:"
 msgstr "ukwezi:"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 #, fuzzy
 msgid "Day:"
 msgstr "Umunsi:"
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 #, fuzzy
 msgid "Year:"
 msgstr "umwaka:"
 
 # sw/source\ui\table\insrc.src:DLG_INS_ROW_COL.FT_COUNT.text
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 #, fuzzy
 msgid "Amount:"
 msgstr "Igiteranyo"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 #, fuzzy
 msgid "Vendor:"
 msgstr "Umucuruzi"
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 #, fuzzy
 msgid "City:"
 msgstr "Umujyi:"
@@ -3196,115 +3778,339 @@ msgstr "Umujyi:"
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Draw.xcs:....Snap.Position.ExtendEdges.text
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Abitabiriye"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 #, fuzzy
 msgid "Enter a NEW KeyRing Password"
 msgstr "a"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1636
-#, fuzzy
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "IMPINDURAGACIRO ni kugirango"
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, fuzzy, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "IDOSIYE OYA Byabonetse"
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "Kureka"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "konti"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Kohereza Umwandikorusobe..."
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
 "Password"
 msgstr ""
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "Kureka"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "konti"
+
 # basctl/source\basicide\moduldlg.src:RID_DLG_NEWLIB.RID_FT_NEWLIB.text
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 #, fuzzy
 msgid "name: "
 msgstr "Izina:"
 
 # svtools/source\dialogs\logindlg.src:DLG_LOGIN.FT_LOGIN_ACCOUNT.text
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 #, fuzzy
 msgid "account: "
 msgstr "Konti:"
 
 # basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_PASSWORD.text
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 #, fuzzy
 msgid "password: "
 msgstr "Ijambobanga..."
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr ""
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "Umwandikorusobe..."
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "Byakozwe"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Gusimbuza Idosiye"
+
+#~ msgid "Field"
+#~ msgstr "Umwanya"
+
+#, fuzzy
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Kuri Gufungura"
+
+#, fuzzy
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Kuri Gufungura"
+
+#, fuzzy
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "Guhindura Icyiciro"
+
+#, fuzzy
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "Gusiba Icyiciro"
+
+#, fuzzy
+#~ msgid "category name"
+#~ msgstr "Icyiciro Izina:"
+
+# Debug menu items
+#, fuzzy
+#~ msgid "debug"
+#~ msgstr "Kosora amakosa"
+
+#~ msgid "Close"
+#~ msgstr "Gufunga"
+
+#~ msgid "none"
+#~ msgstr "ntacyo"
+
+#, fuzzy
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "Byabonetse in"
+
+#~ msgid "W"
+#~ msgstr "W"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#, fuzzy
+#~ msgid "This Event has no particular time"
+#~ msgstr "Oya Igihe"
+
+#, fuzzy
+#~ msgid "Start Time"
+#~ msgstr "Gutangira"
+
+#, fuzzy
+#~ msgid "End Time"
+#~ msgstr "Impera"
+
+#~ msgid "Done"
+#~ msgstr "Byakozwe"
+
+#~ msgid "Add"
+#~ msgstr "Kongera"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Izinakoresha"
+
+#, fuzzy
+#~ msgid " -v = version\n"
+#~ msgstr "-v"
+
+#, fuzzy
+#~ msgid " -h = help\n"
+#~ msgstr "-h"
+
+#, fuzzy
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr "-D Gukoresha in Kosora amakosa"
+
+#, fuzzy
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr "-OYA Ibirimo"
+
+#, fuzzy
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr "-B a Na Hanyuma a Inyibutsa a"
+
+#, fuzzy
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Iyigamashusho"
+
+#, fuzzy
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Porogaramu"
+
+#~ msgid "Clear"
+#~ msgstr "bigaragara,kigaragara"
+
+#, fuzzy
+#~ msgid "Show private records"
+#~ msgstr "By'umwihariko Ibyabitswe"
+
+#, fuzzy
+#~ msgid "Hide private records"
+#~ msgstr "By'umwihariko Ibyabitswe"
+
+#, fuzzy
+#~ msgid "Mask private records"
+#~ msgstr "By'umwihariko Ibyabitswe"
+
+#~ msgid "Font"
+#~ msgstr "Umukono"
+
+#, fuzzy
+#~ msgid "Go to the menu \""
+#~ msgstr "Kuri i Ibikubiyemo"
+
+#, fuzzy
+#~ msgid "\" and change the \""
+#~ msgstr "\"Na Guhindura>> i"
+
+# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
+#, fuzzy
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#, fuzzy
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Gufungura Ibyabitswe"
+
+#, fuzzy
+#~ msgid "The first day of the week is "
+#~ msgstr "Itangira UMUNSI Bya i Icyumweru ni"
+
+#, fuzzy
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "OYA"
+
+#, fuzzy
+#~ msgid "One record"
+#~ msgstr "Icyabitswe"
+
+#, fuzzy
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s:Kanda i Akabuto ku i Cyangwa"
+
+#, fuzzy
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Izina ry'ukoresha"
+
+#, fuzzy
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "Palm Umubare Bya Ibyabitswe"
+
+#, fuzzy
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "Umubare Bya Ibyabitswe"
+
+#, fuzzy
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr "-i"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr "%sKugaragara Kuri a bushyinguro Kuri"
+
+#, fuzzy
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "IMPINDURAGACIRO ni kugirango"
+
 #~ msgid "Quit"
 #~ msgstr "Kuvamo"
 
@@ -3314,10 +4120,6 @@ msgstr "Byakozwe"
 #~ msgid "Directory"
 #~ msgstr "Ububiko"
 
-#, fuzzy
-#~ msgid "Overwrite File"
-#~ msgstr "Gusimbuza Idosiye"
-
 #~ msgid "Filename"
 #~ msgstr "Izina ry'idosiye"
 
diff --git a/po/sv.po b/po/sv.po
index 66fd9bc1..fb9b3d2c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,666 +8,959 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.2\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2002-10-04 17:01+0100\n"
 "Last-Translator: Johan Hilding <cooljon@telia.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Slut p� minne"
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "fel"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "Fel vid l�sning av %s\n"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, fuzzy, c-format
 msgid "Error reading file: %s\n"
 msgstr "Fel vid l�sning av %s\n"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "fel"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
 msgstr ""
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, fuzzy, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Kunde inte �ppna %s\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Kunde inte �ppna %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Filen verkar inte vara i address.dat-format\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Oarkiverad"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "OK"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Nej"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Ja"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s �r en katalog"
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Fel vid fil�ppning"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Vill du skriva �ver filen %s?"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Vill du skriva �ver filen?"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, fuzzy, c-format
 msgid "Error opening file: %s"
 msgstr "Fel vid fil�ppning"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr ""
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-#, fuzzy
-msgid "Field"
-msgstr "Misslyckades.\n"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Kategori: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Privat"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr ""
+
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr ""
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "F�retag/Namn"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Namn/F�retag"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Namn/F�retag"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "F�retag/Namn"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr ""
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr ""
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, fuzzy, c-format
 msgid "executing command = [%s]\n"
 msgstr "K�r det h�r kommandot"
 
-#. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
-msgid "Category: "
-msgstr "Kategori: "
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
+#: ../address_gui.c:2479
+msgid "Birthday"
 msgstr ""
 
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
 msgstr ""
 
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "Misslyckades.\n"
+
+#: ../address_gui.c:2660
+#, fuzzy
+msgid "Add Photo"
+msgstr "L�gg till"
+
+#. Category menu
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
+msgid "Category: "
+msgstr "Kategori: "
+
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr ""
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr ""
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr ""
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 poster"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d av %d poster"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Namn"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Adress"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Annat"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Anteckning"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
 msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 #, fuzzy
 msgid "Quick Find: "
 msgstr "Snabbs�k"
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr ""
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 #, fuzzy
 msgid "Delete the selected record"
 msgstr "Tog bort en %s-post."
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete"
 msgstr "Ta bort"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete the selected record"
 msgstr "Tog bort en %s-post."
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Kopiera"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 #, fuzzy
 msgid "Copy the selected record"
 msgstr "L�gg till post"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Ny post"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 #, fuzzy
 msgid "Add a new record"
 msgstr "L�gg till post"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "L�gg till post"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 #, fuzzy
 msgid "Add the new record"
 msgstr "L�gg till post"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Verkst�ll �ndringar"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr ""
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Privat"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "Namn"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "Adress"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "Annat"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "Avbryt"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "Alla"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Ta bort"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "Visa\n"
 "i lista"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "Snabbvisning"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "P�minn mig"
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "Dagar"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Alla"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Minuter"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Timmar"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "P�minn mig"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, fuzzy, c-format
-msgid "Unable to open %s%s file\n"
+msgid "Unable to open file: %s%s\n"
 msgstr "Kunde inte �ppna %s\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "M�tesp�minnare"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "F�rflutet m�te"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Senarelagt m�te"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "M�te"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr ""
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr ""
-
-#: ../alarms.c:1531
-#, fuzzy, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Kunde inte �ppna %s\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-#, fuzzy
-msgid "rename failed"
-msgstr "Installering av %s misslyckades"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "PC-fil korrupt?\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek misslyckades - �destigert fel\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+#, fuzzy
+msgid "rename failed"
+msgstr "Installering av %s misslyckades"
+
+#: ../category.c:407
 #, fuzzy
 msgid "Move"
 msgstr "M�"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr ""
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr ""
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr ""
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr ""
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr ""
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr ""
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr ""
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr ""
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr ""
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
 msgstr ""
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr ""
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr ""
 
-#. correctly translate title
-#: ../category.c:813
+#. Category names in host character set
+#: ../category.c:733
 #, fuzzy
-msgid "category name"
+msgid "Category"
 msgstr "Kategori: "
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "Ny"
 
-#: ../category.c:845
+#: ../category.c:841
 #, fuzzy
 msgid "Rename"
 msgstr "namn: "
 
-#: ../category.c:960
-msgid "debug"
-msgstr ""
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr ""
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr ""
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr ""
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr ""
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+msgid "It should be:"
 msgstr ""
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr ""
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr ""
 
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Upprepa p�:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "�terkommer f�ljande dagar:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Upprepa p�:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "�terkommer f�ljande dagar:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "�terkommer f�ljande dagar:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "�terkommer f�ljande dagar:"
+
 # These days of the week are put in the buttons above the calendar and
 # the little buttons in the repeat weekly window.
 # They should be one letter if possible.  The English ones get truncated to
 # one letter.
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "S�"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "M�"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Ti"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "On"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "To"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Fr"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "L�"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Slutdatum"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "�terkommer f�ljande dagar:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "antal poster = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Anteckning"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Alarm"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Upprepa p�:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Veckodag"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 #, fuzzy
 msgid "Error"
 msgstr "fel"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Filen verkar inte vara i datebook.dat-format\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr ""
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Exportera"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Exportera alla kalenderposter"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Spara som"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Bl�ddra"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr ""
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "St�ng"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Ingen"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Startdatum"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Slutdatum"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "M�ndag"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "L�rdag"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4:e"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Sista"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -677,185 +970,169 @@ msgid ""
 "Which do you want?"
 msgstr ""
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr ""
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Detta �r en �terkommande h�ndelse.\n"
 "Vill du att �ndringarna ska g�lla alla\n"
 "h�ndelser, eller bara den h�r h�ndelsen?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Aktuell"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "ingen"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "dag"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "vecka"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "m�nad"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "�r"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Du kan inte ha ett m�te som repeteras var %d %s\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
 #, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr ""
 "Du kan inte ha ett m�te med veckovis upprepning som inte upprepas p� n�gon "
 "veckodag.\n"
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Ingen tid"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 #, fuzzy
 msgid "Invalid Appointment"
 msgstr "F�rflutet m�te"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
 msgstr ""
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Inget datum"
 
-#: ../datebook_gui.c:3021
+#: ../datebook_gui.c:3491
 #, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr ""
 
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr ""
-
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr ""
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Vecka"
 
-#: ../datebook_gui.c:4206
-#, fuzzy
-msgid "W"
-msgstr "On"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+msgid "View appointments by week   Ctrl+W"
 msgstr ""
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "M�nad"
 
-#: ../datebook_gui.c:4218
-#, fuzzy
-msgid "M"
-msgstr "M�"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+msgid "View appointments by month   Ctrl+M"
 msgstr ""
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Kategorier"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Tid"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr ""
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Uppgift"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "F�rfallen"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarm"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "Dagar"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "Denna h�ndelse har ingen speciell tid"
-
-#: ../datebook_gui.c:4493
-msgid "Starts on"
-msgstr "B�rjar p�"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+#, fuzzy
+msgid "Date:"
+msgstr "Datum"
 
-#: ../datebook_gui.c:4507
+#. Start date and time
+#: ../datebook_gui.c:5280
 #, fuzzy
-msgid "Start Time"
+msgid "Start"
 msgstr "B�rjar p�"
 
-#: ../datebook_gui.c:4525
+#. End date and time
+#: ../datebook_gui.c:5297
 #, fuzzy
-msgid "End Time"
-msgstr "Tid"
+msgid "End"
+msgstr "Sluta p�"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr ""
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Dag"
 
@@ -863,75 +1140,70 @@ msgstr "Dag"
 # msgstr "Veckovy"
 # msgid "MonthView"
 # msgstr "M�nadsvy"
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "�r"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Denna h�ndelse �terkommer inte"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "�terkommer var"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "Dag(ar)"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Sluta p�"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "Vecka(or)"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "�terkommer f�ljande dagar:"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "M�nad(er)"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Upprepa p�:"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Veckodag"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Datum"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "�r"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr ""
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr ""
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr ""
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr ""
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr ""
 
@@ -940,504 +1212,386 @@ msgstr ""
 msgid "Extension"
 msgstr "Expense"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 #, fuzzy
 msgid "Dial Command"
 msgstr "Alarmkommando"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr ""
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Filbl�ddrare"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "V�lj poster som ska exporteras"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Anv�nd Ctrl- och Skift-knapparna"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Importera"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "F�r att flytta till en dold katalog, skriv in det nedan och tryck TAB"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "Klar"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "Importera filtyp"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "Posten var markerad som privat"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "Posten var inte markerad som privat"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr ""
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, fuzzy, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Alla poster i den h�r kategorin"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Importera alla"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Hoppa �ver"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Installera"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "F�r att flytta till en dold katalog, skriv in det nedan och tryck TAB"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Filer att installera"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Importera filtyp"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "L�gg till"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Filer att installera"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Ta bort"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Installera"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/Arkiv/_Installera"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "Anv�ndarnamn"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "Anv�ndar-ID"
 
-#: ../jpilot-dump.c:95
-msgid " +D +A +T +M format like date +format.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:98
-msgid " -f displays help for format codes.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:99
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr "Adressbok"
-
-#: ../jpilot-dump.c:100
-msgid " -N dump appts for today in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:101
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:102
-#, fuzzy
-msgid " -A dump Address book.\n"
-msgstr "Adressbok"
-
-#: ../jpilot-dump.c:103
-msgid " -T dump ToDo list as CSV.\n"
-msgstr ""
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr ""
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr ""
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr ""
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr ""
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr ""
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr ""
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Det finns inget utskriftsst�d f�r detta till�gg."
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Det finns inget importst�d f�r detta till�gg."
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Det finns inget exportst�d f�r detta till�gg."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Avbryt"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 #, fuzzy
 msgid "Cancel Sync"
 msgstr "Avbryt"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Synka �nd�"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 #, fuzzy
 msgid "Sync Problem"
 msgstr "Synka minnesanteckningar"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+#, fuzzy
+msgid " User: "
+msgstr "Anv�ndar-ID"
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr ""
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 #, fuzzy
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Arkiv/Riv av"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Arkiv/_S�k"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Arkiv/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Arkiv/_Installera"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Arkiv/Importera"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Arkiv/Exportera"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Arkiv/Inst�llningar"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Arkiv/Skriv ut"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 #, fuzzy
 msgid "/File/Install User"
 msgstr "/Arkiv/_Installera"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Arkiv/�terst�ll handdatorn"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Arkiv/Avsluta"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Visa"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 #, fuzzy
 msgid "/View/Hide Private Records"
 msgstr "/Visa/D�lj-Visa privata poster"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 #, fuzzy
 msgid "/View/Show Private Records"
 msgstr "/Visa/D�lj-Visa privata poster"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 #, fuzzy
 msgid "/View/Mask Private Records"
 msgstr "/Visa/D�lj-Visa privata poster"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 #, fuzzy
 msgid "/View/sep1"
 msgstr "/Arkiv/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Visa/Kalender"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Visa/Adresser"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Visa/Att g�ra-lista"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Visa/Minnesanteckningar"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 #, fuzzy
 msgid "/_Plugins"
 msgstr "/Insticksmoduler"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 #, fuzzy
 msgid "/_Web"
 msgstr "On"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr ""
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr ""
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr ""
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr ""
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr ""
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr ""
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr ""
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr ""
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr ""
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Hj�lp"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/Hj�lp/PayBack program"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 #, fuzzy
 msgid "/Help/About J-Pilot"
 msgstr "/Hj�lp/J-Pilot"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, fuzzy, c-format
 msgid "/_Plugins/%s"
 msgstr "/Insticksmoduler/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Hj�lp/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr ""
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr ""
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr ""
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr ""
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 #, fuzzy
 msgid "Unable to open pipe\n"
 msgstr "Kunde inte �ppna %s\n"
 
-#: ../jpilot.c:2422
-#, fuzzy
-msgid " User: "
-msgstr "Anv�ndar-ID"
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "T�m"
-
-#: ../jpilot.c:2649
-#, fuzzy
-msgid "Show private records   Ctrl-Z"
-msgstr "/Visa/D�lj-Visa privata poster"
-
-#: ../jpilot.c:2654
+#: ../jpilot.c:1949
 #, fuzzy
-msgid "Show private records"
+msgid "Show private records   Ctrl+Z"
 msgstr "/Visa/D�lj-Visa privata poster"
 
-#: ../jpilot.c:2659
+#: ../jpilot.c:1954
 #, fuzzy
-msgid "Hide private records   Ctrl-Z"
+msgid "Hide private records   Ctrl+Z"
 msgstr "/Visa/D�lj-Visa privata poster"
 
-#: ../jpilot.c:2664
+#: ../jpilot.c:1959
 #, fuzzy
-msgid "Hide private records"
-msgstr "/Visa/D�lj-Visa privata poster"
-
-#: ../jpilot.c:2669
-#, fuzzy
-msgid "Mask private records   Ctrl-Z"
-msgstr "Skriv ut alla poster"
-
-#: ../jpilot.c:2674
-#, fuzzy
-msgid "Mask private records"
+msgid "Mask private records   Ctrl+Z"
 msgstr "Skriv ut alla poster"
 
-#: ../jpilot.c:2684
+#: ../jpilot.c:1971
 #, fuzzy
-msgid "Sync your palm to the desktop   Ctrl-Y"
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Synkronisera din palm med datorn"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
+#: ../jpilot.c:1983
 #, fuzzy
-msgid "Font"
-msgstr "M�nad"
+msgid "Stop Sync process"
+msgstr "Synka adress"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1445,804 +1599,1257 @@ msgstr ""
 "Synkronisera din palm med datorn\n"
 "och g�r sedan en s�kerhetskopia"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Kalender/G� till idag"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Att g�ra-lista"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Anteckningsblock"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr ""
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 #, fuzzy
 msgid "Remind me later"
 msgstr "P�minn mig"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr ""
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
-msgstr ""
-
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr ""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 
 #  Lite sv�rt att �vers�tta, hj�lp kan beh�vas.
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Teckenupps�ttning"
 
-#: ../jpilot.c:2898
-msgid "\"."
+#: ../jpilot.c:2194
+msgid "Select a UTF-8 encoding"
 msgstr ""
 
-#: ../jpilot.c:2900
-msgid "Select a UTF-8 encoding"
+#: ../jpilot-dump.c:92
+#, c-format
+msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:93
 #, c-format
-msgid "Unknown PC header version = %d\n"
+msgid " -v display version and exit\n"
 msgstr ""
 
-#: ../libplugin.c:416
-#, fuzzy, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "Fel vid l�sning av %s\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, c-format
+msgid " -h display help text\n"
+msgstr ""
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
+#: ../jpilot-dump.c:95
+#, c-format
+msgid " -f display help for format codes\n"
+msgstr ""
+
+#: ../jpilot-dump.c:96
 #, fuzzy, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "Fel vid l�sning av %s\n"
+msgid " -D dump DateBook\n"
+msgstr "Adressbok"
 
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+#: ../jpilot-dump.c:97
+#, c-format
+msgid " -i dump DateBook in iCalendar format\n"
 msgstr ""
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-#, fuzzy
-msgid "Unable to open PC records file\n"
-msgstr "Kunde inte �ppna %s\n"
-
-#: ../libplugin.c:493 ../utils.c:1959
-#, fuzzy
-msgid "Couldn't find record to delete\n"
-msgstr "Kunde inte hitta en tom databas-fil.\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr "Adressbok"
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:99
 #, c-format
-msgid "Unknown header version %d\n"
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
 msgstr ""
 
-#: ../libplugin.c:524
-#, fuzzy
-msgid "Couldn't open PC records file\n"
-msgstr "Kunde inte �ppna filen %s\n"
-
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
+#: ../jpilot-dump.c:100
 #, fuzzy, c-format
-msgid "Error opening file: %s\n"
-msgstr "Fel vid fil�ppning"
-
-#: ../libplugin.c:714
-#, fuzzy
-msgid "Error reading PC file 1\n"
-msgstr "Fel vid l�sning av %s\n"
+msgid " -A dump Address book\n"
+msgstr "Adressbok"
 
-#: ../libplugin.c:730
-#, fuzzy
-msgid "Error reading PC file 2\n"
-msgstr "Fel vid l�sning av %s\n"
+#: ../jpilot-dump.c:101
+#, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr ""
 
-#: ../libplugin.c:903
+#: ../jpilot-dump.c:102
 #, fuzzy, c-format
-msgid "Error reading %s 5\n"
-msgstr "Fel vid l�sning av %s\n"
+msgid " -M dump Memos\n"
+msgstr "Adressbok"
 
-#: ../log.c:95
-#, fuzzy, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Kan inte �ppna loggfil, ger upp.\n"
+#: ../jpilot-dump.c:163
+#, c-format
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../log.c:102
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
 #, fuzzy, c-format
-msgid "Unable to open log file\n"
+msgid "%s: Unable to open file:%s\n"
 msgstr "Kunde inte �ppna %s\n"
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
+#: ../jpilot-merge.c:269
+#, c-format
+msgid "Records read from pdb = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Imported Memo %s\n"
+msgid "Records added         = %d\n"
 msgstr ""
 
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Filen verkar inte vara i memopad.dat format\n"
-
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:271
 #, c-format
-msgid "Can't export memo %d\n"
+msgid "Records deleted       = %d\n"
 msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "M�nadsvy"
-
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Palml�senord"
-
-#: ../password.c:333
-#, fuzzy
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Skriv PalmOSl�senord"
-
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "Skriv PalmOSl�senord"
-
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
 msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:273
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
+msgid "Records written       = %d\n"
 msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
 msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
 msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:293
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
 msgstr ""
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:294
 #, c-format
-msgid " plugin is invalid: [%s]\n"
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
 msgstr ""
 
-#: ../plugins.c:296
-#, fuzzy, c-format
-msgid "Plugin:[%s]\n"
-msgstr "/Insticksmoduler/%s"
-
-#: ../plugins.c:297
+#: ../jpilot-merge.c:295
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
+msgid "  The merge will leave your databases in an unsync-able state.\n"
 msgstr ""
 
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
+#: ../jpilot-merge.c:296
+#, c-format
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
 msgstr ""
 
-#: ../prefs.c:394
-msgid "%d %B %Y"
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
 msgstr ""
 
-#: ../prefs.c:395
-msgid "%d. %B %Y"
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
 msgstr ""
 
-#: ../prefs.c:396
-msgid "%d %B, %Y"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
 msgstr ""
 
-#: ../prefs.c:397
+#: ../jpilot-sync.c:64
+#, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, c-format
+msgid " -v display version and compile options\n"
+msgstr ""
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, c-format
+msgid " -d display debug info to stdout\n"
+msgstr ""
+
+#: ../jpilot-sync.c:68
+#, c-format
+msgid " -P skip loading plugins\n"
+msgstr ""
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr ""
+
+#: ../jpilot-sync.c:71
+#, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Fel vid l�sning av %s\n"
+
+#: ../jpilot-sync.c:223
+#, fuzzy, c-format
+msgid "Error: pi_listen\n"
+msgstr "Fel i %s\n"
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Fel vid fil�ppning"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "fel"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr ""
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+#, fuzzy
+msgid "Unable to open PC records file\n"
+msgstr "Kunde inte �ppna %s\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+#, fuzzy
+msgid "Couldn't find record to delete\n"
+msgstr "Kunde inte hitta en tom databas-fil.\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr ""
+
+#: ../libplugin.c:180
+#, fuzzy, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "Fel vid l�sning av %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, fuzzy, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "Fel vid l�sning av %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, fuzzy, c-format
+msgid "Error opening file: %s\n"
+msgstr "Fel vid fil�ppning"
+
+#: ../libplugin.c:524
+#, fuzzy, c-format
+msgid "Error reading %s 5\n"
+msgstr "Fel vid l�sning av %s\n"
+
+#: ../libplugin.c:799
+#, fuzzy
+msgid "Error reading PC file 1\n"
+msgstr "Fel vid l�sning av %s\n"
+
+#: ../libplugin.c:815
+#, fuzzy
+msgid "Error reading PC file 2\n"
+msgstr "Fel vid l�sning av %s\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr ""
+
+#: ../log.c:98
+#, fuzzy, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Kan inte �ppna loggfil, ger upp.\n"
+
+#: ../log.c:108
+#, fuzzy, c-format
+msgid "Unable to open log file\n"
+msgstr "Kunde inte �ppna %s\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr ""
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr ""
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Filen verkar inte vara i memopad.dat format\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr ""
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Anteckningsblock"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "M�nadsvy"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Palml�senord"
+
+#: ../password.c:306
+#, fuzzy
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Skriv PalmOSl�senord"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Skriv PalmOSl�senord"
+
+#: ../pidfile.c:69
+#, fuzzy
+msgid "removing stale pidfile\n"
+msgstr "Kan inte �ppna jpilot_to_install-filen\n"
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Fel vid l�sning av %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr ""
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr ""
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr ""
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr ""
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr ""
+
+#: ../plugins.c:297
+#, fuzzy, c-format
+msgid "Plugin:[%s]\n"
+msgstr "/Insticksmoduler/%s"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr ""
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr ""
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr ""
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr ""
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr ""
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr ""
+
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr ""
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr ""
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Inst�llningar"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Lokal"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Inst�llningar"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 #, fuzzy
 msgid "Datebook"
 msgstr "Synka kalender"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 #, fuzzy
 msgid "ToDo"
 msgstr "Att g�ra-lista"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 #, fuzzy
 msgid "Memo"
 msgstr "Synka minnesanteckningar"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Alarm"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Till�gg"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "Kort datumformat "
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "L�ngt datumformat "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "Tidsformat "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "F�rsta dagen i veckan �r "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "Min GTK-f�rgfil �r "
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Seriell port (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Synka minnesanteckningar"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr ""
+#. Serial Rate
+#: ../prefs_gui.c:605
+#, fuzzy
+msgid "Serial Rate"
+msgstr "Seriell �verf�ringshastighet "
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Antal s�kerhetskopior som skall arkiveras?"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Visa borttagna poster (standard: Nej)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Visa modifierade borttagna poster (standard: Nej)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr ""
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+msgid "Show popup tooltips (default YES) (requires restart)"
+msgstr ""
+
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr ""
 
-#. ********************************************************************
-#. Datebook preference tab
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Markera kalenderdagar med m�ten"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr ""
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr ""
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 #, fuzzy
 msgid "Use DateBk note tags"
 msgstr "Anv�nd DateBk-anteckningstaggar"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr ""
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 #, fuzzy
 msgid "Mail Command"
 msgstr "Alarmkommando"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, fuzzy, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%t ers�tts med alarmtiden"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "D�lj avklarade att g�ra-poster?"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr ""
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr ""
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr ""
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr ""
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Anv�nd Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "�ppna alarmf�nster f�r m�tesp�minnelser"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "K�r det h�r kommandot"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "VARNING: att k�ra godtyckliga skalkommandon kan vara farligt!!!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Alarmkommando"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t ers�tts med alarmtiden"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d ers�tts med alarmdatumet"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D er�tts alarmbeskrivningen"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N ers�tts med alarmanteckningen"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr ""
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr ""
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Synka kalender"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Synka adress"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Synka att g�ra-lista"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Synka minnesanteckningar"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "Synka memo32 (pedit32)"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 #, fuzzy
 msgid "Sync Manana"
 msgstr "Synka �nd�"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr ""
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, fuzzy, c-format
 msgid "Sync %s (%s)"
 msgstr "Synkroniserar %s\n"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Utskriftsinst�llningar"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Papperstorlek"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Dagsutskrift"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Veckoutskrift"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "M�nadsutskrift"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "En post"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Tog bort en %s-post."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Alla poster i den h�r kategorin"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Skriv ut alla poster"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "En post per sida"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " Blanka rader mellan varje post"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Utskriftskommando (tex. lpr, eller cat > fil.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "�terst�ll handdator"
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Filer att installera"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "F�r att �terst�lla din handdator:"
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr ""
 "1. V�lj alla program du vill �terst�lla. Standard �r att �terst�lla alla."
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Skriv in anv�ndarnamnet och anv�ndar-ID."
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Tryck p� OK-knappen nu"
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Det h�r kommer att skriva �ver data som just nu finns p� handdatorn."
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "Anv�ndarnamn"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 #, fuzzy
 msgid "datebook"
 msgstr "Synka kalender"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 #, fuzzy
 msgid "address"
 msgstr "Adress"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 #, fuzzy
 msgid "todo"
 msgstr "Synka att g�ra-lista"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 #, fuzzy
 msgid "memo"
 msgstr "Synka minnesanteckningar"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "Synka minnesanteckningar"
+
+#: ../search_gui.c:419
 #, fuzzy
 msgid "plugin ?"
 msgstr "/Insticksmoduler"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Inga poster funna"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "S�k"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "S�k efter: "
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Skilj p� gemener/versaler"
 
-#: ../sync.c:139
+#: ../sync.c:118
 #, fuzzy
 msgid "open lock file failed\n"
 msgstr "Kan inte �ppna loggfil\n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 #, fuzzy
 msgid "lock failed\n"
 msgstr "Misslyckades.\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr ""
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr ""
 
-#: ../sync.c:244
-#, fuzzy, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr " Tryck p� HotSync-knappen nu\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "Kontrollera din serieport och inst�llningar\n"
 
-#: ../sync.c:297
+#: ../sync.c:677
+#, fuzzy
+msgid "Unable to read home dir\n"
+msgstr "Kunde inte �ppna %s\n"
+
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
-msgid "Exiting with status %s\n"
-msgstr ""
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (Skapar-ID \"%s\") �r redan uppdaterad, hoppar �ver nerladdning\n"
 
-#: ../sync.c:298
-#, fuzzy
-msgid "Finished\n"
-msgstr "F�rdig.\n"
+#: ../sync.c:1089 ../sync.c:1427
+#, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "H�mtar \"%s\" (Skapar-ID \"%s\")... "
 
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
 msgstr ""
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "Kontrollera din serieport och inst�llningar\n"
+#: ../sync.c:1100 ../sync.c:1438
+#, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr ""
+
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "OK\n"
 
-#: ../sync.c:674
+#: ../sync.c:1304
 #, c-format
-msgid " Syncing on device %s\n"
-msgstr " Synkroniserar enhet %s\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "Hoppar �ver %s (Skapar-ID \"%s\")\n"
 
-#: ../sync.c:675
-msgid " Press the HotSync button now\n"
-msgstr " Tryck p� HotSync-knappen nu\n"
+#: ../sync.c:1498
+#, c-format
+msgid "Installing %s "
+msgstr "Installerar %s "
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:1504 ../sync.c:1540
 #, fuzzy, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "Senaste anv�ndarnamn-->\"%s\"\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Kan inte �ppna \"%s\"!\n"
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:1508
 #, fuzzy, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "Senaste anv�ndar-ID-->\"%d\"\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Kan inte �ppna \"%s\"!\n"
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:1524
 #, fuzzy, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr "Anv�ndarnamn-->\"%s\"\n"
+msgid "(Creator ID '%s')... "
+msgstr "(Skapar ID �r \"%s\")..."
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:1528
 #, fuzzy, c-format
-msgid " This User ID-->%d\n"
-msgstr "Anv�ndar-ID-->%d\n"
+msgid "(Creator ID '%s') "
+msgstr "(Skapar ID �r \"%s\")..."
 
-#: ../sync.c:795
-#, fuzzy, c-format
-msgid "Username is \"%s\"\n"
-msgstr "Anv�ndarnamn-->\"%s\"\n"
+#: ../sync.c:1530
+#, c-format
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:796
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, fuzzy, c-format
-msgid "User ID is %d\n"
-msgstr "Anv�ndar-ID-->%d\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr "Kunde inte �ppna %s\n"
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:1615
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "lastSyncPC = %d\n"
+msgid "Install %s failed"
+msgstr "Installering av %s misslyckades"
 
-#: ../sync.c:799
-#, c-format
-msgid "This PC = %lu\n"
-msgstr "Denna PC = %lu\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Misslyckades.\n"
 
-#: ../sync.c:800
+#: ../sync.c:1625
 #, fuzzy, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Senaste anv�ndarnamn-->\"%s\"\n"
+msgid "Installed %s"
+msgstr "Installerade %s "
 
-#: ../sync.c:801
+#: ../sync.c:1736
 #, fuzzy, c-format
-msgid "Last UserID = %d\n"
-msgstr "Senaste anv�ndar-ID-->\"%d\"\n"
+msgid "%s:%d Error getting app info %s\n"
+msgstr "Fel vid l�sning av %s\n"
 
-#: ../sync.c:802
+#: ../sync.c:1742 ../sync.c:1772
 #, fuzzy, c-format
-msgid "Username = [%s]\n"
-msgstr "Anv�ndarnamn-->\"%s\"\n"
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "Fel vid l�sning av %s\n"
 
-#: ../sync.c:803
+#: ../sync.c:1763
 #, fuzzy, c-format
-msgid "userID = %d\n"
-msgstr "Anv�ndar-ID-->%d\n"
-
-#: ../sync.c:821
-msgid "Sync canceled\n"
-msgstr "Synkronisering avbruten\n"
-
-#: ../sync.c:843
-#, fuzzy
-msgid "Finished restoring handheld.\n"
-msgstr "/Arkiv/�terst�ll handdatorn"
-
-#: ../sync.c:844
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "Du kanske beh�ver synkronisera f�r att uppdatera J-Pilot.\n"
-
-#: ../sync.c:874
-msgid "Doing a fast sync.\n"
-msgstr "En snabb synkronisering utf�rs.\n"
+msgid "Error reading appinfo block for %s\n"
+msgstr "Fel vid l�sning av %s\n"
 
-#: ../sync.c:913
-msgid "Doing a slow sync.\n"
-msgstr "En l�ngsam synkronisering utf�rs.\n"
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr ""
 
-#: ../sync.c:1014
-msgid "Thank you for using J-Pilot."
-msgstr "Tack f�r att du anv�nder J-Pilot."
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr ""
 
-#: ../sync.c:1056
-msgid "Finished.\n"
-msgstr "F�rdig.\n"
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr ""
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Synkroniserar %s\n"
 
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Skrev en %s-post."
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Skrivandet av en %s-post misslyckades."
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Borttagandet av en %s-post misslyckades."
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Tog bort en %s-post."
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "Tog bort en %s-post."
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Skrev en %s-post."
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Skrivandet av en %s post misslyckades."
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Borttagandet av en %s-post misslyckades."
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Tog bort en %s-post."
 
-#: ../sync.c:1133
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "number of records = %d\n"
-msgstr "antal poster = %d\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
 
-#: ../sync.c:1260 ../sync.c:2435
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
+
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2250,804 +2857,865 @@ msgstr ""
 "dlp_DeleteRecord misslyckades\n"
 "Det kan bero p� att posten redan var borttagen p� Palmen\n"
 
-#: ../sync.c:1358 ../sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (Skapar-ID \"%s\") �r redan uppdaterad, hoppar �ver nerladdning\n"
-
-#: ../sync.c:1362 ../sync.c:1774
-#, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "H�mtar \"%s\" (Skapar-ID \"%s\")... "
-
-#: ../sync.c:1369 ../sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
 msgstr ""
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../sync.c:3094
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr ""
+msgid " Syncing on device %s\n"
+msgstr " Synkroniserar enhet %s\n"
 
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "OK\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " Tryck p� HotSync-knappen nu\n"
 
-#: ../sync.c:1687
-#, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "Hoppar �ver %s (Skapar-ID \"%s\")\n"
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
+#, fuzzy, c-format
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "Senaste anv�ndarnamn-->\"%s\"\n"
 
-#: ../sync.c:1861
-#, c-format
-msgid "Installing %s "
-msgstr "Installerar %s "
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
+#, fuzzy, c-format
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "Senaste anv�ndar-ID-->\"%d\"\n"
 
-#: ../sync.c:1867
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"Kan inte �ppna \"%s\"!\n"
+msgid " This Username-->\"%s\"\n"
+msgstr "Anv�ndarnamn-->\"%s\"\n"
 
-#: ../sync.c:1871
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"Kan inte �ppna \"%s\"!\n"
+msgid " This User ID-->%d\n"
+msgstr "Anv�ndar-ID-->%d\n"
 
-#: ../sync.c:1883
-#, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(Skapar ID �r \"%s\")..."
+#: ../sync.c:3204
+#, fuzzy, c-format
+msgid "Username is \"%s\"\n"
+msgstr "Anv�ndarnamn-->\"%s\"\n"
 
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
+#: ../sync.c:3205
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr "Kunde inte �ppna %s\n"
+msgid "User ID is %d\n"
+msgstr "Anv�ndar-ID-->%d\n"
 
-#: ../sync.c:1960
+#: ../sync.c:3207
 #, c-format
-msgid "Install %s failed"
-msgstr "Installering av %s misslyckades"
-
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "Misslyckades.\n"
+msgid "lastSyncPC = %d\n"
+msgstr "lastSyncPC = %d\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
+#: ../sync.c:3208
 #, c-format
-msgid "Installed %s "
-msgstr "Installerade %s "
+msgid "This PC = %lu\n"
+msgstr "Denna PC = %lu\n"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, fuzzy, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Kunde inte �ppna %s\n"
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "Synkronisering avbruten\n"
 
-#: ../sync.c:2180
+#: ../sync.c:3255
 #, fuzzy
-msgid "Unable to read home dir\n"
-msgstr "Kunde inte �ppna %s\n"
+msgid "Finished restoring handheld.\n"
+msgstr "/Arkiv/�terst�ll handdatorn"
 
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: antal poster = %d\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "Du kanske beh�ver synkronisera f�r att uppdatera J-Pilot.\n"
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "disk: antal poster = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "En snabb synkronisering utf�rs.\n"
 
-#: ../sync.c:2888
-#, fuzzy, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "Fel vid l�sning av %s\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "En l�ngsam synkronisering utf�rs.\n"
 
-#: ../sync.c:2894 ../sync.c:2936
-#, fuzzy, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "Fel vid l�sning av %s\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "Tack f�r att du anv�nder J-Pilot."
 
-#: ../sync.c:2916 ../sync.c:2928
-#, fuzzy, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Fel vid l�sning av %s\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "F�rdig.\n"
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
+#: ../sync.c:3446
 #, c-format
-msgid "Could not add category %s to remote.\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
 msgstr ""
 
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
+#: ../sync.c:3447
+#, c-format
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
 msgstr ""
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
+msgid "Exiting with status %s\n"
 msgstr ""
 
-#: ../todo.c:248
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../todo.c:255
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr ""
 
-#: ../todo.c:380
-#, fuzzy, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "Fel vid l�sning av %s\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "F�rfallodatum"
 
-#: ../todo_gui.c:535
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Filen verkar inte var i todo.dat-format\n"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr ""
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "F�rfallodatum"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "F�rfallodatum"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "Prioritet: "
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Avslutad"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr ""
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Inget datum"
 
-#. The completed check box
-#: ../todo_gui.c:2206
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Avslutad"
 
-#: ../todo_gui.c:2214
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "Prioritet: "
 
-#: ../todo_gui.c:2234
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "F�rfallodatum:"
 
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "Anteckning"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Idag"
+
+#: ../utils.c:575
+#, fuzzy, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Kunde inte hitta en tom databas-fil.\n"
+
+#: ../utils.c:578
+#, fuzzy
+msgid " may not be installed.\n"
+msgstr "jpilot �r kanske inte installerat.\n"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr ""
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s �r en katalog"
+
+#: ../utils.c:628
+#, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr ""
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Spara �ndrad post?"
+
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Vill du spara �ndringarna i den h�r posten?"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Spara denna nya posten?"
+
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Vill du spara den nya posten?"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr ""
 
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
+#: ../utils.c:1874
+#, c-format
+msgid " -p skip loading plugins\n"
 msgstr ""
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
+#: ../utils.c:1875
+#, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr ""
 
-#: ../utils.c:75
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1876
+#, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr ""
 
-#: ../utils.c:76
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
 msgstr ""
 
-#: ../utils.c:77
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
 msgstr ""
 
-#: ../utils.c:78
-msgid " -i makes program iconify itself upon launch.\n"
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
 msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr ""
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr ""
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr ""
 
-#: ../utils.c:107
+#: ../utils.c:1921
+#, fuzzy
+msgid "Error reading file"
+msgstr "Fel vid l�sning"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr ""
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr ""
 
-#: ../utils.c:110
+#: ../utils.c:1976
 #, fuzzy
 msgid "Installed Path"
 msgstr "Installerade %s "
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr ""
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr ""
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 #, fuzzy
 msgid "yes"
 msgstr "Ja"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-#, fuzzy
-msgid "no"
-msgstr "ingen"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 #, fuzzy
 msgid "Private record support"
 msgstr "Skriv ut alla poster"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+#, fuzzy
+msgid "no"
+msgstr "ingen"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr ""
 
-#: ../utils.c:134
+#: ../utils.c:1996
 #, fuzzy
 msgid "Plugin support"
 msgstr "/Insticksmoduler"
 
-#: ../utils.c:140
+#: ../utils.c:2002
 #, fuzzy
 msgid "Manana support"
 msgstr "/Insticksmoduler"
 
-#: ../utils.c:146
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr ""
 
-#: ../utils.c:152
-#, fuzzy
-msgid "GTK2 support"
-msgstr "/Insticksmoduler"
-
-#: ../utils.c:207
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Idag �r det %A, %x %X"
-
-#: ../utils.c:209
-#, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Idag �r det %%A, %s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "Idag"
-
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "Spara �ndrad post?"
-
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "Vill du spara �ndringarna i den h�r posten?"
-
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "Spara denna nya posten?"
-
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "Vill du spara den nya posten?"
-
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
-msgid "Can't get HOME environment variable\n"
-msgstr ""
-
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
-msgstr ""
-
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
-#, c-format
-msgid "Can't create directory %s\n"
-msgstr ""
-
-#: ../utils.c:1399
-#, fuzzy, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr "Filen verkar inte vara i address.dat-format\n"
-
-#: ../utils.c:1405
+#: ../utils.c:2014
+#, fuzzy
+msgid "GTK2 support"
+msgstr "/Insticksmoduler"
+
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "I can't write files in directory %s\n"
+msgid "Can't get HOME environment variable\n"
 msgstr ""
 
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:2064
+#, c-format
+msgid "HOME environment variable is too long to process\n"
 msgstr ""
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:2567
+msgid "Edit Categories..."
 msgstr ""
 
-#: ../utils.c:1483
-#, fuzzy
-msgid "Error opening file: next_id\n"
-msgstr "Fel vid fil�ppning"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC-ID �r 0.\n"
 
-#: ../utils.c:1657
+#: ../utils.c:3234
 #, fuzzy, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Kunde inte hitta en tom databas-fil.\n"
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Jag genererade ett nytt PC-ID. Det �r %lu\n"
 
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-#, fuzzy
-msgid " may not be installed.\n"
-msgstr "jpilot �r kanske inte installerat.\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1839
-#, fuzzy
-msgid "Error reading file"
-msgstr "Fel vid l�sning"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "Idag �r det %A, %x %X"
 
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC-ID �r 0.\n"
+#: ../utils.c:3539
+#, c-format
+msgid "Today is %%A, %s %s"
+msgstr "Idag �r det %%A, %s %s"
 
-#: ../utils.c:2517
+#: ../utils.c:3768
 #, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Jag genererade ett nytt PC-ID. Det �r %lu\n"
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
+msgstr ""
+
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
+msgstr "Fel vid l�sning av %s\n"
+
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
+msgstr "Fel vid l�sning av %s\n"
 
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Veckovy"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr ""
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr ""
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr ""
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr ""
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr ""
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr ""
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr ""
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr ""
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 #, fuzzy
 msgid "France"
 msgstr "Avbryt"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr ""
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr ""
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr ""
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr ""
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 #, fuzzy
 msgid "Indonesia"
 msgstr "ingen"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr ""
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 #, fuzzy
 msgid "Italy"
 msgstr "Installera"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr ""
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr ""
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr ""
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr ""
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr ""
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr ""
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr ""
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr ""
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr ""
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr ""
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr ""
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 #, fuzzy
 msgid "Spain"
 msgstr "T�g"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 #, fuzzy
 msgid "Sweden"
 msgstr "vecka"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr ""
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 #, fuzzy
 msgid "Taiwan"
 msgstr "T�g"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 #, fuzzy
 msgid "Thailand"
 msgstr "T�g"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr ""
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr ""
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Expense"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Flygbiljetter"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Frukost"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Buss"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Aff�rsm�ltider"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Hyrbil"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Middag"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Underh�llning"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Fax"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Bensin"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "G�vor"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Hotell"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Of�rutsedda"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Tv�tt"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limousine"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Logi"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Lunch"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Milkostnad"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Parkering"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Porto"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Tilltugg"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Tunnelbana"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "F�rn�denheter"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taxi"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Tips"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Avgifter"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "T�g"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
-msgstr "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr ""
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "American Express"
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Kontant"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Check"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
 msgstr "Kreditkort"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
-msgstr "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
+msgstr "Master Card"
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "F�rbetald"
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr ""
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr ""
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr "American Express"
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "Kreditkort"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Typ: "
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr "Master Card"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Summa: "
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 #, fuzzy
 msgid "Category:"
 msgstr "Kategori: "
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 #, fuzzy
 msgid "Payment:"
 msgstr "Betalning: "
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 #, fuzzy
 msgid "Currency:"
 msgstr "Aktuell"
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-#, fuzzy
-msgid "Date:"
-msgstr "Datum"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "M�nad:"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Dag:"
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "�r:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 #, fuzzy
 msgid "Amount:"
 msgstr "Summa: "
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 #, fuzzy
 msgid "Vendor:"
 msgstr "F�rs�ljare: "
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 #, fuzzy
 msgid "City:"
 msgstr "Stad: "
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "N�rvarande"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+"%s �r skrivet av\n"
+"Judd Montgomery � 1999-2001.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 #, fuzzy
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Skriv KeyRing-l�senord"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 #, fuzzy
 msgid "Enter a NEW KeyRing Password"
 msgstr "Skriv KeyRing-l�senord"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Skriv KeyRing-l�senord"
 
-#: ../KeyRing/keyring.c:1636
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr ""
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr ""
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "Avbryt"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "Konto"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, c-format
+msgid "Can't export key %d\n"
+msgstr ""
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 #, fuzzy
 msgid ""
 "Change\n"
@@ -3055,54 +3723,222 @@ msgid ""
 "Password"
 msgstr "Skriv KeyRing-l�senord"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "Avbryt"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "Konto"
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "namn: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "konto: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "l�senord: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 #, fuzzy
 msgid "Generate Password"
 msgstr "Skriv PalmOSl�senord"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "Synka minnesanteckningar"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+"%s �r skrivet av\n"
+"Judd Montgomery � 1999-2001.\n"
+"judd@jpilot.org\n"
+"http://jpilot.org\n"
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "Klar"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Skriv �ver filen"
+
+#, fuzzy
+#~ msgid "Field"
+#~ msgstr "Misslyckades.\n"
+
+#~ msgid "Quick View"
+#~ msgstr "Snabbvisning"
+
+#, fuzzy
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Kunde inte �ppna %s\n"
+
+#, fuzzy
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Kunde inte �ppna %s\n"
+
+#, fuzzy
+#~ msgid "category name"
+#~ msgstr "Kategori: "
+
+#~ msgid "Close"
+#~ msgstr "St�ng"
+
+#~ msgid "none"
+#~ msgstr "ingen"
+
+#, fuzzy
+#~ msgid "W"
+#~ msgstr "On"
+
+#, fuzzy
+#~ msgid "M"
+#~ msgstr "M�"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Denna h�ndelse har ingen speciell tid"
+
+#, fuzzy
+#~ msgid "Start Time"
+#~ msgstr "B�rjar p�"
+
+#, fuzzy
+#~ msgid "End Time"
+#~ msgstr "Tid"
+
+#~ msgid "Done"
+#~ msgstr "Klar"
+
+#~ msgid "Add"
+#~ msgstr "L�gg till"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Anv�ndarnamn"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Hj�lp/PayBack program"
+
+#~ msgid "Clear"
+#~ msgstr "T�m"
+
+#, fuzzy
+#~ msgid "Show private records"
+#~ msgstr "/Visa/D�lj-Visa privata poster"
+
+#, fuzzy
+#~ msgid "Hide private records"
+#~ msgstr "/Visa/D�lj-Visa privata poster"
+
+#, fuzzy
+#~ msgid "Mask private records"
+#~ msgstr "Skriv ut alla poster"
+
+#, fuzzy
+#~ msgid "Font"
+#~ msgstr "M�nad"
+
+#, fuzzy
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Kunde inte �ppna filen %s\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "F�rsta dagen i veckan �r "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Seriell port (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "Synka memo32 (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "En post"
+
+#, fuzzy
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr " Tryck p� HotSync-knappen nu\n"
+
+#, fuzzy
+#~ msgid "Finished\n"
+#~ msgstr "F�rdig.\n"
+
+#, fuzzy
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Senaste anv�ndarnamn-->\"%s\"\n"
+
+#, fuzzy
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Senaste anv�ndar-ID-->\"%d\"\n"
+
+#, fuzzy
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Anv�ndarnamn-->\"%s\"\n"
+
+#, fuzzy
+#~ msgid "userID = %d\n"
+#~ msgstr "Anv�ndar-ID-->%d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: antal poster = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "disk: antal poster = %d\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr "Filen verkar inte vara i address.dat-format\n"
+
+#~ msgid "AmEx"
+#~ msgstr "AmEx"
+
+#~ msgid "CreditCard"
+#~ msgstr "Kreditkort"
+
+#~ msgid "MasterCard"
+#~ msgstr "MasterCard"
+
 #~ msgid "Quit"
 #~ msgstr "Avsluta"
 
@@ -3113,9 +3949,6 @@ msgstr "Klar"
 #~ msgid "Directory"
 #~ msgstr "%s �r en katalog"
 
-#~ msgid "Overwrite File"
-#~ msgstr "Skriv �ver filen"
-
 #, fuzzy
 #~ msgid "Filename"
 #~ msgstr "namn: "
@@ -3198,35 +4031,16 @@ msgstr "Klar"
 #~ msgid "Error reading at %s : %s %d\n"
 #~ msgstr "Fel vid l�sning av %s\n"
 
-#~ msgid "Serial Rate "
-#~ msgstr "Seriell �verf�ringshastighet "
-
 #, fuzzy
 #~ msgid "Cannot open "
 #~ msgstr "Kan inte �ppna loggfil\n"
 
-#, fuzzy
-#~ msgid "_to_install file\n"
-#~ msgstr "Kan inte �ppna jpilot_to_install-filen\n"
-
 #~ msgid "Time:"
 #~ msgstr "Tid:"
 
 #~ msgid "RTh"
 #~ msgstr "To"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s %s was written by\n"
-#~ "Judd Montgomery (Copyright) 1999-2002.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-#~ msgstr ""
-#~ "%s �r skrivet av\n"
-#~ "Judd Montgomery � 1999-2001.\n"
-#~ "judd@jpilot.org\n"
-#~ "http://jpilot.org\n"
-
 #~ msgid "/_Help/About %s"
 #~ msgstr "/Hj�lp/Om %s"
 
@@ -3239,9 +4053,6 @@ msgstr "Klar"
 #~ msgid "Out of memory 2\n"
 #~ msgstr "Slut p� minne 2\n"
 
-#~ msgid "Error in %s\n"
-#~ msgstr "Fel i %s\n"
-
 #~ msgid "Out of memory 3\n"
 #~ msgstr "Slut p� minne 3\n"
 
@@ -3251,9 +4062,6 @@ msgstr "Klar"
 #~ msgid "Add or Modify a Record"
 #~ msgstr "L�gg till eller �ndra en post"
 
-#~ msgid "Error on reading %s\n"
-#~ msgstr "Fel vid l�sning av %s\n"
-
 #~ msgid "Out of memory\n"
 #~ msgstr "Slut p� minne\n"
 
@@ -3281,9 +4089,6 @@ msgstr "Klar"
 #~ msgid "Serial Port "
 #~ msgstr "Serieport "
 
-#~ msgid "Add It"
-#~ msgstr "L�gg till"
-
 #~ msgid "Hour:"
 #~ msgstr "Timmar:"
 
diff --git a/po/tr.po b/po/tr.po
index 45218e94..b94e6023 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,43 +10,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot-1.6.0-pre2\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2007-11-23 20:00+0100\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2008-05-04 19:00-0400\n"
 "Last-Translator: Ey�p Hakan Duran <hakan_duran@hotmail.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../address.c:295 ../address.c:539 ../alarms.c:370 ../contact.c:277
-#: ../contact.c:582 ../dat.c:181 ../dat.c:655 ../dat.c:857 ../dat.c:991
-#: ../dat.c:1130 ../datebook.c:89 ../datebook.c:390 ../datebook.c:397
-#: ../datebook.c:427 ../datebook.c:1043 ../jpilot.c:1564 ../libplugin.c:437
-#: ../libplugin.c:719 ../libplugin.c:829 ../libplugin.c:908 ../libplugin.c:952
-#: ../memo.c:95 ../memo.c:384 ../plugins.c:112 ../prefs.c:323 ../prefs.c:348
-#: ../prefs.c:887 ../sync.c:294 ../sync.c:1256 ../sync.c:1311 ../sync.c:1325
-#: ../sync.c:2549 ../sync.c:2618 ../todo.c:206 ../todo.c:543 ../utils.c:2520
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Bellek yetersiz"
 
-#: ../address.c:352 ../address.c:359 ../contact.c:334 ../datebook.c:340
-#: ../libplugin.c:179 ../memo.c:166 ../memo.c:173 ../todo.c:289 ../todo.c:296
-#: ../utils.c:2130 ../utils.c:2138 ../utils.c:2151 ../utils.c:2159
-#: ../utils.c:2167 ../utils.c:2183 ../utils.c:2192 ../utils.c:2201
-#: ../utils.c:2210 ../utils.c:2220
-msgid "error"
-msgstr "hata"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Kategori bilgisi okumada hata %s\n"
 
-#: ../address.c:418 ../address_gui.c:1999 ../contact.c:403 ../datebook.c:686
-#: ../libplugin.c:779 ../libplugin.c:805 ../memo.c:258 ../memo_gui.c:986
-#: ../todo_gui.c:1290 ../Expense/expense.c:1088 ../Expense/expense.c:2088
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Dosya okumada hata: %s\n"
 
-#: ../address_gui.c:391 ../datebook_gui.c:2538 ../memo_gui.c:166
-#: ../todo_gui.c:281 ../KeyRing/keyring.c:634
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "hata"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -54,138 +64,238 @@ msgstr ""
 "Bu kay�t silindi.\n"
 "De�i�iklik yapmak i�in silmeyi geri al�n�z ya da kopyalay�n�z.\n"
 
-#: ../address_gui.c:526 ../address_gui.c:531 ../address_gui.c:541
-#: ../address_gui.c:551 ../address_gui.c:561 ../address_gui.c:572
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
 #, c-format
 msgid "%s%s: %s"
 msgstr "%s%s: %s"
 
-#: ../address_gui.c:650 ../category.c:155 ../category.c:161 ../category.c:209
-#: ../category.c:266 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1212
-#: ../sync.c:1218 ../sync.c:2520 ../sync.c:2823 ../sync.c:2829 ../sync.c:2951
-#: ../sync.c:3273 ../todo_gui.c:421 ../utils.c:2925 ../utils.c:2966
-#: ../utils.c:2972 ../utils.c:3035 ../utils.c:3041 ../utils.c:3102
-#: ../utils.c:3157 ../utils.c:3163 ../utils.c:3224 ../utils.c:3231
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Dosya a��lamad�: %s\n"
 
-#: ../address_gui.c:729
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Dosya a��lamad�: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Dosya adres.dat bi�eminde g�z�km�yor\n"
 
-#: ../address_gui.c:739 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:546 ../Expense/expense.c:1363
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Dosyalanmam��"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:876 ../alarms.c:289 ../category.c:412 ../category.c:891
-#: ../category.c:944 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:359 ../jpilot.c:404 ../jpilot.c:472
-#: ../jpilot.c:516 ../jpilot.c:1000 ../jpilot.c:1898 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:331 ../todo_gui.c:634 ../utils.c:1188
-#: ../utils.c:1369 ../KeyRing/keyring.c:1597
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "Tamam"
 
-#: ../address_gui.c:877 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:635 ../utils.c:1387
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Hay�r"
 
-#: ../address_gui.c:877 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:635 ../utils.c:1387
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Evet"
 
-#: ../address_gui.c:900 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:660
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s bir dizin..."
 
-#: ../address_gui.c:902 ../address_gui.c:919 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:662
-#: ../todo_gui.c:679
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Dosya A�mada Hata"
 
-#: ../address_gui.c:906 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:666
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "%s dosyas�n�n �st�ne kaydetmek istiyor musunuz?"
 
-#: ../address_gui.c:908 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:668
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Dosya �st�ne Yaz�ls�n m�?"
 
-#: ../address_gui.c:917 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:677
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Dosya A�mada Hata: %s"
 
-#: ../address_gui.c:928
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Adres ihra� edilemiyor %d\n"
 
-#: ../address_gui.c:996 ../address_gui.c:1004 ../address_gui.c:1024
-msgid "Field"
-msgstr "Alan"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "S�n�f "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "�zel"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, fuzzy, c-format
+msgid "%s: "
+msgstr "%s%s: %s"
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "E-posta"
 
-#: ../address_gui.c:1225 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:816
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Bilinmeyen ihra� t�r�\n"
 
-#: ../address_gui.c:1473 ../address_gui.c:3385
-msgid "Company/Name"
-msgstr "�irket/�sim"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
 
-#: ../address_gui.c:1475 ../address_gui.c:3387
-msgid "Name/Company"
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "�sim/�irket"
+
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "�sim/�irket"
 
-#: ../address_gui.c:1602 ../datebook_gui.c:2616 ../memo_gui.c:894
-#: ../todo_gui.c:1218 ../KeyRing/keyring.c:974
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "�irket/�sim"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Silinmi� bir kayd� de�i�tiremezsiniz\n"
 
-#. Illegal category
-#: ../address_gui.c:1789 ../address_gui.c:2416 ../address_gui.c:3086
-#: ../memo_gui.c:800 ../memo_gui.c:1078 ../memo_gui.c:1368 ../todo_gui.c:1084
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Kategori ge�erli de�il\n"
 
-#: ../address_gui.c:1841
-msgid "email command empty\n"
-msgstr "eposta komutu bo�\n"
-
-#: ../address_gui.c:1849 ../alarms.c:629 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "Komut uygulan�yor = [%s]\n"
 
-#: ../address_gui.c:2055
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
 msgid "Birthday"
 msgstr "Do�um G�n�"
 
-#: ../address_gui.c:2137
+#: ../address_gui.c:2575
 msgid "External program not found, or other error"
 msgstr "Harici program bulunamad� ya da ba�ka bir hata"
 
-#: ../address_gui.c:2138
+#: ../address_gui.c:2577
+#, fuzzy
 msgid ""
-"J-Pilot can not find an external program \"convert\"\n"
+"J-Pilot can not find the external program \"convert\"\n"
 "or an error occurred while executing convert.\n"
 "You may need to install package ImageMagick"
 msgstr ""
@@ -193,324 +303,316 @@ msgstr ""
 "ya da convert y�r�t�l�rken bir hata olu�tu.\n"
 "ImageMagick paketini y�klemeniz gerekebilir"
 
-#: ../address_gui.c:2139
+#: ../address_gui.c:2578
 #, c-format
 msgid "Command executed was \"%s\"\n"
 msgstr "Y�r�t�len komut \"%s\" idi\n"
 
-#: ../address_gui.c:2140
+#: ../address_gui.c:2579
 #, c-format
 msgid "return code was %d\n"
 msgstr "d�n�� kodu %d idi\n"
 
-#: ../address_gui.c:2219
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "kilitleme ba�ar�s�z\n"
+
+#: ../address_gui.c:2660
 msgid "Add Photo"
 msgstr "Foto Ekle"
 
-#. NEW CODE
-#. Fill out the "All" text buffer
 #. Category menu
-#: ../address_gui.c:2441 ../Expense/expense.c:1560 ../KeyRing/keyring.c:2112
-#: ../KeyRing/keyring.c:2213
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "S�n�f "
 
-#. Set dial/email button text and callback data
-#: ../address_gui.c:2460 ../address_gui.c:3644
-msgid "E-mail"
-msgstr "E-posta"
-
-#: ../address_gui.c:2463 ../address_gui.c:2465 ../address_gui.c:3645
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Posta"
 
 #. Dial Phone Button
-#: ../address_gui.c:2470 ../address_gui.c:2472 ../address_gui.c:3648
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "�evir"
 
-#: ../address_gui.c:2767 ../address_gui.c:2791
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Ads�z-"
 
-#: ../address_gui.c:2864 ../memo_gui.c:1278 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 kay�t"
 
-#: ../address_gui.c:2867 ../datebook_gui.c:2414 ../memo_gui.c:1281
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%2$d kayd�n %1$d tanesi"
 
-#: ../address_gui.c:3258 ../address_gui.c:3265 ../KeyRing/keyring.c:2125
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
 msgid "Name"
 msgstr "�sim"
 
-#: ../address_gui.c:3259 ../address_gui.c:3260 ../address_gui.c:3261
-#: ../address_gui.c:3266 ../prefs_gui.c:423
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
 msgid "Address"
 msgstr "Adres"
 
-#: ../address_gui.c:3262 ../address_gui.c:3267 ../Expense/expense.c:555
-#: ../Expense/expense.c:1384
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
 msgid "Other"
 msgstr "Di�er"
 
-#: ../address_gui.c:3281
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Not"
+
+#: ../address_gui.c:3844
 msgid "Reverting to Address database\n"
 msgstr "Adres veritaban�na geri d�n��t�r�l�yor\n"
 
-#. Edit category button
-#: ../address_gui.c:3360 ../category.c:442 ../category.c:488 ../category.c:506
-#: ../category.c:585 ../category.c:778 ../memo_gui.c:1496 ../todo_gui.c:2101
-#: ../Expense/expense.c:1566
-msgid "Edit Categories"
-msgstr "Kategorileri D�zenle"
-
-#: ../address_gui.c:3391
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../address_gui.c:3414
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "�abuk Bul"
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:3430 ../category.c:413 ../category.c:881 ../category.c:934
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4385
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1530
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:322
-#: ../todo_gui.c:2172 ../utils.c:1174 ../KeyRing/keyring.c:1587
-#: ../KeyRing/keyring.c:2154
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "�ptal"
 
-#: ../address_gui.c:3430 ../datebook_gui.c:4385 ../memo_gui.c:1530
-#: ../todo_gui.c:2172 ../KeyRing/keyring.c:2154
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "De�i�iklikleri iptal et"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:3435 ../category.c:413 ../category.c:846
-#: ../datebook_gui.c:4390 ../memo_gui.c:1535 ../todo_gui.c:2177
-#: ../Expense/expense.c:1603 ../KeyRing/keyring.c:2159
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Sil"
 
-#: ../address_gui.c:3435 ../datebook_gui.c:4390 ../memo_gui.c:1535
-#: ../todo_gui.c:2177 ../Expense/expense.c:1603 ../KeyRing/keyring.c:2159
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Se�ili kayd� sil"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:3441 ../datebook_gui.c:4396 ../memo_gui.c:1541
-#: ../todo_gui.c:2183 ../KeyRing/keyring.c:2165
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Silmeyi geri al"
 
-#: ../address_gui.c:3441 ../datebook_gui.c:4396 ../memo_gui.c:1541
-#: ../todo_gui.c:2183 ../KeyRing/keyring.c:2165
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Silinmi� se�ili kayd� kurtar"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:3447 ../datebook_gui.c:4402 ../memo_gui.c:1547
-#: ../todo_gui.c:2189 ../Expense/expense.c:1608 ../KeyRing/keyring.c:2171
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Kopyala"
 
-#: ../address_gui.c:3447 ../datebook_gui.c:4402 ../memo_gui.c:1547
-#: ../todo_gui.c:2189 ../Expense/expense.c:1608 ../KeyRing/keyring.c:2171
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Se�ili kayd� kopyala"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:3453 ../datebook_gui.c:4408 ../memo_gui.c:1553
-#: ../todo_gui.c:2195 ../Expense/expense.c:1613 ../KeyRing/keyring.c:2177
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Yeni Kay�t"
 
-#: ../address_gui.c:3453 ../datebook_gui.c:4408 ../memo_gui.c:1553
-#: ../todo_gui.c:2195 ../Expense/expense.c:1613 ../KeyRing/keyring.c:2177
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Yeni bir kay�t ekle"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:3458 ../datebook_gui.c:4414 ../memo_gui.c:1559
-#: ../todo_gui.c:2201 ../Expense/expense.c:1618 ../KeyRing/keyring.c:2183
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Kay�t Ekle"
 
-#: ../address_gui.c:3458 ../datebook_gui.c:4414 ../memo_gui.c:1559
-#: ../todo_gui.c:2201 ../Expense/expense.c:1618 ../KeyRing/keyring.c:2183
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Yeni kayd� ekle"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:3468 ../datebook_gui.c:4424 ../memo_gui.c:1569
-#: ../todo_gui.c:2211 ../Expense/expense.c:1627 ../KeyRing/keyring.c:2193
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "De�i�iklikleri Uygula"
 
-#: ../address_gui.c:3468 ../datebook_gui.c:4424 ../memo_gui.c:1569
-#: ../todo_gui.c:2211 ../Expense/expense.c:1627 ../KeyRing/keyring.c:2193
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "De�i�iklikleri onayla"
 
 #. Private check box
-#: ../address_gui.c:3485 ../datebook_gui.c:4475 ../memo_gui.c:1587
-#: ../todo_gui.c:2274
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "�zel"
 
-#: ../address_gui.c:3582
+#: ../address_gui.c:4169
 msgid "Change Photo"
 msgstr "Foto De�i�tir"
 
-#: ../address_gui.c:3587
+#: ../address_gui.c:4174
 msgid "Remove Photo"
 msgstr "Foto ��kar"
 
-#: ../address_gui.c:3654
+#: ../address_gui.c:4246
 msgid "Show In List"
 msgstr "Listede G�ster"
 
-#: ../address_gui.c:3797
+#: ../address_gui.c:4347
 msgid "Reminder"
 msgstr "An�msat�c�"
 
-#: ../address_gui.c:3813 ../datebook_gui.c:4463
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
 msgid "Days"
 msgstr "G�n"
 
-#. All page
-#. Create a "All" button
-#: ../address_gui.c:3848 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2881
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
 msgid "All"
 msgstr "T�m�"
 
-#: ../alarms.c:257 ../datebook_gui.c:4457
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Dakika"
 
-#: ../alarms.c:259 ../datebook_gui.c:4461
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Saat"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "An�msat"
 
-#: ../alarms.c:457
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "%s%s dosyas� a��lamad�\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "Dosya a��lamad�: %s%s\n"
 
-#: ../alarms.c:544
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Randevu An�msat�c�"
 
-#: ../alarms.c:547
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Ge�mi� Randevu"
 
-#: ../alarms.c:550
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Ertelenmi� Randevu"
 
-#: ../alarms.c:553 ../datebook_gui.c:4293
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Randevu"
 
-#: ../alarms.c:636
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "J-Pilot Alarm�"
 
-#: ../alarms.c:1103
-msgid "infinite loop, breaking\n"
-msgstr "sonsuz d�ng�, k�r�l�yor\n"
-
-#: ../alarms.c:1472
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "%s alarmlar dosyas� a��lam�yor\n"
-
-#: ../category.c:188 ../sync.c:2860 ../utils.c:2993 ../utils.c:3071
-#: ../utils.c:3183 ../utils.c:3251
-msgid "rename failed"
-msgstr "yeniden adland�rma ba�ar�s�z"
-
-#: ../category.c:225 ../category.c:282 ../sync.c:1245 ../sync.c:2538
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "Bozuk PC dosyas�?\n"
 
-#: ../category.c:232 ../category.c:242 ../category.c:289 ../category.c:300
-#: ../category.c:310 ../sync.c:1295 ../sync.c:1359 ../sync.c:1389
-#: ../sync.c:1432 ../sync.c:1449 ../sync.c:1478 ../sync.c:2602 ../sync.c:2654
-#: ../sync.c:2682 ../sync.c:2727 ../sync.c:2741 ../sync.c:2768
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek ba�ar�s�z - �l�mc�l hata\n"
 
-#: ../category.c:413
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "yeniden adland�rma ba�ar�s�z"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Ta��"
 
-#: ../category.c:443
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Kategorileri D�zenle"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Maksimum kategori say�s� (16) zaten kullan�lm��"
 
-#: ../category.c:446
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Yeni Kategori Girin"
 
-#: ../category.c:456 ../category.c:463 ../category.c:481
+#: ../category.c:451 ../category.c:475
 msgid "Edit Categories Error"
 msgstr "Kategorileri D�zenle Hatas�"
 
-#: ../category.c:457
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Yeniden adland�rmak i�in bir kategori se�melisiniz"
 
 #: ../category.c:461
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "%s kategorisini d�zenleyemezsiniz.\n"
-
-#: ../category.c:468
 msgid "Enter New Category Name"
 msgstr "Yeni Kategori Ad� Girin"
 
-#: ../category.c:482
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Silmek i�in bir kategori se�melisiniz"
 
-#: ../category.c:486
-#, c-format
-msgid "You can't delete category %s.\n"
-msgstr "%s kategorisini silemezsiniz.\n"
-
-#: ../category.c:502
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
@@ -519,199 +621,338 @@ msgstr ""
 "%2$s'de %1$d adet kay�t var.\n"
 "Bunlar� %3$s'e ta��mak m�, silmek mi istersiniz?"
 
-#: ../category.c:561
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "ge�ersiz durum dosyas� %s sat�r %d\n"
 
-#: ../category.c:583
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "%s kategorisi birden fazla kullan�lamaz"
 
-#. correctly translate title
-#: ../category.c:805
-msgid "category name"
-msgstr "kategori ad�"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "S�n�f:"
 
-#: ../category.c:830
+#: ../category.c:834
 msgid "New"
 msgstr "Yeni"
 
-#: ../category.c:837
+#: ../category.c:841
 msgid "Rename"
 msgstr "Yeniden adland�r"
 
-#: ../category.c:952
-msgid "debug"
-msgstr "hata ay�klama"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "bilinmeyen t�r ="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "sat�r ba��na alan say�s� != %d, bilinmeyen bi�em\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "alan say�s� != %d, bilinmeyen bi�em\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Bilinmeyen bi�em, dosya yanl�� �ema i�eriyor\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Dosya �emas�:"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "Olmas� gereken:  "
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
-msgstr "%1$s:%2$d Kay�t %3$d, alan %4$d: Ge�ersiz t�r.  %5$d bekleniyordu, %6$d bulundu\n"
+msgstr ""
+"%1$s:%2$d Kay�t %3$d, alan %4$d: Ge�ersiz t�r.  %5$d bekleniyordu, %6$d "
+"bulundu\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "dosya okuma sonland�r�ld�\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "RandevudefteriVT'da bilinmeyen yinelemeT�r� (%d) bulundu\n"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4118
-#: ../datebook_gui.c:4125
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Yinele:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Yineleme G�n�"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Yinele:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Yineleme G�n�"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Yineleme G�n�"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Yineleme G�n�"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "P"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4119
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Pzt"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4120
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "S"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4121
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "�ar"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4122
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "."
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4123
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "C"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4124
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Cts"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Biti� Tarihi"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Yineleme G�n�"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "kay�t say�s� = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Not"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Alarm"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Yinele:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Haftan�n g�n�"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Randevu a��klama metni > %d �ok uzun, %d'e k�salt�l�yor\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Hata"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Dosya randevudefteri.dat bi�eminde g�z�km�yor\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "Bilinmeyen ihra� t�r�"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:549
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "�hra� et"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "T�m Randevu Defteri Kay�tlar�n� �hra� Et"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Farkl� kaydet"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "G�zat"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Randevudefteri Kategorileri"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:566 ../search_gui.c:636 ../weekview_gui.c:371
-msgid "Close"
-msgstr "Kapat"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4640
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Hi�biri"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Ba�lang�� Tarihi"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Biti� Tarihi"
 
-#: ../datebook_gui.c:1567 ../prefs.c:431
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Pazar"
 
-#: ../datebook_gui.c:1568 ../prefs.c:432
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Sal�"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "�ar�amba"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Per�embe"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Cuma"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4."
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Son"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -726,18 +967,18 @@ msgstr ""
 "yinelenir. Hangisini\n"
 "istersiniz?"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "Soru?"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Bu, yinelenen bir olay.\n"
 "Bu de�i�iklikleri yaln�zca\n"
@@ -745,49 +986,56 @@ msgstr ""
 "t�m yinelemelerine mi uygulamak\n"
 "istersiniz?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "�u anki"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "hi�biri/yok"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "g�n"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "hafta"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "ay"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "y�l"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Her %d %s'de yinelenen randevunuz olamaz\n"
 
-#: ../datebook_gui.c:2139
-msgid "You can not have a weekly repeating appointment that doesn't repeat on any day of the week."
+#: ../datebook_gui.c:2339
+#, fuzzy
+msgid ""
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
+"day of the week."
 msgstr "Haftan�n herhangi bir g�n�nde yinelenmeyen haftal�k randevunuz olamaz."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Zaman Yok"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Ge�ersiz Randevu"
 
-#: ../datebook_gui.c:2633
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -795,178 +1043,162 @@ msgstr ""
 "Bu randevunun Biti� Tarihi\n"
 "ba�lang�� tarihinden �nce."
 
-#. The No due date check box
-#: ../datebook_gui.c:2902 ../datebook_gui.c:4674 ../datebook_gui.c:4704
-#: ../datebook_gui.c:4759 ../datebook_gui.c:4808 ../todo_gui.c:130
-#: ../todo_gui.c:2265
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Tarih Yok"
 
-#: ../datebook_gui.c:3022
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "RandevudefteriVT ilerlemeBirimi hatas� = %d\n"
 
-#: ../datebook_gui.c:3193
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "RandevudefteriVT'da bilinmeyen yinelemeT�r� bulundu\n"
-
-#: ../datebook_gui.c:3226
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a., %s"
 
-#: ../datebook_gui.c:3231 ../monthview_gui.c:236 ../weekview_gui.c:221
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (BUG�N)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4201 ../datebook_gui.c:4642
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Hafta"
 
-#: ../datebook_gui.c:4207
-msgid "W"
-msgstr "�ar"
-
-#: ../datebook_gui.c:4209
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "Randevular� haftal�k g�r�nt�le"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4212 ../datebook_gui.c:4643
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Ay"
 
-#: ../datebook_gui.c:4219
-msgid "M"
-msgstr "Pzt"
-
-#: ../datebook_gui.c:4221
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "Randevular� ayl�k g�r�nt�le"
 
 #. Make Category button
-#: ../datebook_gui.c:4226
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "S�n�flar"
 
-#: ../datebook_gui.c:4292
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Zaman"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4329
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "�� Listesini G�ster"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2116
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "G�rev"
 
-#: ../datebook_gui.c:4345 ../todo_gui.c:2117
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Sonlanma"
 
-#: ../datebook_gui.c:4442
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Alarm"
 
-#: ../datebook_gui.c:4486
-msgid "This Event has no particular time"
-msgstr "Bu olay�n belirli bir zaman� yok"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "Tarih:"
 
-#: ../datebook_gui.c:4494
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Ba�lang��: "
 
-#: ../datebook_gui.c:4508
-msgid "Start Time"
-msgstr "Ba�lama Zaman�"
-
-#: ../datebook_gui.c:4526
-msgid "End Time"
-msgstr "Biti� Zaman�"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "Biti�"
 
-#: ../datebook_gui.c:4624
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "RandevuDf Etiketleri"
 
-#: ../datebook_gui.c:4641
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "G�n"
 
-#: ../datebook_gui.c:4644
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Y�l"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4648
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Bu olay yinelenmeyecek"
 
-#: ../datebook_gui.c:4658 ../datebook_gui.c:4690 ../datebook_gui.c:4745
-#: ../datebook_gui.c:4792
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Yineleme Her"
 
-#: ../datebook_gui.c:4663
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "G�n"
 
-#. checkbutton
-#: ../datebook_gui.c:4666 ../datebook_gui.c:4698 ../datebook_gui.c:4753
-#: ../datebook_gui.c:4800
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Biti�"
 
-#: ../datebook_gui.c:4695
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "Hafta"
 
-#: ../datebook_gui.c:4711
-msgid "Repeat on Days:"
-msgstr "Yineleme G�n�"
-
-#: ../datebook_gui.c:4750
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "Ay"
 
-#: ../datebook_gui.c:4767
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Yinele:"
 
-#: ../datebook_gui.c:4771
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Haftan�n g�n�"
 
-#: ../datebook_gui.c:4780
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Tarih"
 
-#: ../datebook_gui.c:4797
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "Y�l"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Telefon �eviricisi"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "S�fat 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "S�fat 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "S�fat 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Telefon numaras�:"
 
@@ -974,490 +1206,390 @@ msgstr "Telefon numaras
 msgid "Extension"
 msgstr "Dahili"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "�evir Komutu"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "Bitir"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Dosya G�zat�c�s�"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "�hra� edilecek kay�tlar� se�iniz"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Ctrl ve Shift tu�lar�n� kullan�n�z"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:505
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "�thal et"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Gizli dizine d�n��t�rmek i�in a�a��ya yaz�p TAB'a bas�n"
-
-#: ../import_gui.c:307 ../prefs_gui.c:973
-msgid "Done"
-msgstr "Bitti"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "�thal Edilen Dosya T�r�"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
 #, c-format
 msgid "Record was marked as private"
 msgstr "Kay�t, �zel olarak i�aretlenmi�"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
 #, c-format
 msgid "Record was not marked as private"
 msgstr "Kay�t, �zel olarak i�aretlenmemi�"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "�thalden �nceki kategori: [%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Kayd�n konaca�� kategori [%s]"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "T�m�n� �thal Et"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Atla"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Y�kle"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "Gizli dizine d�n��t�rmek i�in a�a��ya yaz�p TAB'a bas�n"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Y�klenecek dosyalar"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "�thal Edilen Dosya T�r�"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Ekle"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Y�klenecek dosyalar"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "��kar"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Y�kle"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 msgid "Install User"
 msgstr "Kullan�c� Kur"
 
-#: ../install_user.c:138
-msgid "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
-msgstr "Bir Palm OS(c) ayg�t�n� uygun �ekilde e�zamanlamak i�in bir kullan�c� ad� ve numaras� gereklidir."
+#: ../install_user.c:137
+msgid ""
+"A PalmOS(c) device needs a user name and a user ID in order to sync properly."
+msgstr ""
+"Bir Palm OS(c) ayg�t�n� uygun �ekilde e�zamanlamak i�in bir kullan�c� ad� ve "
+"numaras� gereklidir."
 
-#: ../install_user.c:145
-msgid "If you want to sync more than 1 PalmOS(c) device each one should have a different ID and preferably a different user name."
-msgstr "Birden fazla PalmOS(c) ayg�t�n� e�zamanlamak isterseniz, herbirinin farkl� numaras� ve tercihen farkl� kullan�c� ad� olmal�d�r."
+#: ../install_user.c:144
+msgid ""
+"If you want to sync more than 1 PalmOS(c) device each one should have a "
+"different ID and preferably a different user name."
+msgstr ""
+"Birden fazla PalmOS(c) ayg�t�n� e�zamanlamak isterseniz, herbirinin farkl� "
+"numaras� ve tercihen farkl� kullan�c� ad� olmal�d�r."
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr "Pek �ok ki�i kullan�c� ad� olarak kendi ad ya da lakaplar�n� se�er."
 
-#: ../install_user.c:182
-msgid "User name"
-msgstr "Kullan�c� ad�"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
+msgstr "Kullan�c� Ad�"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr "Kullan�c� numaras� rasgele bir say� olmal�d�r."
 
-#: ../install_user.c:194 ../restore_gui.c:304
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "Kullan�c� No"
 
-#: ../jpilot-dump.c:97
-msgid " +D +A +T +M format like date +format.\n"
-msgstr " +D +A +T +M bi�emi, tarih +bi�emi gibi.\n"
-
-#: ../jpilot-dump.c:98
-msgid " -v displays version and exits.\n"
-msgstr " -v s�r�m� g�sterir ve ��kar.\n"
-
-#: ../jpilot-dump.c:99 ../utils.c:80
-msgid " -h displays help and exits.\n"
-msgstr " -h yard�m� g�sterir ve ��kar.\n"
+#: ../jpilot.c:317
+msgid "Print"
+msgstr "Yazd�r"
 
-#: ../jpilot-dump.c:100
-msgid " -f displays help for format codes.\n"
-msgstr " -f bi�em kodlar� i�in yard�m� g�sterir.\n"
+#: ../jpilot.c:318
+msgid "There is no print support for this conduit."
+msgstr "Bu arabirim i�in yazd�rma deste�i bulunmamakta..."
 
-#: ../jpilot-dump.c:101
-msgid " -D dump DateBook.\n"
-msgstr " -D RandevuDefterini bo�alt�r.\n"
+#: ../jpilot.c:384
+msgid "There is no import support for this conduit."
+msgstr "Bu arabirim i�in ithal etme deste�i bulunmamakta..."
 
-#: ../jpilot-dump.c:102
-msgid " -i dump DateBook in iCalendar format.\n"
-msgstr " -i RandevuDefterini iCalender bi�emine d�n��t�r�r.\n"
+#: ../jpilot.c:428
+msgid "There is no export support for this conduit."
+msgstr "Bu arabirim i�in ihra� etme deste�i bulunmamakta..."
 
-#: ../jpilot-dump.c:103
-msgid " -N dump appts for today in DateBook.\n"
-msgstr " -N RandevuDefterinde bug�nk� randevular� bo�alt�r.\n"
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "E�zamanlamay� iptal et"
 
-#: ../jpilot-dump.c:104
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr " -NYYYY/MM/DD randevuDefterinde YYYY/MM/DD'deki randevular� bo�alt�r.\n"
-
-#: ../jpilot-dump.c:105
-msgid " -A dump Address book.\n"
-msgstr " -A Adres defterini bo�alt�r.\n"
-
-#: ../jpilot-dump.c:106
-msgid " -T dump ToDo list as CSV.\n"
-msgstr " -T �� Listesini CSV gibi bo�alt�r.\n"
-
-#: ../jpilot-dump.c:107
-msgid " -M dump Memos.\n"
-msgstr " -M Notlar� bo�alt�r.\n"
-
-#: ../jpilot-sync.c:66
-msgid " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr " J-Pilot tercihleri port, yedekleme say�s�, vs.'yi almak i�in okunur.\n"
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr " -v = s�r�m\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr " -h = yard�m\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = sorun giderme kipinde �al��\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = eklentileri y�kleme.\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = E�zmanaly�n ve daha sonra yedekleyin, ya da yaln�zca e�zamanlay�n.\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l =  d�ng�le, aksi halde bir kez e�zamanla ve ��k.\n"
-
-#: ../jpilot-sync.c:73
-msgid " -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr " -p {port} = Tercihleri almaktansa bu portu kullanarak e�zamanla.\n"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:138
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Ge�ersiz geometri betimlemesi: \"%s\"\n"
-
-#: ../jpilot.c:445 ../monthview_gui.c:579 ../print_gui.c:338
-#: ../weekview_gui.c:385
-msgid "Print"
-msgstr "Yazd�r"
-
-#: ../jpilot.c:446
-msgid "There is no print support for this conduit."
-msgstr "Bu arabirim i�in yazd�rma deste�i bulunmamakta..."
-
-#: ../jpilot.c:506
-msgid "There is no import support for this conduit."
-msgstr "Bu arabirim i�in ithal etme deste�i bulunmamakta..."
-
-#: ../jpilot.c:550
-msgid "There is no export support for this conduit."
-msgstr "Bu arabirim i�in ihra� etme deste�i bulunmamakta..."
-
-#. -------------------------------------------
-#: ../jpilot.c:726
-msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
-"Read the user manual if you are uncertain."
-msgstr ""
-"Bu avu�i�i son kez e�zamanlananla ayn� kullan�c�\n"
-"ad� ya da kimli�ine sahip de�il.  E�zamanlaman�n\n"
-"istenmeyen etkileri olabilir.  Emin de�ilseniz\n"
-"kullan�c� k�lavuzunu okuyun."
+#. -------------------------------------------
+#: ../jpilot.c:673
+#, fuzzy
+msgid ""
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
+"Read the user manual if you are uncertain."
+msgstr ""
+"Bu avu�i�i son kez e�zamanlananla ayn� kullan�c�\n"
+"ad� ya da kimli�ine sahip de�il.  E�zamanlaman�n\n"
+"istenmeyen etkileri olabilir.  Emin de�ilseniz\n"
+"kullan�c� k�lavuzunu okuyun."
 
 #. -------------------------------------------
-#: ../jpilot.c:733
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Bu avu�i�i, NULL kullan�c� kimli�ine sahip.\n"
 "Uygun �ekilde e�zamanlanmak i�in her palm, kendine has bir kullan�c�\n"
 "kimli�ine sahip olmal�d�r. E�er donan�m yeniden ba�lat�ld�ysa, yeniden\n"
-"y�klemek i�in men�den yeniden y�klemeyi kullan�n ya da pilot-xfer'i kullan�n.\n"
-"Bir kullan�c� ad� ve kimli�i eklemek i�in install-user komut sat�r� arac� kullan�n,\n"
+"y�klemek i�in men�den yeniden y�klemeyi kullan�n ya da pilot-xfer'i "
+"kullan�n.\n"
+"Bir kullan�c� ad� ve kimli�i eklemek i�in install-user komut sat�r� arac� "
+"kullan�n,\n"
 "ya da men�den kullan�c�-y�kle'yi kullan�n\n"
 "Emin de�ilseniz kullan�c� klavuzunu okuyun."
 
-#: ../jpilot.c:740
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "E�zamanlamay� iptal et"
 
-#: ../jpilot.c:740
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Her halukarda e�zamanla"
 
-#: ../jpilot.c:749 ../jpilot.c:753
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Problemi E�zamanla"
 
-#: ../jpilot.c:991
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr " Kullan�c�: "
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "E�zamanlama s�recinden bilinmeyen komut\n"
 
-#: ../jpilot.c:1012 ../Expense/expense.c:500 ../KeyRing/keyring.c:1752
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "%s Hakk�nda"
 
-#: ../jpilot.c:1415
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Dosya/y�rt"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Dosya/_Bul"
 
-#: ../jpilot.c:1418 ../jpilot.c:1424 ../jpilot.c:1427
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Dosya/ayra�1"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Dosya/_Y�kle"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Dosya/�thal et"
 
-#: ../jpilot.c:1421
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Dosya/�hra� et"
 
-#: ../jpilot.c:1422 ../jpilot.c:2901
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Dosya/Tercihler"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Dosya/_Yazd�r"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Dosya/Kullan�c� Y�kle"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Dosya/Avu�i�ini Geri Y�kle"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Dosya/_��k"
 
-#: ../jpilot.c:1429
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_G�r�n�m"
 
-#: ../jpilot.c:1430 ../jpilot.c:1431 ../jpilot.c:1432 ../jpilot.c:1683
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/G�r�n�m/�zel Kay�tlar� Gizle"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/G�r�n�m/�zel Kay�tlar� G�ster"
 
-#: ../jpilot.c:1432
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/G�r�n�m/�zel Kay�tlar� Maskele"
 
-#: ../jpilot.c:1433
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Dosya/ayra�1"
 
-#: ../jpilot.c:1434
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/G�r�n�m/Randevular"
 
-#: ../jpilot.c:1435
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/G�r�n�m/Adresler"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/G�r�n�m/�� listesi"
 
-#: ../jpilot.c:1437
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/G�r�n�m/Notlar"
 
-#: ../jpilot.c:1438 ../jpilot.c:1569
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Eklentiler"
 
-#: ../jpilot.c:1440
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1441
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/Netscape"
 
-#: ../jpilot.c:1445
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/Mozilla"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/Galeon"
 
-#: ../jpilot.c:1455
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/Opera"
 
-#: ../jpilot.c:1459
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/GnomeUrl"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/Lynx"
 
-#: ../jpilot.c:1463
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/Links"
 
-#: ../jpilot.c:1465
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W3M"
 
-#: ../jpilot.c:1467
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/Konqueror"
 
-#: ../jpilot.c:1470
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Yard�m"
 
-#: ../jpilot.c:1471
-msgid "/Help/PayBack program"
-msgstr "/Yard�m/PayBack program�"
-
-#: ../jpilot.c:1472
+#: ../jpilot.c:1163
 msgid "/Help/About J-Pilot"
 msgstr "/Yard�m/J-Pilot Hakk�nda"
 
-#: ../jpilot.c:1536
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Eklentiler/%s"
 
-#: ../jpilot.c:1547
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Yard�m/%s"
 
-#: ../jpilot.c:1846
-msgid "Font Selection Dialog"
-msgstr "Yaz�tipi Se�me �leti�im Kutusu"
-
-#: ../jpilot.c:2220
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "takvim:hafta_ba��:0"
 
-#: ../jpilot.c:2269
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "Eklentiler y�klenmiyor.\n"
 
-#: ../jpilot.c:2273
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "T�m alarmlar yok say�l�yor.\n"
 
-#: ../jpilot.c:2277
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "Ge�mi� alarmlar yok say�l�yor.\n"
 
-#: ../jpilot.c:2372 ../jpilot.c:2380
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "Veriyolu a��lamad�\n"
 
-#: ../jpilot.c:2431
-msgid " User: "
-msgstr " Kullan�c�: "
-
-#: ../jpilot.c:2572
-msgid "Clear"
-msgstr "Temizle"
-
-#: ../jpilot.c:2657
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "�zel kay�tlar� g�ster   Ctrl-Z"
 
-#: ../jpilot.c:2662
-msgid "Show private records"
-msgstr "�zel kay�tlar� g�ster"
-
-#: ../jpilot.c:2667
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "�zel kay�tlar� gizle   Ctrl-Z"
 
-#: ../jpilot.c:2672
-msgid "Hide private records"
-msgstr "�zel kay�tlar� gizle"
-
-#: ../jpilot.c:2677
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "�zel kay�tlar� maskele   Ctrl-Z"
 
-#: ../jpilot.c:2682
-msgid "Mask private records"
-msgstr "�zel kay�tlar� maskele"
-
-#: ../jpilot.c:2692
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Avu�i�ini masa�st�yle e�zamanlay�n   Ctrl-Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2698
-msgid "Font"
-msgstr "Yaz� tipi"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Adresleri e�zamanla"
 
-#: ../jpilot.c:2713
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1465,831 +1597,1264 @@ msgstr ""
 "Avu�i�ini masa�st�yle e�zamanlay�n\n"
 "ve sonras�nda yedekleyin"
 
-#: ../jpilot.c:2827
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Randevular/Bug�ne Git"
 
-#: ../jpilot.c:2829
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: ../jpilot.c:2831
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "�� Listesi"
 
-#: ../jpilot.c:2833
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Not defteri"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "�imdi yap"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Daha sonra an�msat"
 
-#: ../jpilot.c:2884
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "Bana bir daha s�yleme!"
 
-#: ../jpilot.c:2897
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters (accents for example).\n"
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
+"(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
-"J-Pilot, GTK2 grafik ara� kitini kullan�yor. Ara� kitinin bu s�r�m� karakterleri kodlamada UTF-8 kullan�r.\n"
-"ASCII olmayan karakterleri (�rne�in aksanlar) g�rebilmek i�in bir UTF-8 karakter k�mesi se�melisiniz.\n"
+"J-Pilot, GTK2 grafik ara� kitini kullan�yor. Ara� kitinin bu s�r�m� "
+"karakterleri kodlamada UTF-8 kullan�r.\n"
+"ASCII olmayan karakterleri (�rne�in aksanlar) g�rebilmek i�in bir UTF-8 "
+"karakter k�mesi se�melisiniz.\n"
 "\n"
 
-#: ../jpilot.c:2900
-msgid "Go to the menu \""
-msgstr "Men�ye git \""
-
-#: ../jpilot.c:2902
-msgid "\" and change the \""
-msgstr "\" ve �unu de�i�tir \""
-
 #. Character Set
-#: ../jpilot.c:2903 ../prefs_gui.c:443
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Karakter K�mesi"
 
-#: ../jpilot.c:2904
-msgid "\"."
-msgstr "\"."
-
-#: ../jpilot.c:2906
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Bir UTF-8 kodlama se�iniz"
 
-#: ../libplugin.c:153
+#: ../jpilot-dump.c:92
 #, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "Bilinmeyen PC ba�l�k s�r�m� = %d\n"
+msgid " +D +A +T +M format like date +format.\n"
+msgstr " +D +A +T +M bi�emi, tarih +bi�emi gibi.\n"
 
-#: ../libplugin.c:411
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%1$s:%2$d Dosyay� a�mada hata: %3$s\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v s�r�m� g�sterir ve ��kar.\n"
 
-#: ../libplugin.c:417 ../libplugin.c:446 ../sync.c:3249 ../todo.c:389
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%1$s:%2$d Dosya okumada hata: %3$s\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h yard�m� g�sterir ve ��kar.\n"
 
-#: ../libplugin.c:473 ../utils.c:2052
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
-msgstr ""
-"Bu kay�t zaten silinmi�.\n"
-"Avu�i�inden bir sonraki e�zamanlamada silinecek.\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -f bi�em kodlar� i�in yard�m� g�sterir.\n"
 
-#: ../libplugin.c:482 ../utils.c:2064 ../utils.c:2111
-msgid "Unable to open PC records file\n"
-msgstr "PC kay�t dosyas� a��lamad�\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -D RandevuDefterini bo�alt�r.\n"
 
-#: ../libplugin.c:488 ../utils.c:2073
-msgid "Couldn't find record to delete\n"
-msgstr "Silinecek kay�t bulunam�yor\n"
+#: ../jpilot-dump.c:97
+#, fuzzy, c-format
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr " -i RandevuDefterini iCalender bi�emine d�n��t�r�r.\n"
 
-#: ../libplugin.c:506 ../utils.c:2094
-#, c-format
-msgid "Unknown header version %d\n"
-msgstr "Bilinmeyen ba�l�k s�r�m� %d\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N RandevuDefterinde bug�nk� randevular� bo�alt�r.\n"
 
-#: ../libplugin.c:519
-msgid "Couldn't open PC records file\n"
-msgstr "PC kay�t dosyas� a��lam�yor\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr ""
+" -NYYYY/MM/DD randevuDefterinde YYYY/MM/DD'deki randevular� bo�alt�r.\n"
 
-#: ../libplugin.c:680 ../libplugin.c:772 ../utils.c:1570 ../utils.c:1583
-#, c-format
-msgid "Error opening file: %s\n"
-msgstr "Dosya a�mada hata: %s\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr " -A Adres defterini bo�alt�r.\n"
 
-#: ../libplugin.c:709
-msgid "Error reading PC file 1\n"
-msgstr "PC dosyas� 1'i okumada hata\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -T �� Listesini CSV gibi bo�alt�r.\n"
 
-#: ../libplugin.c:725
-msgid "Error reading PC file 2\n"
-msgstr "PC dosyas� 2'yi okumada hata\n"
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M Notlar� bo�alt�r.\n"
 
-#: ../libplugin.c:900
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Error reading %s 5\n"
-msgstr "%s 5 okumada hata\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "G�nl�k (log) dosyas� a��lam�yor, vazge�iyorum.\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "Dosya a��lamad�: %s\n"
 
-#: ../log.c:102
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "G�nl�k (log) dosyas� a��lamad�\n"
-
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "Not metni > 65535, sondan k�rp�l�yor\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "�thal edilen Not %s\n"
-
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Dosya an�msat�c�.dat bi�eminde g�z�km�yor\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:271
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "Not ihra� edilemiyor %d\n"
-
-#: ../monthview_gui.c:521
-msgid "Monthly View"
-msgstr "Ayl�k G�r�n�m"
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Avu�i�i Parolas�"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Yanl��, PalmOS Parolas�n� Tekrar Giriniz"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "PalmOS Parolas�n� Giriniz"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../plugins.c:90 ../plugins.c:204 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "sonsuz d�ng�"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../plugins.c:217
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "%s%s okunurken sat�r 1:[%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../plugins.c:218
-msgid "Wrong Version\n"
-msgstr "Yanl�� s�r�m\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../plugins.c:219
-msgid "Check preferences->conduits\n"
-msgstr "Tercihler ->devreler'i kontrol edin\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../plugins.c:275
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
-"A�ma eklentide [%s] ba�ar�s�z oldu\n"
-" hata [%s]\n"
 
-#: ../plugins.c:292 ../plugins.c:318
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " eklenti ge�ersiz: [%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: ../plugins.c:300
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "Eklenti:[%s]\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../plugins.c:301
+#: ../jpilot-merge.c:299
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "Bu eklenti s�r�m (%d.%d).\n"
-
-#: ../plugins.c:303
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "J-Pilot'un bu s�r�m�yle �al��mak i�in �ok eski.\n"
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: ../prefs.c:400
-msgid "%B %d, %Y"
-msgstr "%B %d, %Y"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: ../prefs.c:401
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+" J-Pilot tercihleri port, yedekleme say�s�, vs.'yi almak i�in okunur.\n"
 
-#: ../prefs.c:402
-msgid "%d. %B %Y"
-msgstr "%d. %B %Y"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v s�r�m� ve derleme se�eneklerini g�sterir ve ��kar.\n"
 
-#: ../prefs.c:403
-msgid "%d %B, %Y"
-msgstr "%d %B, %Y"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d hata ay�klama bilgisini stdout'a g�nderir.\n"
 
-#: ../prefs.c:404
-msgid "%Y. %B. %d"
-msgstr "%Y. %B. %d"
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr " -p eklentilerin y�klenmesini atlar.\n"
 
-#: ../prefs.c:405
-msgid "%Y %B %d"
-msgstr "%Y %B %d"
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
 
-#: ../prefs_gui.c:387
-msgid "Preferences"
-msgstr "Tercihler"
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l =  d�ng�le, aksi halde bir kez e�zamanla ve ��k.\n"
 
-#: ../prefs_gui.c:417
-msgid "Locale"
-msgstr "Yereller"
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr " -p {port} = Tercihleri almaktansa bu portu kullanarak e�zamanla.\n"
 
-#: ../prefs_gui.c:419
-msgid "Settings"
-msgstr "Ayarlar"
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Dosya a�mada hata: %s\n"
 
-#: ../prefs_gui.c:421
-msgid "Datebook"
-msgstr "Randevu defteri"
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
 
-#: ../prefs_gui.c:425
-msgid "ToDo"
-msgstr "�� Listesi"
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Dosya a�mada hata: next_id\n"
 
-#: ../prefs_gui.c:427
-msgid "Memo"
-msgstr "Notlar"
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
 
-#: ../prefs_gui.c:429
-msgid "Alarms"
-msgstr "Alarmlar"
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Hata"
 
-#: ../prefs_gui.c:431
-msgid "Conduits"
-msgstr "Arabirimler"
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
 
-#. Shortdate
-#: ../prefs_gui.c:456
-msgid "Short date format "
-msgstr "K�sa tarih bi�imi"
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
 
-#. Longdate
-#: ../prefs_gui.c:469
-msgid "Long date format "
-msgstr "Uzun tarih bi�imi"
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#. Time
-#: ../prefs_gui.c:482
-msgid "Time format "
-msgstr "Saat bi�imi"
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
 
-#: ../prefs_gui.c:496
-msgid "The first day of the week is "
-msgstr "Haftan�n ilk g�n� "
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
 
-#. GTK colors file
-#: ../prefs_gui.c:517
-msgid "My GTK colors file is "
-msgstr "GTK renkleri dosyam "
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "HOME �evre de�i�keniniz benim i�in �ok uzun\n"
 
-#. Port
-#: ../prefs_gui.c:530
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Seri Ba�lant� (/dev/ttyS0, /dev/pilot)"
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
 
-#. Rate
-#: ../prefs_gui.c:547
-msgid "Serial Rate"
-msgstr "Seri Oran�"
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
 
-#. Number of backups
-#: ../prefs_gui.c:560
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, fuzzy, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+"Bir Palm OS(c) ayg�t�n� uygun �ekilde e�zamanlamak i�in bir kullan�c� ad� ve "
+"numaras� gereklidir."
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"Bu kay�t zaten silinmi�.\n"
+"Avu�i�inden bir sonraki e�zamanlamada silinecek.\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "PC kay�t dosyas� a��lamad�\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "Silinecek kay�t bulunam�yor\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "Bilinmeyen ba�l�k s�r�m� %d\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%1$s:%2$d Dosyay� a�mada hata: %3$s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%1$s:%2$d Dosya okumada hata: %3$s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "Dosya a�mada hata: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "%s 5 okumada hata\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "PC dosyas� 1'i okumada hata\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "PC dosyas� 2'yi okumada hata\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "Bilinmeyen PC ba�l�k s�r�m� = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "G�nl�k (log) dosyas� a��lam�yor, vazge�iyorum.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "G�nl�k (log) dosyas� a��lamad�\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "Not metni > 65535, sondan k�rp�l�yor\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "�thal edilen Not %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Dosya an�msat�c�.dat bi�eminde g�z�km�yor\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "Not ihra� edilemiyor %d\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Not defteri"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Ayl�k G�r�n�m"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+#, fuzzy
+msgid "last char truncated"
+msgstr "son de�i�tirme: "
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Avu�i�i Parolas�"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Yanl��, PalmOS Parolas�n� Tekrar Giriniz"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "PalmOS Parolas�n� Giriniz"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Dosya okumada hata: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "sonsuz d�ng�"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "%s%s okunurken sat�r 1:[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "Yanl�� s�r�m\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "Tercihler ->devreler'i kontrol edin\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"A�ma eklentide [%s] ba�ar�s�z oldu\n"
+" hata [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " eklenti ge�ersiz: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "Eklenti:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "Bu eklenti s�r�m (%d.%d).\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "J-Pilot'un bu s�r�m�yle �al��mak i�in �ok eski.\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr "%B %d, %Y"
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr "%d. %B %Y"
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr "%d %B, %Y"
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
+msgstr "%Y. %B. %d"
+
+#: ../prefs.c:423
+msgid "%Y %B %d"
+msgstr "%Y %B %d"
+
+#: ../prefs_gui.c:452
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: ../prefs_gui.c:483
+msgid "Locale"
+msgstr "Yereller"
+
+#: ../prefs_gui.c:485
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: ../prefs_gui.c:487
+msgid "Datebook"
+msgstr "Randevu defteri"
+
+#: ../prefs_gui.c:491
+msgid "ToDo"
+msgstr "�� Listesi"
+
+#: ../prefs_gui.c:493
+msgid "Memo"
+msgstr "Notlar"
+
+#: ../prefs_gui.c:495
+msgid "Alarms"
+msgstr "Alarmlar"
+
+#: ../prefs_gui.c:497
+msgid "Conduits"
+msgstr "Arabirimler"
+
+#. Shortdate
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
+msgstr "K�sa tarih bi�imi"
+
+#. Longdate
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
+msgstr "Uzun tarih bi�imi"
+
+#. Time
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
+msgstr "Saat bi�imi"
+
+#. GTK colors file
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
+msgstr "GTK renkleri dosyam "
+
+#. Port
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Problemi E�zamanla"
+
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr "Seri Oran�"
+
+#. Number of backups
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Ar�ivlenecek yedekleme say�s� "
 
 #. Show deleted files check box
-#: ../prefs_gui.c:577
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Silinmi� kay�tlar� g�ster (�ntan�ml� HAYIR)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:581
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "De�i�tirilmi� silinmi� kay�tlar� g�ster (�ntan�ml� HAYIR)"
 
-#: ../prefs_gui.c:586
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "Dosya y�klemek i�in onay sor (J-Pilot -> PDA) (�ntan�ml� EVET)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:590
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Beliriveren ara� ipu�lar�n� g�ster (�ntan�ml� EVET)"
 
-#: ../prefs_gui.c:602
-msgid "Use Datebook database (Palm OS <= 3.5)"
+#: ../prefs_gui.c:666
+#, fuzzy
+msgid "Use Datebook database (Palm OS < 5.2.1)"
 msgstr "RandevuDefteri veritaban�n� kullan (Palm OS <= 3.5)"
 
-#: ../prefs_gui.c:605
-msgid "Use Calendar database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:669
+#, fuzzy
+msgid "Use Calendar database (Palm OS > 5.2)"
 msgstr "Takvim veritaban�n� kullan (PalmOS >= 4.0)"
 
 #. Show highlight days check box
-#: ../prefs_gui.c:632
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Randevulu takvim g�nlerini vurgula"
 
-#. Show use DateBk check box
-#: ../prefs_gui.c:638
-msgid "Use DateBk note tags"
-msgstr "DateBK not etiketlerini kullan"
-
-#: ../prefs_gui.c:641
-msgid "DateBk support disabled in this build"
-msgstr "DateBk deste�i bu s�r�mde devre d��� b�rak�lm��t�r"
-
 #. Highlight today on month and week view
-#: ../prefs_gui.c:648
+#: ../prefs_gui.c:700
 msgid "Annotate today in day, week, and month views"
 msgstr "Bug�n� g�n, hafta ve ay g�sterimlerinde i�aretle"
 
-#: ../prefs_gui.c:653
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
 msgid "Append years on anniversaries in day, week, and month views"
 msgstr "Y�ld�n�mlerinin ka��nc� oldu�unu g�n, hafta ve ay g�r�n�mlerine ekle"
 
-#: ../prefs_gui.c:664
-msgid "Use Address database (Palm OS <= 3.5)"
+#. Show use DateBk check box
+#: ../prefs_gui.c:710
+msgid "Use DateBk note tags"
+msgstr "DateBK not etiketlerini kullan"
+
+#: ../prefs_gui.c:713
+msgid "DateBk support disabled in this build"
+msgstr "DateBk deste�i bu s�r�mde devre d��� b�rak�lm��t�r"
+
+#: ../prefs_gui.c:725
+#, fuzzy
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr "Adres veritaban�n� kullan (Palm OS <= 3.5)"
 
-#: ../prefs_gui.c:667
-msgid "Use Contacts database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:728
+#, fuzzy
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr "Ba�lant�lar veritaban�n� kullan (Palm OS >= 4.0)"
 
-#: ../prefs_gui.c:696
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "G�nderme Komutu"
 
-#: ../prefs_gui.c:710
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s e-posta adresiyle de�i�tirildi"
 
-#: ../prefs_gui.c:722
-msgid "Use ToDo database (Palm OS <= 3.5) "
+#: ../prefs_gui.c:783
+#, fuzzy
+msgid "Use ToDo database (Palm OS < 5.2.1)"
 msgstr "�� Listesi veritaban�n� kullan (Palm OS <= 3.5) "
 
-#: ../prefs_gui.c:725
-msgid "Use Task database (Palm OS >= 4.0) "
+#: ../prefs_gui.c:786
+#, fuzzy
+msgid "Use Task database (Palm OS > 5.2)"
 msgstr "G�rev veritaban�n� kullan (Palm OS >= 4.0)"
 
-#. The hide completed check box
-#: ../prefs_gui.c:752
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Tamamlanm�� ��leri Gizle"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:756
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "S�resi hen�z dolmam�� ��leri gizle"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:760
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Tamamlanma Tarihini Kaydet"
 
 #. Use Manana check box
-#: ../prefs_gui.c:765
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Manana veritaban�n� kullan"
 
-#: ../prefs_gui.c:773
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "�ntan�ml� m�hleti kullan"
 
-#: ../prefs_gui.c:794
-msgid "Use Memo database (Palm OS <= 3.5)"
+#: ../prefs_gui.c:856
+#, fuzzy
+msgid "Use Memo database (Palm OS < 5.2.1)"
 msgstr "Not veritaban�n� kullan (Palm OS <= 3.5)"
 
-#: ../prefs_gui.c:797
-msgid "Use Memos database (Palm OS >= 4.0)"
+#: ../prefs_gui.c:859
+#, fuzzy
+msgid "Use Memos database (Palm OS > 5.2)"
 msgstr "Notlar veritaban�n� kullan (Palm OS >= 4.0)"
 
-#: ../prefs_gui.c:800
+#: ../prefs_gui.c:862
 msgid "Use Memo32 database (pedit32)"
 msgstr "Memo32 veritaban�n� kullan (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:847
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Randevu an�msat�c�lar� i�in alarm pencereleri a�"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:851
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Bu komutu �al��t�r"
 
-#. Shell warning
-#: ../prefs_gui.c:855
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "UYARI: Kabuk komutlar�n� geli�ig�zel �al��t�rmak tehlikeli olabilir!!!"
 
-#: ../prefs_gui.c:863
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Alarm Komutu"
 
-#: ../prefs_gui.c:876
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t, alarm saatine d�n��t�r�ld�"
 
-#: ../prefs_gui.c:880
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d, alarm tarihine d�n��t�r�ld�"
 
-#: ../prefs_gui.c:885
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D, alarm tan�m�na d�n��t�r�ld�"
 
-#: ../prefs_gui.c:889
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N, alarm notuna d�n��t�r�ld�"
 
-#: ../prefs_gui.c:893
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (a��klama yedeklemesi) bu s�r�mde devre d��� b�rak�lm��t�r"
 
-#: ../prefs_gui.c:897
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (not yedeklemesi) bu s�r�mde devre d��� b�rak�lm��t�r"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:906
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Randevu defterini e�zamanla"
 
-#. Show sync address check box
-#: ../prefs_gui.c:910
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Adresleri e�zamanla"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:914
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "�� listesini e�zamanla"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:925
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Notlar� e�zamanla"
 
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:930
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Manana'y� E�zamanla"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:936
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "J-OS kullan (Japonca PalmOS de�il:WorkPad/CLIE)"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:949
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "E�zamanlan�yor %s (%s)"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Yazd�rma Se�enekleri"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Ka��t Boyutu"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "G�nl�k Yaz�c� ��kt�s�"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Haftal�k Yaz�c� ��kt�s�"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Ayl�k Yaz�c� ��kt�s�"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "Bir kay�t"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Bir %s kayd� silindi."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Bu s�n�ftaki t�m kay�tlar"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "T�m kay�tlar� yazd�r"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Her sayfada bir kay�t"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " her kay�t aras�na bo� sat�r"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Yazd�rma Komutu (�rn:lpr, ya da cat > dosya.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:238
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Avu�i�ini Geri Y�kle"
 
-#: ../restore_gui.c:178
-msgid ""
-"Unable to convert filename for GTK display\n"
-"See console log to find which file will not be restored"
+#: ../restore_gui.c:174 ../restore_gui.c:176
+#, fuzzy
+msgid "Unable to convert filename for GTK display\n"
 msgstr ""
 "GTK g�sterimi i�in dosya ad� d�n��t�r�lemedi\n"
-"Hangi dosyan�n geri y�klenemeyece�ini bulmak i�in konsol k�t���ne bak�n�z"
+"%s dosyas� geri y�klenmeyecek\n"
 
-#: ../restore_gui.c:180
-#, c-format
-msgid ""
-"Unable to convert filename for GTK display\n"
-"File %s will not be restored\n"
+#: ../restore_gui.c:175
+#, fuzzy
+msgid "See console log to find which file will not be restored\n"
 msgstr ""
 "GTK g�sterimi i�in dosya ad� d�n��t�r�lemedi\n"
-"%s dosyas� geri y�klenmeyecek\n"
+"Hangi dosyan�n geri y�klenemeyece�ini bulmak i�in konsol k�t���ne bak�n�z"
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Y�klenecek dosyalar"
 
 #. Label for instructions
-#: ../restore_gui.c:258
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Avu�i�ini geri y�klemek i�in:"
 
-#: ../restore_gui.c:261
-msgid "1. Choose all the applications you wish to restore.  The default is all."
-msgstr "1. Geri y�klemek istedi�iniz t�m uygulamalar� se�iniz.  �ntan�m t�m�n� se�er."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
+msgstr ""
+"1. Geri y�klemek istedi�iniz t�m uygulamalar� se�iniz.  �ntan�m t�m�n� se�er."
 
-#: ../restore_gui.c:264
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Kullan�c� �sim ve Numaras�n� giriniz."
 
-#: ../restore_gui.c:267
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Tamam d��mesine bas�n�z."
 
-#: ../restore_gui.c:270
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Bu i�lem, halen avu�i�inde kay�tl� verilerin �zerine yazacakt�r."
 
-#: ../restore_gui.c:291
-msgid "User Name"
-msgstr "Kullan�c� Ad�"
-
-#: ../search_gui.c:123
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "Randevu defteri"
 
-#: ../search_gui.c:204
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "Adres"
 
-#: ../search_gui.c:270
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "i� listesi"
 
-#: ../search_gui.c:324
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "Notlar"
 
-#: ../search_gui.c:380
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "Notlar"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "eklenti ?"
 
-#: ../search_gui.c:458
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Kay�t bulunamad�"
 
-#: ../search_gui.c:559 ../search_gui.c:622
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Arama"
 
-#: ../search_gui.c:575
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Aranacak: "
 
-#: ../search_gui.c:582
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "B�y�k/k���k harf duyarl�"
 
-#: ../sync.c:142
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "kilit dosyas� a�ma ba�ar�s�z\n"
 
-#: ../sync.c:155
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "kilitleme ba�ar�s�z\n"
 
-#: ../sync.c:158
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "e�zamanlama dosyas� pid %d taraf�ndan kilitlendi\n"
 
-#: ../sync.c:192
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "kilit a�ma ba�ar�s�z\n"
 
-#: ../sync.c:195
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "e�zamanlama pid %d taraf�ndan kilitlendi\n"
 
-#: ../sync.c:286
-#, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s: kaidedeki e�zamanlama (hotsync) d��mesine bas�n�z ya da \"kill %d\"\n"
-
-#: ../sync.c:339
-#, c-format
-msgid "Exiting with status %s\n"
-msgstr "%s durumuyla ��k�l�yor\n"
-
-#: ../sync.c:340
-msgid "Finished\n"
-msgstr "Bitti\n"
-
-#: ../sync.c:474
-msgid "Finished installing user information.\n"
-msgstr "Kullan�c� bilgisi y�klemesi bitti.\n"
-
-#: ../sync.c:499 ../sync.c:617
-msgid "Check your serial port and settings\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
 msgstr "Seri ba�lant�y� ve ayarlar�n� kontrol ediniz\n"
 
-#: ../sync.c:802
-#, c-format
-msgid " Syncing on device %s\n"
-msgstr "%s ayg�t� e�zamanlan�yor\n"
-
-#: ../sync.c:803
-msgid " Press the HotSync button now\n"
-msgstr " Otomatik E�zamanlama (HotSync) d��mesine bas�n�z\n"
-
-#: ../sync.c:855 ../sync.c:877 ../sync.c:899
-#, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "Son E�zamanlanm�� Kullan�c� Ad�-->\"%s\"\n"
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "Ev dizini okunamad�\n"
 
-#: ../sync.c:856 ../sync.c:878 ../sync.c:900
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "Son E�zamanlanm�� Kullan�c� No-->\"%d\"\n"
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (Olu�turucu No '%s') g�ncel, atland�.\n"
 
-#: ../sync.c:857 ../sync.c:879 ../sync.c:901
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr " Bu Kullan�c� Ad�-->\"%s\"\n"
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "'%s' al�n�yor (Olu�turucu No '%s')... "
 
-#: ../sync.c:858 ../sync.c:880 ../sync.c:902
+#: ../sync.c:1096 ../sync.c:1433
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr " Bu Kullan�c� No-->%d\n"
+msgid "Failed, unable to create file %s\n"
+msgstr "Ba�ar�s�z, dosya olu�turulamad�, %s\n"
 
-#: ../sync.c:923
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
-msgid "Username is \"%s\"\n"
-msgstr "Kullan�c� Ad� \"%s\"\n"
+msgid "Failed, unable to back up database %s\n"
+msgstr "Ba�ar�s�z, %s veritaban� yedeklenemedi\n"
+
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "Tamam\n"
 
-#: ../sync.c:924
+#: ../sync.c:1304
 #, c-format
-msgid "User ID is %d\n"
-msgstr "Kullan�c� No %d\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "%s atlan�yor (Olu�turucu No '%s')\n"
 
-#: ../sync.c:926 ../sync.c:934
+#: ../sync.c:1498
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "Son E�zamanlanan PC = %d\n"
+msgid "Installing %s "
+msgstr "%s y�kleniyor "
 
-#: ../sync.c:927
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
-msgid "This PC = %lu\n"
-msgstr "Bu PC = %lu\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Dosya a��lam�yor: '%s': %s!\n"
 
-#: ../sync.c:930
+#: ../sync.c:1508
 #, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Son Kullan�c� Ad� = [%s]\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Dosya e�zamanlanam�yor: '%s': bozulmu� dosya?\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(Olu�turucu No '%s')..."
 
-#: ../sync.c:931
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(Olu�turucu No '%s')..."
+
+#: ../sync.c:1530
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "Son Kullan�c� No = %d\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:932
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "Kullan�c� Ad� = [%s]\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"Dosya a��lamad�: %s\n"
 
-#: ../sync.c:933
+#: ../sync.c:1615
 #, c-format
-msgid "userID = %d\n"
-msgstr "Kullan�c� No = %d\n"
+msgid "Install %s failed"
+msgstr "%s y�klenemedi"
 
-#: ../sync.c:951
-msgid "Sync canceled\n"
-msgstr "E�zamanlama iptal edildi\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Ba�ar�s�z.\n"
 
-#: ../sync.c:974
-msgid "Finished restoring handheld.\n"
-msgstr "Avu�i�inin geri y�klenmesi bitti.\n"
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "%s y�klendi "
 
-#: ../sync.c:975
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "J-Pilot'u g�ncellemek i�in e�zamanlamal�s�n�z.\n"
+#: ../sync.c:1736
+#, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d uyg bilgisi almada hata %s\n"
 
-#: ../sync.c:1006
-msgid "Doing a fast sync.\n"
-msgstr "H�zl� e�zamanlan�yor.\n"
+#: ../sync.c:1742 ../sync.c:1772
+#, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d uyg bilgisi paketini a�mada hata %s\n"
 
-#: ../sync.c:1019
-msgid "Doing a slow sync.\n"
-msgstr "Yava� e�zamanlan�yor.\n"
+#: ../sync.c:1763
+#, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "appinfo blo�u %s i�in okuma s�ras�nda hata\n"
 
-#: ../sync.c:1094
-msgid "Thank you for using J-Pilot."
-msgstr "J-Pilot kulland���n�z i�in te�ekk�rler..."
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "Uzak'a (remote) %s kategorisi eklenemedi.\n"
 
-#: ../sync.c:1139
-msgid "Finished.\n"
-msgstr "Bitti.\n"
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "Uzak'ta (remote) �ok say�da kategori.\n"
+
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "%1$s'in masa �st�ndeki t�m kay�tlar %2$s'e ta��nacak.\n"
 
-#: ../sync.c:1179 ../sync.c:2923
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "%s E�zamanlan�yor\n"
 
-#: ../sync.c:1187 ../sync.c:2496 ../sync.c:2931
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Bir %s kayd� yaz�ld�."
 
-#: ../sync.c:1189 ../sync.c:2498 ../sync.c:2933
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Bir %s kayd� yaz�lamad�."
 
-#: ../sync.c:1191 ../sync.c:2500 ../sync.c:2935
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Bir %s kayd� silinemedi."
 
-#: ../sync.c:1193 ../sync.c:2502 ../sync.c:2937
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Bir %s kayd� silindi."
 
-#: ../sync.c:1195 ../sync.c:2504
+#: ../sync.c:2122 ../sync.c:2475
 #, c-format
 msgid "Sync Conflict: duplicated an %s record."
 msgstr "Sync Conflict: bir %s kayd� �iftlendi."
 
-#: ../sync.c:1198 ../sync.c:2507 ../sync.c:2940
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Bir %s kayd� yaz�ld�."
 
-#: ../sync.c:1200 ../sync.c:2509 ../sync.c:2942
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Bir %s kayd� yaz�lamad�."
 
-#: ../sync.c:1202 ../sync.c:2511 ../sync.c:2944
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Bir %s kayd� silinemedi."
 
-#: ../sync.c:1204 ../sync.c:2513 ../sync.c:2946
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Bir %s kayd� silindi."
 
-#: ../sync.c:1206 ../sync.c:2515
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
 msgid "Sync Conflict: duplicated a %s record."
 msgstr "Sync Conflict: bir %s kayd� �iftlendi."
 
-#: ../sync.c:1228
+#: ../sync.c:2237 ../sync.c:2567
 #, c-format
-msgid "number of records = %d\n"
-msgstr "kay�t say�s� = %d\n"
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:1376 ../sync.c:2668
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2297,760 +2862,838 @@ msgstr ""
 "dlp_DeleteRecord ba�ar�s�z\n"
 "Kayd�n, avu�i�inden daha �nceden silinmi� olmas�na ba�l� olabilir\n"
 
-#: ../sync.c:1551 ../sync.c:1994
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (Olu�turucu No '%s') g�ncel, atland�.\n"
-
-#: ../sync.c:1555 ../sync.c:1998
-#, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "'%s' al�n�yor (Olu�turucu No '%s')... "
-
-#: ../sync.c:1562 ../sync.c:2004
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Ba�ar�s�z, dosya olu�turulamad�, %s\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "Kullan�c� bilgisi y�klemesi bitti.\n"
 
-#: ../sync.c:1573 ../sync.c:2013
+#: ../sync.c:3094
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Ba�ar�s�z, %s veritaban� yedeklenemedi\n"
+msgid " Syncing on device %s\n"
+msgstr "%s ayg�t� e�zamanlan�yor\n"
 
-#: ../sync.c:1577 ../sync.c:2017 ../sync.c:2199
-msgid "OK\n"
-msgstr "Tamam\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " Otomatik E�zamanlama (HotSync) d��mesine bas�n�z\n"
 
-#: ../sync.c:1870
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "%s atlan�yor (Olu�turucu No '%s')\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "Son E�zamanlanm�� Kullan�c� Ad�-->\"%s\"\n"
 
-#: ../sync.c:2085
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Installing %s "
-msgstr "%s y�kleniyor "
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "Son E�zamanlanm�� Kullan�c� No-->\"%d\"\n"
 
-#: ../sync.c:2091
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"Dosya a��lam�yor: '%s': %s!\n"
+msgid " This Username-->\"%s\"\n"
+msgstr " Bu Kullan�c� Ad�-->\"%s\"\n"
 
-#: ../sync.c:2095
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"Dosya e�zamanlanam�yor: '%s': bozulmu� dosya?\n"
+msgid " This User ID-->%d\n"
+msgstr " Bu Kullan�c� No-->%d\n"
 
-#: ../sync.c:2107
+#: ../sync.c:3204
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(Olu�turucu No '%s')..."
+msgid "Username is \"%s\"\n"
+msgstr "Kullan�c� Ad� \"%s\"\n"
 
-#: ../sync.c:2127 ../sync.c:2140 ../sync.c:2155 ../sync.c:2168
+#: ../sync.c:3205
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"Dosya a��lamad�: %s\n"
+msgid "User ID is %d\n"
+msgstr "Kullan�c� No %d\n"
 
-#: ../sync.c:2184
+#: ../sync.c:3207
 #, c-format
-msgid "Install %s failed"
-msgstr "%s y�klenemedi"
-
-#: ../sync.c:2188
-msgid "Failed.\n"
-msgstr "Ba�ar�s�z.\n"
+msgid "lastSyncPC = %d\n"
+msgstr "Son E�zamanlanan PC = %d\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:2195
+#: ../sync.c:3208
 #, c-format
-msgid "Installed %s "
-msgstr "%s y�klendi "
+msgid "This PC = %lu\n"
+msgstr "Bu PC = %lu\n"
 
-#: ../sync.c:2219 ../sync.c:2225
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Dosya a��lamad�: %s%s\n"
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "E�zamanlama iptal edildi\n"
 
-#: ../sync.c:2404
-msgid "Unable to read home dir\n"
-msgstr "Ev dizini okunamad�\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "Avu�i�inin geri y�klenmesi bitti.\n"
 
-#: ../sync.c:3025
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "avu�i�i: kay�t say�s� = %d\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "J-Pilot'u g�ncellemek i�in e�zamanlamal�s�n�z.\n"
 
-#: ../sync.c:3026
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "disk: kay�t say�s� = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "H�zl� e�zamanlan�yor.\n"
 
-#: ../sync.c:3258
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d uyg bilgisi almada hata %s\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "Yava� e�zamanlan�yor.\n"
 
-#: ../sync.c:3264 ../sync.c:3305
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d uyg bilgisi paketini a�mada hata %s\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "J-Pilot kulland���n�z i�in te�ekk�rler..."
 
-#: ../sync.c:3286 ../sync.c:3298
-#, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "appinfo blo�u %s i�in okuma s�ras�nda hata\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "Bitti.\n"
 
-#. Fix - need a func for this logging
-#: ../sync.c:3442 ../sync.c:3446
+#: ../sync.c:3446
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "Uzak'a (remote) %s kategorisi eklenemedi.\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#: ../sync.c:3443 ../sync.c:3449
+#: ../sync.c:3447
 #, c-format
-msgid "Too many categories on remote.\n"
-msgstr "Uzak'ta (remote) �ok say�da kategori.\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:3444 ../sync.c:3452
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "%1$s'in masa �st�ndeki t�m kay�tlar %2$s'e ta��nacak.\n"
+msgid "Exiting with status %s\n"
+msgstr "%s durumuyla ��k�l�yor\n"
 
-#: ../todo.c:247
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "�� listesi a��klama metni > %d �ok uzun, %d'e k�salt�l�yor\n"
 
-#: ../todo.c:253
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "�� listesi notu > %1$d �ok uzun, %2$d'ye k�salt�l�yor\n"
 
-#: ../todo.c:378
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Kategori bilgisi okumada hata %s\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Sonlanma Tarihi"
 
-#: ../todo_gui.c:536
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Dosya i�listesi.dat bi�eminde g�z�km�yor\n"
 
-#: ../todo_gui.c:692 ../todo_gui.c:707
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "%d i� listesi ihra� edilemiyor\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Sonlanma Tarihi"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Sonlanma Tarihi"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "�ncelik: "
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Tamamland�"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "�ncelik, erim d���nda\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1092
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Tarih yok"
 
-#. The completed check box
-#: ../todo_gui.c:2226
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Tamamland�"
 
-#: ../todo_gui.c:2234
-msgid "Priority: "
-msgstr "�ncelik: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
+msgstr "�ncelik: "
+
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
+msgid "Date Due:"
+msgstr "Sonlanma Tarihi:"
+
+#: ../utils.c:330
+msgid "Today"
+msgstr "Bug�n"
+
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Bo� DB dosyas� bulunamad� %s: %s\n"
+
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " y�klenemeyebilir.\n"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "%s dizini olu�turulam�yor\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s bir dizin..."
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "%s dizininde dosya yazam�yorum\n"
 
-#: ../todo_gui.c:2254
-msgid "Date Due:"
-msgstr "Sonlanma Tarihi:"
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "De�i�tirilen kay�t kaydedilsin mi?"
 
-#. Note textbox
-#: ../todo_gui.c:2316 ../Expense/expense.c:1819 ../KeyRing/keyring.c:2256
-msgid "Note"
-msgstr "Not"
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "De�i�iklikleri bu kay�ta kaydetmek istiyor musunuz?"
 
-#: ../utils.c:79
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v s�r�m� ve derleme se�eneklerini g�sterir ve ��kar.\n"
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Yeni Kay�t kaydedilsin mi?"
 
-#: ../utils.c:81
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d hata ay�klama bilgisini stdout'a g�nderir.\n"
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Bu yeni kayd� kaydetmek istiyor musunuz?"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "sonsuz d�ng�, k�r�l�yor\n"
 
-#: ../utils.c:82
-msgid " -p skips loading plugins.\n"
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr " -p eklentilerin y�klenmesini atlar.\n"
 
-#: ../utils.c:83
-msgid " -a ignores missed alarms since the last time program was run.\n"
-msgstr " -a bu program�n son �al��t�r�l���ndan beri ka��r�lm�� alarmlar� yoksay.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
+msgstr ""
+" -a bu program�n son �al��t�r�l���ndan beri ka��r�lm�� alarmlar� yoksay.\n"
 
-#: ../utils.c:84
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A t�m alarmlar� yoksayar; ge�mi� ve gelecek.\n"
 
-#: ../utils.c:85
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i program�n a��lmas�yla birlikte kendini simgele�tirmesini sa�lar\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:86
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
-msgstr "PILOTPORT ve PILOTRATE �evre de�i�kenleri, hangi porttan ve hangi h�zla\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
+msgstr ""
+"PILOTPORT ve PILOTRATE �evre de�i�kenleri, hangi porttan ve hangi h�zla\n"
 
-#: ../utils.c:87
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr "e�zamanlama yap�laca��n� belirler.\n"
 
-#: ../utils.c:88
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr "E�er PILOTPORT atanmam��sa, /dev/pilot'a �ntan�mlan�r.\n"
 
-#: ../utils.c:114
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Dosya okumada hata"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Derleme tarihi"
 
-#: ../utils.c:115
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "�u se�eneklerle derlendi:"
 
-#: ../utils.c:117
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Y�kleme Yolu"
 
-#: ../utils.c:119
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link s�r�m�"
 
-#: ../utils.c:123
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "USB deste�i"
 
-#: ../utils.c:125 ../utils.c:131 ../utils.c:137 ../utils.c:143 ../utils.c:149
-#: ../utils.c:155 ../utils.c:161
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "evet"
 
-#: ../utils.c:127 ../utils.c:133 ../utils.c:139 ../utils.c:145 ../utils.c:151
-#: ../utils.c:157 ../utils.c:163
-msgid "no"
-msgstr "hay�r"
-
-#: ../utils.c:129
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "�zel kay�t deste�i"
 
-#: ../utils.c:135
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "hay�r"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Datebk deste�i"
 
-#: ../utils.c:141
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Eklenti deste�i"
 
-#: ../utils.c:147
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Manana deste�i"
 
-#: ../utils.c:153
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "NLS deste�i (yabanc� diller)"
 
-#: ../utils.c:159
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "GTK2 deste�i"
 
-#: ../utils.c:273
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Bug�n %A, %x %X"
-
-#: ../utils.c:275
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Bug�n %%A, %s %s"
-
-#: ../utils.c:1180
-msgid "Today"
-msgstr "Bug�n"
+msgid "Can't get HOME environment variable\n"
+msgstr "HOME �evre de�i�keni al�nam�yor\n"
 
-#: ../utils.c:1396
-msgid "Save Changed Record?"
-msgstr "De�i�tirilen kay�t kaydedilsin mi?"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
+msgstr "HOME �evre de�i�keniniz benim i�in �ok uzun\n"
 
-#: ../utils.c:1397
-msgid "Do you want to save the changes to this record?"
-msgstr "De�i�iklikleri bu kay�ta kaydetmek istiyor musunuz?"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Kategorileri D�zenle"
 
-#: ../utils.c:1402
-msgid "Save New Record?"
-msgstr "Yeni Kay�t kaydedilsin mi?"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC No 0.\n"
 
-#: ../utils.c:1403
-msgid "Do you want to save this new record?"
-msgstr "Bu yeni kayd� kaydetmek istiyor musunuz?"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Yeni bir PC No olu�turdum: %lu\n"
 
-#. Not home;
-#: ../utils.c:1423 ../KeyRing/keyring.c:1646
-msgid "Can't get HOME environment variable\n"
-msgstr "HOME �evre de�i�keni al�nam�yor\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1430
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "HOME �evre de�i�keniniz benim i�in �ok uzun\n"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "Bug�n %A, %x %X"
 
-#. Can't create directory
-#: ../utils.c:1455 ../utils.c:1459
+#: ../utils.c:3539
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr "%s dizini olu�turulam�yor\n"
+msgid "Today is %%A, %s %s"
+msgstr "Bug�n %%A, %s %s"
 
-#: ../utils.c:1465
+#: ../utils.c:3768
 #, c-format
 msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
-"%s bir dizin gibi g�r�nm�yor.\n"
-"�yle olmal�(yd�).\n"
-
-#: ../utils.c:1471
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "%s dizininde dosya yazam�yorum\n"
 
-#: ../utils.c:1527 ../utils.c:1536
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "PC ba�l���n� dosyaya yazmada hata: next_id\n"
 
-#: ../utils.c:1532
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
 msgstr "Sonraki kimli�i dosyaya yazmada hata: next_id\n"
 
-#: ../utils.c:1549
-msgid "Error opening file: next_id\n"
-msgstr "Dosya a�mada hata: next_id\n"
-
-#: ../utils.c:1746
-#, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Bo� DB dosyas� bulunamad� %s: %s\n"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1749
-msgid " may not be installed.\n"
-msgstr " y�klenemeyebilir.\n"
-
-#: ../utils.c:1930
-msgid "Error reading file"
-msgstr "Dosya okumada hata"
-
-#: ../utils.c:2671
-msgid "PC ID is 0.\n"
-msgstr "PC No 0.\n"
-
-#: ../utils.c:2672
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Yeni bir PC No olu�turdum: %lu\n"
-
-#: ../weekview_gui.c:328
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Haftal�k G�r�n�m"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Avustralya"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Avusturya"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Bel�ika"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Brezilya"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Danimarka"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (Euro)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Fransa"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Almanya"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "�zlanda"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Hindistan"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Endonezya"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "�rlanda"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "�talya"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Japonya"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Kore"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "L�ksemburg"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Malezya"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Meksika"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Hollanda"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Yeni Zelanda"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Norve�"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "P.R.C."
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Filipinler"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "�spanya"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "�sve�"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "�svi�re"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Tayland"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Birle�ik Krall�k"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "Birle�ik Devletler"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Gider"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1367
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "U�u��creti"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1368
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Kahvalt�"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1369
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Otob�s"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1370
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "��Yemekleri"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1371
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "ArabaKiralama"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1372
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Ak�amYeme�i"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1373
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "E�lence"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1374
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Faks"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1375
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Yak�t"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1376
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Arma�anlar"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1377
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Otel"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1378
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Rastlant�sallar"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1379
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "�ama��r"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1380
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limo"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1381
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Konaklama"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1382
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "��lenYeme�i"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1383
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Uzakl�k(mil)"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1385
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Parketme"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1386
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Posta�creti"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1387
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "At��t�rma"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1388
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Metro"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1389
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Gere�ler"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1390
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Taksi"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1391
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1392
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "�pu�lar�"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1393
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Ge�i��cretleri"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1394
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Tren"
 
-#: ../Expense/expense.c:1167
-msgid "Expense: Unknown category\n"
-msgstr "Gider: Bilinmeyen kategori\n"
-
-#: ../Expense/expense.c:1173
+#: ../Expense/expense.c:1237
 msgid "Expense: Unknown expense type\n"
 msgstr "Gider: Bilinmeyen gider t�r�\n"
 
-#: ../Expense/expense.c:1179
+#: ../Expense/expense.c:1243
 msgid "Expense: Unknown payment type\n"
 msgstr "Gider: Bilinmeyen �deme t�r�\n"
 
-#: ../Expense/expense.c:1356
+#: ../Expense/expense.c:1375
 msgid "American Express"
 msgstr "Amerikan Ekspres"
 
-#: ../Expense/expense.c:1357
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Nakit"
 
-#: ../Expense/expense.c:1358
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "�ek"
 
-#: ../Expense/expense.c:1359
+#: ../Expense/expense.c:1378
 msgid "Credit Card"
 msgstr "Kredi Kart�"
 
-#: ../Expense/expense.c:1360
+#: ../Expense/expense.c:1379
 msgid "Master Card"
 msgstr "Master Kart"
 
-#: ../Expense/expense.c:1361
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "�nceden�denmi�"
 
-#: ../Expense/expense.c:1362
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "T�r:"
+
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Miktar:"
+
 #. Category Menu
-#: ../Expense/expense.c:1644
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "S�n�f:"
 
 #. Type Menu
-#: ../Expense/expense.c:1657
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "T�r:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1670
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "�deme:"
 
 #. Currency Menu
-#: ../Expense/expense.c:1683
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Para birimi:"
 
-#. Date Spinners
-#: ../Expense/expense.c:1696
-msgid "Date:"
-msgstr "Tarih:"
-
-#: ../Expense/expense.c:1713
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Ay:"
 
-#: ../Expense/expense.c:1727
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "G�n:"
 
-#: ../Expense/expense.c:1741
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Y�l:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1754
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Miktar:"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1768
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Sat�c�:"
 
 #. City
-#: ../Expense/expense.c:1782
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "�ehir:"
 
 #. Attendees
-#: ../Expense/expense.c:1796
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Kat�l�mc�lar"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "AnahtarDemeti: pack_KeyRing(): buf_size �ok k���k\n"
 
-#: ../KeyRing/keyring.c:1561
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Yanl��, AnahtarDemeti Parolas�n� Tekrar Giriniz"
 
-#: ../KeyRing/keyring.c:1563
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "YEN� bir AnahtarDemeti Parolas� Giriniz"
 
-#: ../KeyRing/keyring.c:1565
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "AnahtarDemeti Parolas�n� Giriniz"
 
-#: ../KeyRing/keyring.c:1651
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "HOME �evre de�i�keniniz �ok uzun(>1024)\n"
-
-#: ../KeyRing/keyring.c:1656
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "AnahtarDemeti: %s dosyas� bulunamad�.\n"
 
-#: ../KeyRing/keyring.c:1657
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "AnahtarDemeti: E�zamanlamay� deneyin.\n"
 
-#: ../KeyRing/keyring.c:1741 ../KeyRing/keyring.c:1752
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "AnahtarDemeti"
 
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Not ihra� edilemiyor %d\n"
+
 #. Change Password button
-#: ../KeyRing/keyring.c:2039
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3061,55 +3704,239 @@ msgstr ""
 "De�i�tir"
 
 #. Clist
-#: ../KeyRing/keyring.c:2124
+#: ../KeyRing/keyring.c:2564
 msgid "Changed"
 msgstr "De�i�tirildi"
 
-#: ../KeyRing/keyring.c:2126
+#: ../KeyRing/keyring.c:2566
 msgid "Account"
 msgstr "Hesap"
 
 #. Name entry
-#: ../KeyRing/keyring.c:2219
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "isim: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2226
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "hesap: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2233
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "parola: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2240
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr "son de�i�tirme: "
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2250
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Parola Olu�tur"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 msgid "SyncTime"
 msgstr "E�zamanlamaZaman�"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
-msgstr "synctime: Palm OS 3.25 ve 3.30 s�r�mleri E�zamanlamaZaman�'n� desteklemez\n"
+msgstr ""
+"synctime: Palm OS 3.25 ve 3.30 s�r�mleri E�zamanlamaZaman�'n� desteklemez\n"
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr "synctime: pilot �zerinde zaman ayarlanMIyor\n"
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr "synctime: Pilot �zerinde zaman ayarlan�yor... "
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 msgid "Done\n"
 msgstr "Bitti\n"
+
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Dosya �st�ne Yaz�ls�n m�?"
+
+#~ msgid "Field"
+#~ msgstr "Alan"
+
+#~ msgid "email command empty\n"
+#~ msgstr "eposta komutu bo�\n"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "%s%s dosyas� a��lamad�\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "%s alarmlar dosyas� a��lam�yor\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "%s kategorisini d�zenleyemezsiniz.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "%s kategorisini silemezsiniz.\n"
+
+#~ msgid "category name"
+#~ msgstr "kategori ad�"
+
+#~ msgid "debug"
+#~ msgstr "hata ay�klama"
+
+#~ msgid "Close"
+#~ msgstr "Kapat"
+
+#~ msgid "none"
+#~ msgstr "hi�biri/yok"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "RandevudefteriVT'da bilinmeyen yinelemeT�r� bulundu\n"
+
+#~ msgid "W"
+#~ msgstr "�ar"
+
+#~ msgid "M"
+#~ msgstr "Pzt"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Bu olay�n belirli bir zaman� yok"
+
+#~ msgid "Start Time"
+#~ msgstr "Ba�lama Zaman�"
+
+#~ msgid "End Time"
+#~ msgstr "Biti� Zaman�"
+
+#~ msgid "Dismiss"
+#~ msgstr "Bitir"
+
+#~ msgid "Done"
+#~ msgstr "Bitti"
+
+#~ msgid "Add"
+#~ msgstr "Ekle"
+
+#~ msgid "Remove"
+#~ msgstr "��kar"
+
+#~ msgid "User name"
+#~ msgstr "Kullan�c� ad�"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = s�r�m\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = yard�m\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = sorun giderme kipinde �al��\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = eklentileri y�kleme.\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr ""
+#~ " -b = E�zmanaly�n ve daha sonra yedekleyin, ya da yaln�zca e�zamanlay�n.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Ge�ersiz geometri betimlemesi: \"%s\"\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Yard�m/PayBack program�"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "Yaz�tipi Se�me �leti�im Kutusu"
+
+#~ msgid "Clear"
+#~ msgstr "Temizle"
+
+#~ msgid "Show private records"
+#~ msgstr "�zel kay�tlar� g�ster"
+
+#~ msgid "Hide private records"
+#~ msgstr "�zel kay�tlar� gizle"
+
+#~ msgid "Mask private records"
+#~ msgstr "�zel kay�tlar� maskele"
+
+#~ msgid "Font"
+#~ msgstr "Yaz� tipi"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "Men�ye git \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" ve �unu de�i�tir \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "PC kay�t dosyas� a��lam�yor\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "Haftan�n ilk g�n� "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Seri Ba�lant� (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "One record"
+#~ msgstr "Bir kay�t"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr ""
+#~ "%s: kaidedeki e�zamanlama (hotsync) d��mesine bas�n�z ya da \"kill %d\"\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "Bitti\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Son Kullan�c� Ad� = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Son Kullan�c� No = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Kullan�c� Ad� = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "Kullan�c� No = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "avu�i�i: kay�t say�s� = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "disk: kay�t say�s� = %d\n"
+
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr ""
+#~ " -i program�n a��lmas�yla birlikte kendini simgele�tirmesini sa�lar\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s bir dizin gibi g�r�nm�yor.\n"
+#~ "�yle olmal�(yd�).\n"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "Gider: Bilinmeyen kategori\n"
+
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "HOME �evre de�i�keniniz �ok uzun(>1024)\n"
diff --git a/po/uk.po b/po/uk.po
index 02b036e6..bcae0f0b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,40 +8,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.8-pre12\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2005-11-25 17:56+0300\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Скінчилась пам'ять"
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "помилка"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Помилка при читанні інформації категорії %s\n"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Помилка при читанні файлу: %s\n"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "помилка"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -49,413 +61,559 @@ msgstr ""
 "Запис видалений.\n"
 "Щоб внести зміни поверніть його з видаленого стану або скопіюйте.\n"
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Не вдається відкрити файл: %s\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Не вдається відкрити файл: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Формат файлу не схожий на address.dat\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Не представлене"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "Гаразд"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Ні"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "Так"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s є каталогом"
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Помилка при відкриванні файлу"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Бажаєте перезаписати файл %s?"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Перезаписати файл?"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Помилка при відкриванні файлу: %s"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Не вдається експортувати адресу %d\n"
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-msgid "Field"
-msgstr "Поле"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Категорія: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Приватний"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "Ел.адреса"
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Невідомий тип експорту\n"
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "Компанія/Ім'я"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "Ім'я/Компанія"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "Ім'я/Компанія"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Компанія/Ім'я"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Не можна змінювати видалений запис\n"
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Некоректна категорія\n"
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "виконується команда = [%s]\n"
 
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
+
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "помилка блокування\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
 #. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "Категорія: "
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
-msgstr "kana("
-
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
-msgstr "Ел.адреса"
-
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Пошта"
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Дзвонити"
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Без назви-"
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 записів"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d з %d записів"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
-msgstr "Правка категорій"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Ім'я"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Адреса"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Інше"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Примітка"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Швидко знайти: "
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "Скасувати зміни"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Видалити"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Повернути з видаленого стану виділений запис"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Повернути з видаленого стану"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Повернути з видаленого стану виділений запис"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Копіювати"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Копіювати видалений запис"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Новий запис"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Додати новий запис"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Додати запис"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Додати новий запис"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Застосувати зміни"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "Закріпити зміни"
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Приватний"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "Ім'я"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "Адреса"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "Інше"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "Скасувати"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "Усі"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Видалити"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "Показувати\n"
 "у списку"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "Зведення"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "Нагадати"
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "днів"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Усі"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "хвилин"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "годин"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "Нагадати"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "Не вдається відкрити файл %s%s\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "Не вдається відкрити файл: %s%s\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Нагадування про зустріч"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Минула зустріч"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Відстрочена зустріч"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Зустріч"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "Сповіщення J-Pilot"
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr "нескінченний цикл, переривається\n"
-
-#: ../alarms.c:1531
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Не вдається відкрити %s\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-msgid "rename failed"
-msgstr "помилка перейменування"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "PC файл пошкоджений?\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "помилка при fseek() - фатальна помилка\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "помилка перейменування"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Перемістити"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Правка категорій"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Вже використано максимальну кількість категорій (16)"
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Введіть нову категорію"
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 #, fuzzy
 msgid "Edit Categories Error"
 msgstr "Правка категорій"
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Необхідно вибрати категорію для перейменування"
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "Не можна редагувати категорію %s.\n"
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "Введіть нову назву категорії"
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Необхідно вибрати категорію для видалення"
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr "Не можна видалити категорію %s.\n"
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
@@ -463,200 +621,337 @@ msgstr ""
 "%d записів у %s.\n"
 "Ви хочете перемістити їх у %s, чи видалити їх?"
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "неправильний стан файлу %s рядок %d\n"
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "Категорія %s не може використовуватись більше ніж один раз"
 
-#. correctly translate title
-#: ../category.c:813
-msgid "category name"
-msgstr "назва категорії"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "Категорія:"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "Створити"
 
-#: ../category.c:845
+#: ../category.c:841
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: ../category.c:960
-msgid "debug"
-msgstr "налагодження"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "невідомий тип ="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "кількість полів на рядок != %d, невідомий формат\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "кількість полів != %d, невідомий формат\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Невідомий формат, файл має неправильну схему\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Схема файлу:"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "Має бути:"
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr ""
 "%s:%d Запис %d, поле %d: Неправильний тип.  Очікувалось %d, знайдено %d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "читання файлу перервано\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "У DatebookDB знайдено невідомий repeatType (%d)\n"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Повторюється у:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Повторюється у дні:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Повторюється у:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Повторюється у дні:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Повторюється у дні:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Повторюється у дні:"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "Нд"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "Пн"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "Вт"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "Ср"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "Чт"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "Пн"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "Сб"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Дата закінчення"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Повторюється у дні:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "кількість записів = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Примітка"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Сповіщення"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Повторюється у:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "День тижня"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Текст опису зустрічі > %d, обрізано до %d\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Помилка"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Формат файлу не схожий на  datebook.dat\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "Невідомий тип експорту"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Експорт"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Експортувати усі записи календар"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Зберегти як"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Огляд"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Категорії календаря"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "Закрити"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Немає"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Дата початку"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Дата закінчення"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Неділя"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Понеділок"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Середа"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Четвер"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Субота"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "4-й"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Останній"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -671,69 +966,74 @@ msgstr ""
 "%s місяця.\n"
 "Що ви обираєте?"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "Запитання?"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Це періодична подія.\n"
 "Бажаєте застосувати ці зміни\n"
 "лише до ПОТОЧНОЇ події,\n"
 "чи до усіх таких подій?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Поточна"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "немає"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "день"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "тиждень"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "місяць"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "рік"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Зустріч, що повторюється кожні %d %s(s) неможлива.\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
+#, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr "Щотижнева зустріч, що не повторюється у жоден із днів тижня неможлива."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Час не вказано"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Неправильна зустріч"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -741,182 +1041,162 @@ msgstr ""
 "Дата закінчення цієї зустрічі більш рання,\n"
 "ніж дата початку."
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Дату не вказано"
 
-#: ../datebook_gui.c:3021
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "Помилка у DateBookDB advanceUnits = %d\n"
 
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "Знайдено невідомий repeatType у DatebookDB\n"
-
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a., %s"
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (СЬОГОДНІ)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Тиждень"
 
-#: ../datebook_gui.c:4206
-msgid "W"
-msgstr "Тж"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "Переглянути зустрічі тижня"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Місяць"
 
-#: ../datebook_gui.c:4218
-msgid "M"
-msgstr "Мс"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "Переглянути зустрічі місяця"
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Категорії"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Час"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Показувати завдання"
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Завдання"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "До"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Сповіщення"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "днів"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "Ця подія не має особливого часу"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "Дата:"
 
-#: ../datebook_gui.c:4493
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Починається"
 
-#: ../datebook_gui.c:4507
-msgid "Start Time"
-msgstr "Час початку"
-
-#: ../datebook_gui.c:4525
-msgid "End Time"
-msgstr "Час закінчення"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "Закінчується"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "Теги DateBk"
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "День"
 
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Рік"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Ця подія не повторюється"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Повторюється кожен"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "день"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Закінчується"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "тиждень"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "Повторюється у дні:"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "місяць"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Повторюється у:"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "День тижня"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Дата"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "рік"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Набирання номера"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Префікс 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Префікс 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Префікс 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "номер телефону:"
 
@@ -924,242 +1204,139 @@ msgstr "номер телефону:"
 msgid "Extension"
 msgstr "Розширення"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "Команда набирання"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "Відпустити"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Огляд файлів"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Виберіть записи для експорту"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Користуйтесь клавішами Ctrl та Shift"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Імпорт"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr ""
-"Щоб змінити прихований каталог, наберіть його назву нижче та натисніть Tab"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "Завершено"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "Тип файлу імпорту"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "Запис позначений як приватний"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "Запис не позначений як приватний"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "Перед імпортом категорія була: [%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Запис був у категорії [%s]"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Імпортувати усе"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Пропустити"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "Встановити"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr ""
+"Щоб змінити прихований каталог, наберіть його назву нижче та натисніть Tab"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "Файли, що будуть встановлені"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Тип файлу імпорту"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "Додати"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "Файли, що будуть встановлені"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "Видалити"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Встановити"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/Файл/Встановити користувача"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "Ім'я користувача"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "Ідентифікатор користувача"
 
-#: ../jpilot-dump.c:95
-#, fuzzy
-msgid " +D +A +T +M format like date +format.\n"
-msgstr ""
-" +B +M +A +T дата відповідна до формату +format (використовуйте -? для "
-"докладнішої інформації).\n"
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr " -v вивести версію та завершитись.\n"
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr " -h вивести версію та завершитись.\n"
-
-#: ../jpilot-dump.c:98
-#, fuzzy
-msgid " -f displays help for format codes.\n"
-msgstr " -h вивести версію та завершитись.\n"
-
-#: ../jpilot-dump.c:99
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr " -B дамп календаря.\n"
-
-#: ../jpilot-dump.c:100
-#, fuzzy
-msgid " -N dump appts for today in DateBook.\n"
-msgstr " -N дамп програми сьогодні у календарі.\n"
-
-#: ../jpilot-dump.c:101
-#, fuzzy
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr " -NYYYY/MM/DD дамп програм у YYYY/MM/DD у календарі.\n"
-
-#: ../jpilot-dump.c:102
-msgid " -A dump Address book.\n"
-msgstr " -A дамп адресної книги.\n"
-
-#: ../jpilot-dump.c:103
-#, fuzzy
-msgid " -T dump ToDo list as CSV.\n"
-msgstr " -T дамп списку завдань у CSV.\n"
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr " -M дамп пам'яток.\n"
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-" Читаються параметри J-Pilot для визначення порта, швидкості, кількості "
-"резервних копій, тощо.\n"
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr " -v = версія\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr " -h = довідка\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = запустити у налагоджувальному режимі\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = не завантажувати модулі.\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr ""
-" -b = синхронізувати а потім робити резервну копію, чи просто "
-"синхронізувати.\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr ""
-" -l = циклічно, у іншому випадку один раз виконати синхронізацію та вийти.\n"
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr ""
-" -p {порт} = Використовувати цей порт для синхронізації замість отримання "
-"параметрів.\n"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Неправильно вказано геометрію: \"%s\"\n"
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "Друк"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Для цього каналу друк не підтримується."
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Для цього каналу імпорт не підтримується."
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Для цього каналу експорт не підтримується."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Скасувати синхронізацію"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Назва або ідентифікатор користувача цього пристрою palm\n"
@@ -1168,14 +1345,16 @@ msgstr ""
 "ефектів. Якщо щось незрозуміло, читайте довідку користувача."
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Ідентифікатор користувача цього пристрою palm дорівнює NULL.\n"
@@ -1186,246 +1365,226 @@ msgstr ""
 "програму install-user, або пункт меню Встановити користувача.\n"
 "Якщо щось незрозуміло, читайте довідку користувача."
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Скасувати синхронізацію"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Синхронізувати все одно"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Помилка синхронізації"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr "Користувач: "
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "Невідома команда від процесу синхронізації\n"
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Про %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Файл/tear"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Файл/З_найти"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Файл/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Файл/_Встановити"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Файл/Імпорт"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Файл/Експорт"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Файл/Вподобання"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Файл/Д_рук"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Файл/Встановити користувача"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Файл/Відновити КПК"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Файл/Ви_йти"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Вигляд"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Вигляд/Сховати приватні записи"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Вигляд/Показати приватні записи"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Вигляд/Маскувати приватні записи"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Файл/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Вигляд/Календар"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Вигляд/Адресна книга"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Вигляд/Завдання"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Вигляд/Пам'ятки"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/_Модулі"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/Netscape"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/Mozilla"
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/Galeon"
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/Opera"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/GnomeUrl"
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/Lynx"
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/Links"
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W3M"
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/Konqueror"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/_Довідка"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/Довідка/Програма PayBack"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 #, fuzzy
 msgid "/Help/About J-Pilot"
 msgstr "/Довідка/J-Pilot"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/_Модулі/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/_Довідка/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr "Діалог вибору шрифту"
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:0"
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "Не завантажено модулі.\n"
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "Ігноруються усі сповіщення.\n"
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "Ігноруються останні сповіщення.\n"
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "Не вдається відкрити канал\n"
 
-#: ../jpilot.c:2422
-msgid " User: "
-msgstr "Користувач: "
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "Очистити"
-
-#: ../jpilot.c:2649
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "Показати приватні записи   Ctrl-Z"
 
-#: ../jpilot.c:2654
-msgid "Show private records"
-msgstr "Показати приватні записи"
-
-#: ../jpilot.c:2659
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "Сховати приватні записи   Ctrl-Z"
 
-#: ../jpilot.c:2664
-msgid "Hide private records"
-msgstr "Сховати приватні записи"
-
-#: ../jpilot.c:2669
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "Маскувати приватні записи   Ctrl-Z"
 
-#: ../jpilot.c:2674
-msgid "Mask private records"
-msgstr "Маскувати приватні записи"
-
-#: ../jpilot.c:2684
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Синхронізувати palm з програмою   Ctrl-Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
-msgid "Font"
-msgstr "Шрифт"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Синхронізувати адреси"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1433,41 +1592,43 @@ msgstr ""
 "Синхронізувати palm з програмою\n"
 "потім зробити резервну копію"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Календар/Перейти на сьогодні"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Перелік завдань"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Блокнот пам'яток"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "Виконати зараз"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Нагадати пізніше"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "Більше не згадувати!"
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 "J-Pilot використовує графічну бібліотеку GTK2. Ця версія бібліотеки "
 "використовує UTF-8 для кодування символів.\n"
@@ -1475,751 +1636,1210 @@ msgstr ""
 "(наприклад символи з акцентами).\n"
 "\n"
 
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr "Перейдіть в меню \""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
-msgstr "\" та змініть \""
-
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Набір символів "
 
-#: ../jpilot.c:2898
-msgid "\"."
-msgstr "\"."
-
-#: ../jpilot.c:2900
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Виберіть кодування UTF-8"
 
-#: ../libplugin.c:153
-#, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "Невідома версія заголовка PC = %d\n"
-
-#: ../libplugin.c:416
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d Помилка відкривання файлу: %s\n"
-
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Помилка читання файлу: %s\n"
-
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+#: ../jpilot-dump.c:92
+#, fuzzy, c-format
+msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
-"Цей запис вже видалено.\n"
-"Він запланований на видалення з Palm при черговій синхронізації.\n"
+" +B +M +A +T дата відповідна до формату +format (використовуйте -? для "
+"докладнішої інформації).\n"
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-msgid "Unable to open PC records file\n"
-msgstr "Не вдається відкрити файл записів PC\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v вивести версію та завершитись.\n"
 
-#: ../libplugin.c:493 ../utils.c:1959
-msgid "Couldn't find record to delete\n"
-msgstr "Не вдається знайти запис для видалення\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h вивести версію та завершитись.\n"
 
-#: ../libplugin.c:511 ../utils.c:1977
-#, c-format
-msgid "Unknown header version %d\n"
-msgstr "Невідома версія заголовка %d\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -h вивести версію та завершитись.\n"
 
-#: ../libplugin.c:524
-msgid "Couldn't open PC records file\n"
-msgstr "Не вдається відкрити файл записів PC\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -B дамп календаря.\n"
 
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "Error opening file: %s\n"
-msgstr "Помилка при відкриванні файлу: %s\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: ../libplugin.c:714
-msgid "Error reading PC file 1\n"
-msgstr "Помилка при читанні файлу PC 1\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N дамп програми сьогодні у календарі.\n"
 
-#: ../libplugin.c:730
-msgid "Error reading PC file 2\n"
-msgstr "Помилка при читанні файлу PC 1\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr " -NYYYY/MM/DD дамп програм у YYYY/MM/DD у календарі.\n"
 
-#: ../libplugin.c:903
-#, c-format
-msgid "Error reading %s 5\n"
-msgstr "Помилка при читанні %s 5\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr " -A дамп адресної книги.\n"
 
-#: ../log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Не вдається відкрити файл журналу, спроби закінчені.\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -T дамп списку завдань у CSV.\n"
+
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M дамп пам'яток.\n"
 
-#: ../log.c:102
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "Не вдається відкрити файл журналу\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "Довжина тексту пам'ятки > 65535, обрізується\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "Не вдається відкрити файл: %s\n"
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "Імпортована пам'ятка %s\n"
-
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Формат файлу не схожий на формат memopad.dat\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "Не вдається експортувати %d\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "Перегляд місяця"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Пароль Palm"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Некоректний, введіть пароль PalmOS"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "Введіть пароль PalmOS"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "нескінчений цикл"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "при читанні %s%s рядок 1:[%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
-msgstr "Неправильна версія\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
-msgstr "Перевірте параметри->канали\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
-"Помилка відкривання у модулі [%s]\n"
-" помилка [%s]\n"
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " модуль неправильний: [%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: ../plugins.c:296
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "Модуль:[%s]\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../plugins.c:297
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
+
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+" Читаються параметри J-Pilot для визначення порта, швидкості, кількості "
+"резервних копій, тощо.\n"
+
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v вивести версію та параметри компіляції.\n"
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d вивести налагоджувальну інформацію у стандартний вивід.\n"
+
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr "Не завантажено модулі.\n"
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr ""
+" -l = циклічно, у іншому випадку один раз виконати синхронізацію та вийти.\n"
+
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+" -p {порт} = Використовувати цей порт для синхронізації замість отримання "
+"параметрів.\n"
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Помилка при відкриванні файлу: %s\n"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Помилка при відкриванні файлу: next_id\n"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Помилка"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "Значення змінної оточення HOME надто довге\n"
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"Цей запис вже видалено.\n"
+"Він запланований на видалення з Palm при черговій синхронізації.\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "Не вдається відкрити файл записів PC\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "Не вдається знайти запис для видалення\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "Невідома версія заголовка %d\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d Помилка відкривання файлу: %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Помилка читання файлу: %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "Помилка при відкриванні файлу: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "Помилка при читанні %s 5\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "Помилка при читанні файлу PC 1\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "Помилка при читанні файлу PC 1\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "Невідома версія заголовка PC = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Не вдається відкрити файл журналу, спроби закінчені.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "Не вдається відкрити файл журналу\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "Довжина тексту пам'ятки > 65535, обрізується\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "Імпортована пам'ятка %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Формат файлу не схожий на формат memopad.dat\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "Не вдається експортувати %d\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Блокнот пам'яток"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Перегляд місяця"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Пароль Palm"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Некоректний, введіть пароль PalmOS"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Введіть пароль PalmOS"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Помилка при читанні файлу: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "нескінчений цикл"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "при читанні %s%s рядок 1:[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "Неправильна версія\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "Перевірте параметри->канали\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"Помилка відкривання у модулі [%s]\n"
+" помилка [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " модуль неправильний: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "Модуль:[%s]\n"
+
+#: ../plugins.c:298
 #, c-format
 msgid "This plugin is version (%d.%d).\n"
 msgstr "Цей модуль версії (%d.%d).\n"
 
-#: ../plugins.c:299
+#: ../plugins.c:300
 msgid "It is too old to work with this version of J-Pilot.\n"
 msgstr "Занадто давній та не підтримується цією версією J-Pilot.\n"
 
-#: ../prefs.c:393
+#: ../prefs.c:418
 msgid "%B %d, %Y"
 msgstr "%B %d, %Y"
 
-#: ../prefs.c:394
+#: ../prefs.c:419
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../prefs.c:395
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr "%d. %B %Y"
 
-#: ../prefs.c:396
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr "%d %B, %Y"
 
-#: ../prefs.c:397
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr "%Y. %B. %d"
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr "%Y %B %d"
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "Вподобання"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "Локаль"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "Параметри"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr "Календар"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "Завдання"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "Пам'ятки"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "Сповіщення"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "Канали"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "Короткий формат дати "
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "Довгий формат дати "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "Формат часу "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "Перший день тижня "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "Файл власних GTK кольорів "
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Послідовний порт (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Помилка синхронізації"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr "Швидкість послідовного порта (не впливає на USB)"
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "Кількість резервних копій"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "Показувати видалені записи (типово НІ)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Показувати змінені записи (типово НІ)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "Підтверджувати встановлення файлів (J-Pilot -> PDA) (типово ТАК)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Показувати підказки (типово ТАК)"
 
-#. ********************************************************************
-#. Datebook preference tab
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Підсвічувати дні календаря із зустрічами"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr "Відмічати сьогоднішній день при перегляді дня, тижня та місяця"
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr "Додавати роки до річниць при перегляді дня, тижня та місяця "
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "Використовувати DateBk тег приміток"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "Підтримка DateBk вимкнена у цій збірці"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
-msgstr "Відмічати сьогоднішній день при перегляді дня, тижня та місяця"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
+msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
-msgstr "Додавати роки до річниць при перегляді дня, тижня та місяця "
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
+msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Команда перевірки пошти"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s замінено на адресу ел.пошти"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Приховувати завершені завдання"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Приховувати незавершені завдання"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Записувати дату завершення"
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Використовувати базу даних Manana"
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "Використовувати типову кількість потрібних днів"
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Використовувати Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Відкривати вікна сповіщення для нагадування"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Виконати цю команду"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: виконання довільних сценаріїв оболонки може бути небезпечним!!!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Команда сповіщення"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t замінюється на час сповіщення"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d замінюється на дату сповіщення"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D замінюється на опис сповіщення"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N замінюється на примітку сповіщення"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (підстановку опису) вимкнено у цій збірці"
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%D (підстановку приміток) вимкнено у цій збірці"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Синхронізувати календар"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Синхронізувати адреси"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Синхронізувати завдання"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Синхронізувати пам'ятки"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "Синхронізувати memo32 (pedit32)"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Синхронізувати Manana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Використовувати J-OS (Не японська PalmOS:WorkPad/CLIE)"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "Триває синхронізація %s (%s)"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Параметри друку"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Розмір паперу"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Роздрук дня"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Роздрук тижня"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Роздрук місяць"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "Один запис"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Видалено запис %s."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Усі записи у цій категорії"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "Друкувати усі записи"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Один запис на сторінку"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " порожніх рядків між записами"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Команда друку (наприклад lpr, або cat > file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Відновити КПК"
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Файли, що будуть встановлені"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Щоб відновити КПК:"
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr ""
 "1. Виберіть усі додатки, які слід відновити.  Типово відновлюються усі."
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Введіть ім'я та ідентифікатор користувача."
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Натисніть кнопку Гаразд."
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Це призведе до запису даних у КПК."
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "Ім'я користувача"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "календар"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "адреса"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "завдання"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "пам'ятки"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "пам'ятки"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "модуль ?"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Записів не знайдено"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Пошук"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Шукати: "
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Враховувати регістр"
 
-#: ../sync.c:139
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "Не вдається відкрити файл блокування\n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "помилка блокування\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "файл синхронізації заблокований процесом з номером %d\n"
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "помилка розблокування\n"
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "синхронізацію заблоковано процесом з номером %d\n"
 
-#: ../sync.c:244
-#, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr ""
-"%s: натисніть кнопку ГарячаСинхронізація на пристрої або виконайте \"kill %d"
-"\"\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "Перевірте параметри послідовного порта\n"
 
-#: ../sync.c:297
-#, c-format
-msgid "Exiting with status %s\n"
-msgstr "Завершення зі статусом %s\n"
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "Не вдається прочитати домашній каталог\n"
 
-#: ../sync.c:298
-msgid "Finished\n"
-msgstr "Завершено\n"
+#: ../sync.c:1085 ../sync.c:1423
+#, c-format
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (ID автора '%s') оновлено, отримання пропущено.\n"
 
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
-msgstr "Завершено занесення інформації про користувача.\n"
+#: ../sync.c:1089 ../sync.c:1427
+#, c-format
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Отримується '%s' (ID автора '%s')... "
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "Перевірте параметри послідовного порта\n"
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "Помилка, не вдається створити файл %s\n"
 
-#: ../sync.c:674
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
-msgid " Syncing on device %s\n"
-msgstr " Синхронізація на пристрій %s\n"
+msgid "Failed, unable to back up database %s\n"
+msgstr "Помилка, не вдається створити резервну копію бази даних %s\n"
 
-#: ../sync.c:675
-msgid " Press the HotSync button now\n"
-msgstr " Зараз натисніть кнопку ГарячаСинхронізація\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "Гаразд\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:1304
 #, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "Останнє синхронізоване ім'я користувача-->\"%s\"\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "Пропускається %s (ID автора '%s')\n"
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:1498
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "Останнє синхронізований ID користувача-->\"%d\"\n"
+msgid "Installing %s "
+msgstr "Встановлюється %s "
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr " Це ім'я користувача-->\"%s\"\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Не вдається відкрити файл '%s': %s!\n"
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:1508
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr " Цей ID користувача-->\"%d\"\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Не вдається синхронізувати файл '%s': файл пошкоджений?\n"
 
-#: ../sync.c:795
-#, c-format
-msgid "Username is \"%s\"\n"
-msgstr "Ім'я користувача \"%s\"\n"
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(ID автора '%s')..."
 
-#: ../sync.c:796
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(ID автора '%s')..."
+
+#: ../sync.c:1530
 #, c-format
-msgid "User ID is %d\n"
-msgstr "ID користувача %d\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "lastSyncPC = %d\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"Не вдається відкрити файл: %s\n"
 
-#: ../sync.c:799
+#: ../sync.c:1615
 #, c-format
-msgid "This PC = %lu\n"
-msgstr "Цей PC = %lu\n"
+msgid "Install %s failed"
+msgstr "Встановлення %s завершилось помилкою"
+
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Помилка.\n"
+
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "Встановлено %s "
 
-#: ../sync.c:800
+#: ../sync.c:1736
 #, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Останнє ім'я = [%s]\n"
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d Помилка отримання інформації про додаток %s\n"
 
-#: ../sync.c:801
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "Останній ID користувача = %d\n"
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d Помилка розпаковування інформації про додаток %s\n"
 
-#: ../sync.c:802
+#: ../sync.c:1763
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "Ім'я користувача = [%s]\n"
+msgid "Error reading appinfo block for %s\n"
+msgstr "Помилка читання блоку інформації про додаток для %s\n"
 
-#: ../sync.c:803
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
 #, c-format
-msgid "userID = %d\n"
-msgstr "userID = %d\n"
-
-#: ../sync.c:821
-msgid "Sync canceled\n"
-msgstr "Синхронізацію перервано\n"
-
-#: ../sync.c:843
-msgid "Finished restoring handheld.\n"
-msgstr "Відновлення КПК завершено.\n"
-
-#: ../sync.c:844
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "Необхідна синхронізація для оновлення J-Pilot.\n"
-
-#: ../sync.c:874
-msgid "Doing a fast sync.\n"
-msgstr "Виконується швидка синхронізація.\n"
-
-#: ../sync.c:913
-msgid "Doing a slow sync.\n"
-msgstr "Виконується повільна синхронізація.\n"
+msgid "Could not add category %s to remote.\n"
+msgstr "Не вдається додати категорію %s до віддаленої сторони.\n"
 
-#: ../sync.c:1014
-msgid "Thank you for using J-Pilot."
-msgstr "Дякуємо за використання J-Pilot."
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "Надто багато категорій для віддаленої сторони.\n"
 
-#: ../sync.c:1056
-msgid "Finished.\n"
-msgstr "Завершено.\n"
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Усі записи програми у %s будуть переміщені у %s.\n"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Триває синхронізація %s\n"
 
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Записано запис %s."
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Записування запису %s завершився помилкою."
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Видалення запису %s завершився помилкою."
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Видалено запис %s."
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "Видалено запис %s."
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Записано запис %s."
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Записування запису %s завершився помилкою."
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Видалення запису %s завершився помилкою."
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Видалено запис %s."
 
-#: ../sync.c:1133
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "number of records = %d\n"
-msgstr "кількість записів = %d\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
+
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:1260 ../sync.c:2435
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2227,785 +2847,836 @@ msgstr ""
 "Помилка у dlp_DeleteRecord()\n"
 "Це може бути через те, що запис був вже видалений у Palm\n"
 
-#: ../sync.c:1358 ../sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (ID автора '%s') оновлено, отримання пропущено.\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "Завершено занесення інформації про користувача.\n"
 
-#: ../sync.c:1362 ../sync.c:1774
+#: ../sync.c:3094
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Отримується '%s' (ID автора '%s')... "
+msgid " Syncing on device %s\n"
+msgstr " Синхронізація на пристрій %s\n"
 
-#: ../sync.c:1369 ../sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Помилка, не вдається створити файл %s\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " Зараз натисніть кнопку ГарячаСинхронізація\n"
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Помилка, не вдається створити резервну копію бази даних %s\n"
-
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "Гаразд\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "Останнє синхронізоване ім'я користувача-->\"%s\"\n"
 
-#: ../sync.c:1687
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "Пропускається %s (ID автора '%s')\n"
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "Останнє синхронізований ID користувача-->\"%d\"\n"
 
-#: ../sync.c:1861
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid "Installing %s "
-msgstr "Встановлюється %s "
+msgid " This Username-->\"%s\"\n"
+msgstr " Це ім'я користувача-->\"%s\"\n"
 
-#: ../sync.c:1867
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"Не вдається відкрити файл '%s': %s!\n"
+msgid " This User ID-->%d\n"
+msgstr " Цей ID користувача-->\"%d\"\n"
 
-#: ../sync.c:1871
+#: ../sync.c:3204
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"Не вдається синхронізувати файл '%s': файл пошкоджений?\n"
+msgid "Username is \"%s\"\n"
+msgstr "Ім'я користувача \"%s\"\n"
 
-#: ../sync.c:1883
+#: ../sync.c:3205
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(ID автора '%s')..."
+msgid "User ID is %d\n"
+msgstr "ID користувача %d\n"
 
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
+#: ../sync.c:3207
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"Не вдається відкрити файл: %s\n"
+msgid "lastSyncPC = %d\n"
+msgstr "lastSyncPC = %d\n"
 
-#: ../sync.c:1960
+#: ../sync.c:3208
 #, c-format
-msgid "Install %s failed"
-msgstr "Встановлення %s завершилось помилкою"
-
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "Помилка.\n"
+msgid "This PC = %lu\n"
+msgstr "Цей PC = %lu\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
-#, c-format
-msgid "Installed %s "
-msgstr "Встановлено %s "
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "Синхронізацію перервано\n"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Не вдається відкрити файл: %s%s\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "Відновлення КПК завершено.\n"
 
-#: ../sync.c:2180
-msgid "Unable to read home dir\n"
-msgstr "Не вдається прочитати домашній каталог\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "Необхідна синхронізація для оновлення J-Pilot.\n"
 
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: кількість записів = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "Виконується швидка синхронізація.\n"
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "disk: кількість записів = %d\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "Виконується повільна синхронізація.\n"
 
-#: ../sync.c:2888
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d Помилка отримання інформації про додаток %s\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "Дякуємо за використання J-Pilot."
 
-#: ../sync.c:2894 ../sync.c:2936
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d Помилка розпаковування інформації про додаток %s\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "Завершено.\n"
 
-#: ../sync.c:2916 ../sync.c:2928
+#: ../sync.c:3446
 #, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Помилка читання блоку інформації про додаток для %s\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
+#: ../sync.c:3447
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "Не вдається додати категорію %s до віддаленої сторони.\n"
-
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
-msgstr "Надто багато категорій для віддаленої сторони.\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Усі записи програми у %s будуть переміщені у %s.\n"
+msgid "Exiting with status %s\n"
+msgstr "Завершення зі статусом %s\n"
 
-#: ../todo.c:248
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "Текст опису завдання > %d, обрізано до %d\n"
 
-#: ../todo.c:255
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "Текст пам'ятки до завдання > %d, обрізано до %d\n"
 
-#: ../todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Помилка при читанні інформації категорії %s\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Дата завершення"
 
-#: ../todo_gui.c:535
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Формат файлу не схожий на формат todo.dat\n"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "Не вдається експортувати список завдань %d\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Дата завершення"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Дата завершення"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "Пріоритет: "
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Завершено"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "Пріоритет поза межами\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "Немає дати"
 
-#. The completed check box
-#: ../todo_gui.c:2206
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../todo_gui.c:2214
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "Пріоритет: "
 
-#: ../todo_gui.c:2234
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "Дата завершення:"
 
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "Примітка"
+#: ../utils.c:330
+msgid "Today"
+msgstr "Сьогодні"
 
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v вивести версію та параметри компіляції.\n"
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Не вдається знайти порожній DB файл %s: %s\n"
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d вивести налагоджувальну інформацію у стандартний вивід.\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " можливо не встановлений.\n"
 
-#: ../utils.c:75
-#, fuzzy
-msgid " -p skips loading plugins.\n"
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "Не можна видалити категорію %s.\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s є каталогом"
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "Не вдається записати файли у каталоги %s\n"
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Зберегти змінені записи?"
+
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Бажаєте зберегти зміни у цьому записі?"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Зберегти новий запис?"
+
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Бажаєте зберегти цей новий запис?"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "нескінченний цикл, переривається\n"
+
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr "Не завантажено модулі.\n"
 
-#: ../utils.c:76
-#, fuzzy
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr " -a ігнорувати пропущені з моменту останнього запуску сповіщення.\n"
 
-#: ../utils.c:77
-#, fuzzy
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A ігнорувати усі сповіщення)); минулі та майбутні.\n"
 
-#: ../utils.c:78
-#, fuzzy
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i мінімізувати jpilot після запуску\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " Змінні оточення PILOTPORT та PILOTRATE використовуються для\n"
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " визначення порта та швидкості синхронізації.\n"
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " Якщо PILOTPORT не встановлено, то типове значення /dev/pilot.\n"
 
-#: ../utils.c:107
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Помилка при читанні файлу"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Дата завершення"
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Скомпільовано з цими параметрами:"
 
-#: ../utils.c:110
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Шлях встановлення"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "версія pilot-link"
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "Підтримка USB"
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "так"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-msgid "no"
-msgstr "ні"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Підтримка приватних записів"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "ні"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Підтримка Datebk"
 
-#: ../utils.c:134
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Підтримка модулів"
 
-#: ../utils.c:140
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Підтримка Manana"
 
-#: ../utils.c:146
-msgid "NLS support (foreign languages)"
-msgstr "Підтримка NLS (національні мови)"
+#: ../utils.c:2008
+msgid "NLS support (foreign languages)"
+msgstr "Підтримка NLS (національні мови)"
+
+#: ../utils.c:2014
+msgid "GTK2 support"
+msgstr "Підтримка GTK2"
+
+#. No HOME var
+#: ../utils.c:2057
+#, c-format
+msgid "Can't get HOME environment variable\n"
+msgstr "Не вдається отримати змінну оточення HOME\n"
+
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
+msgstr "Значення змінної оточення HOME надто довге\n"
+
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Правка категорій"
+
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC ID дорівнює 0.\n"
+
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Створено новий PC ID.  Він дорівнює %lu\n"
 
-#: ../utils.c:152
-msgid "GTK2 support"
-msgstr "Підтримка GTK2"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:207
+#: ../utils.c:3537
 #, c-format
 msgid "Today is %A, %x %X"
 msgstr "Сьогодні %A, %x %X"
 
-#: ../utils.c:209
+#: ../utils.c:3539
 #, c-format
 msgid "Today is %%A, %s %s"
 msgstr "Сьогодні %%A, %s %s"
 
-#: ../utils.c:1114
-msgid "Today"
-msgstr "Сьогодні"
-
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "Зберегти змінені записи?"
-
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "Бажаєте зберегти зміни у цьому записі?"
-
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "Зберегти новий запис?"
-
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "Бажаєте зберегти цей новий запис?"
-
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
-msgid "Can't get HOME environment variable\n"
-msgstr "Не вдається отримати змінну оточення HOME\n"
-
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "Значення змінної оточення HOME надто довге\n"
-
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
-#, c-format
-msgid "Can't create directory %s\n"
-msgstr "Не можна видалити категорію %s.\n"
-
-#: ../utils.c:1399
+#: ../utils.c:3768
 #, c-format
 msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
-"%s не схожий на каталог.\n"
-"Має бути каталогом.\n"
-
-#: ../utils.c:1405
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "Не вдається записати файли у каталоги %s\n"
 
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "Помилка запису заголовку PC у файл: next_id\n"
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
 msgstr "Помилка запису наступного ідентифікатора у файл: next_id\n"
 
-#: ../utils.c:1483
-msgid "Error opening file: next_id\n"
-msgstr "Помилка при відкриванні файлу: next_id\n"
-
-#: ../utils.c:1657
-#, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Не вдається знайти порожній DB файл %s: %s\n"
-
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-msgid " may not be installed.\n"
-msgstr " можливо не встановлений.\n"
-
-#: ../utils.c:1839
-msgid "Error reading file"
-msgstr "Помилка при читанні файлу"
-
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC ID дорівнює 0.\n"
-
-#: ../utils.c:2517
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Створено новий PC ID.  Він дорівнює %lu\n"
-
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Перегляд тижня"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Австралія"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Австрія"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Бельгія"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Бразилія"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Канада"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Данія"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (Євро)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Фінляндія"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Франція"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Німеччина"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Гонг Конг"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Ісландія"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Індія"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Індонезія"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Ірландія"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Італія"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Японія"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Корея"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Люксембург"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Малайзія"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Мексика"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Голландія"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Нова Зеландія"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Норвегія"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "P.R.C."
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Філіппіни"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Сінгапур"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Іспанія"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Швеція"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Швейцарія"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Таїланд"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Велика Британія"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "США"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Видатки"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Авіатариф"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Сніданок"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Автобус"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Бізнес Ланч"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Оренда машин"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Обід"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Розваги"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Факс"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Газ"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Дарунки"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Готель"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Випадковості"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Пральня"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Limo"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Житло"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Ланч"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Проїзд"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Паркування"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Поштові"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Закуска"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Метро"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Постачальники"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Таксі"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Особливі"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Мито"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Поїзд"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
-msgstr "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr "Витрати: невідомий тип витрат\n"
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr "Витрати: Невідомий тип платежу\n"
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "American Express"
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Готівка"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Чеки"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
-msgstr "Кредитні картки"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
+msgstr "Кредитна картка"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
-msgstr "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
+msgstr "Master Card"
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Передплачені"
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr "Витрати: невідома категорія\n"
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr "Витрати: невідомий тип витрат\n"
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr "Витрати: Невідомий тип платежу\n"
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr "American Express"
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "Кредитна картка"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Тип:"
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr "Master Card"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Сума:"
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Категорія:"
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Тип:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Оплата:"
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Валюта:"
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-msgid "Date:"
-msgstr "Дата:"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Місяць:"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "День:"
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Рік:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Сума:"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Виробник:"
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "Місто:"
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Супровід"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "В'язка ключів: pack_KeyRing(): надто мале значення buf_size\n"
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Некоректно, введіть повторно пароль до в'язки ключів"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Введіть НОВИЙ пароль в'язки ключів"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Введіть пароль в'язки ключів"
 
-#: ../KeyRing/keyring.c:1636
-#, fuzzy
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "Значення змінної оточення HOME надто довге\n"
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "В'язка ключів: файл %s не існує.\n"
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "В'язка ключів: спроба синхронізації.\n"
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "В'язка ключів"
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "Скасувати"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "Рахунок"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Не вдається експортувати %d\n"
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3015,53 +3686,265 @@ msgstr ""
 "пароль\n"
 "в'язки ключів"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "Скасувати"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "Рахунок"
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "ім'я: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "рахунок: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "пароль: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Створити пароль"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "Синхронізувати пам'ятки"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "Завершено"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Перезаписати файл"
+
+#~ msgid "Field"
+#~ msgstr "Поле"
+
+#~ msgid "kana("
+#~ msgstr "kana("
+
+#~ msgid "Quick View"
+#~ msgstr "Зведення"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Не вдається відкрити файл %s%s\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Не вдається відкрити %s\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "Не можна редагувати категорію %s.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "Не можна видалити категорію %s.\n"
+
+#~ msgid "category name"
+#~ msgstr "назва категорії"
+
+#~ msgid "debug"
+#~ msgstr "налагодження"
+
+#~ msgid "Close"
+#~ msgstr "Закрити"
+
+#~ msgid "none"
+#~ msgstr "немає"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "Знайдено невідомий repeatType у DatebookDB\n"
+
+#~ msgid "W"
+#~ msgstr "Тж"
+
+#~ msgid "M"
+#~ msgstr "Мс"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Ця подія не має особливого часу"
+
+#~ msgid "Start Time"
+#~ msgstr "Час початку"
+
+#~ msgid "End Time"
+#~ msgstr "Час закінчення"
+
+#~ msgid "Dismiss"
+#~ msgstr "Відпустити"
+
+#~ msgid "Done"
+#~ msgstr "Завершено"
+
+#~ msgid "Add"
+#~ msgstr "Додати"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Ім'я користувача"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = версія\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = довідка\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = запустити у налагоджувальному режимі\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = не завантажувати модулі.\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr ""
+#~ " -b = синхронізувати а потім робити резервну копію, чи просто "
+#~ "синхронізувати.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Неправильно вказано геометрію: \"%s\"\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Довідка/Програма PayBack"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "Діалог вибору шрифту"
+
+#~ msgid "Clear"
+#~ msgstr "Очистити"
+
+#~ msgid "Show private records"
+#~ msgstr "Показати приватні записи"
+
+#~ msgid "Hide private records"
+#~ msgstr "Сховати приватні записи"
+
+#~ msgid "Mask private records"
+#~ msgstr "Маскувати приватні записи"
+
+#~ msgid "Font"
+#~ msgstr "Шрифт"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "Перейдіть в меню \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" та змініть \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Не вдається відкрити файл записів PC\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "Перший день тижня "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Послідовний порт (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "Швидкість послідовного порта (не впливає на USB)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "Синхронізувати memo32 (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "Один запис"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr ""
+#~ "%s: натисніть кнопку ГарячаСинхронізація на пристрої або виконайте \"kill "
+#~ "%d\"\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "Завершено\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Останнє ім'я = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "Останній ID користувача = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Ім'я користувача = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "userID = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: кількість записів = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "disk: кількість записів = %d\n"
+
+#, fuzzy
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i мінімізувати jpilot після запуску\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s не схожий на каталог.\n"
+#~ "Має бути каталогом.\n"
+
+#~ msgid "AmEx"
+#~ msgstr "AmEx"
+
+#~ msgid "CreditCard"
+#~ msgstr "Кредитні картки"
+
+#~ msgid "MasterCard"
+#~ msgstr "MasterCard"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "Витрати: невідома категорія\n"
+
+#, fuzzy
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "Значення змінної оточення HOME надто довге\n"
+
 #~ msgid "Quit"
 #~ msgstr "Вийти"
 
@@ -3071,9 +3954,6 @@ msgstr "Завершено"
 #~ msgid "Directory"
 #~ msgstr "Каталог"
 
-#~ msgid "Overwrite File"
-#~ msgstr "Перезаписати файл"
-
 #~ msgid "Filename"
 #~ msgstr "Назва файлу"
 
diff --git a/po/vi.po b/po/vi.po
index 96b665b5..220dadd1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,44 +1,59 @@
 # Vietnamese translation for JPilot.
 # Copyright © 2006 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: jpilot-0.99.8-pre12\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2005-10-07 22:31+0200\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2006-02-09 20:14+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\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"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.6b36\n"
 
-#: address.c:288 address.c:552 alarms.c:352 dat.c:181 dat.c:655 dat.c:857
-#: dat.c:991 dat.c:1130 datebook.c:96 datebook.c:397 datebook.c:404
-#: datebook.c:434 datebook.c:1053 jpilot.c:1534 libplugin.c:467
-#: libplugin.c:646 libplugin.c:753 libplugin.c:832 libplugin.c:873 memo.c:95
-#: memo.c:367 plugins.c:108 prefs.c:314 prefs.c:339 prefs.c:854 sync.c:252
-#: sync.c:1153 sync.c:2320 todo.c:206 todo.c:548 utils.c:2307
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "Hết bộ nhớ"
 
-#: address.c:345 address.c:352 datebook.c:347 libplugin.c:179 memo.c:163
-#: memo.c:170 todo.c:291 todo.c:298 utils.c:1965 utils.c:1970 utils.c:1981
-#: utils.c:1986 utils.c:1997 utils.c:2002 utils.c:2014 utils.c:2019
-msgid "error"
-msgstr "lỗi"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d Gặp lỗi khi đọc thông tin phân loại %s\n"
 
-#: address.c:412 address_gui.c:1686 datebook.c:693 libplugin.c:706
-#: libplugin.c:730 memo.c:244 memo_gui.c:996 todo_gui.c:1318
-#: Expense/expense.c:1138 Expense/expense.c:2152
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Gặp lỗi khi đọc tập tin: %s\n"
 
-#: address_gui.c:261 datebook_gui.c:2524 memo_gui.c:184 todo_gui.c:305
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "lỗi"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -46,362 +61,557 @@ msgstr ""
 "Mục ghi này bị xoá bỏ.\n"
 "Để thay đổi gì, hãy hủy xoá bỏ nó hoặc sao chép nó.\n"
 
-#: address_gui.c:469 category.c:159 category.c:165 category.c:213
-#: category.c:270 datebook_gui.c:372 memo_gui.c:301 sync.c:1116 sync.c:1122
-#: sync.c:2295 sync.c:2515 sync.c:2521 sync.c:2638 sync.c:2904 todo_gui.c:445
-#: utils.c:2721 utils.c:2770 utils.c:2776 utils.c:2849 utils.c:2855
-#: utils.c:2918 utils.c:2981 utils.c:2987 utils.c:3050 utils.c:3057
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "Không thể mở tập tin: %s\n"
 
-#: address_gui.c:548
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "Không thể mở tập tin: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "Tập tin này có vẻ không phải là tập tin dạng <địa_chỉ.dat>.\n"
 
-#: address_gui.c:558 datebook_gui.c:582 memo_gui.c:436 todo_gui.c:571
-#: Expense/expense.c:619 Expense/expense.c:1406
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "Chưa ghi lưu"
 
-#: address_gui.c:697 alarms.c:226 category.c:420 category.c:871 category.c:911
-#: datebook_gui.c:669 datebook_gui.c:1149 export_gui.c:339 jpilot.c:363
-#: jpilot.c:409 jpilot.c:477 jpilot.c:521 jpilot.c:968 jpilot.c:1869
-#: memo_gui.c:526 password.c:352 restore_gui.c:307 todo_gui.c:661 utils.c:1084
-#: utils.c:1256 KeyRing/keyring.c:1322
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
+#. current category name
+#. previous category name
+#. entry text, in Pilot character set
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "Được"
 
-#: address_gui.c:698 datebook_gui.c:670 memo_gui.c:527 todo_gui.c:662
-#: utils.c:1274
-msgid "Yes"
-msgstr "Có"
-
-#: address_gui.c:698 datebook_gui.c:670 memo_gui.c:527 todo_gui.c:662
-#: utils.c:1274
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "Không"
 
-#: address_gui.c:722 datebook_gui.c:697 memo_gui.c:537 todo_gui.c:688
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
+msgid "Yes"
+msgstr "Có"
+
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s là thư mục"
 
-#: address_gui.c:724 address_gui.c:741 datebook_gui.c:699 datebook_gui.c:716
-#: memo_gui.c:539 memo_gui.c:556 todo_gui.c:690 todo_gui.c:707
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "Gặp lỗi khi mở tập tin"
 
-#: address_gui.c:725 datebook_gui.c:700 memo_gui.c:540 todo_gui.c:691
-msgid "Directory"
-msgstr "Thư mục"
-
-#: address_gui.c:728 datebook_gui.c:703 memo_gui.c:543 todo_gui.c:694
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "Bạn có muốn ghi đè lên tập tin %s không?"
 
-#: address_gui.c:730 datebook_gui.c:705 memo_gui.c:545 todo_gui.c:696
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "Ghi đè tập tin không?"
 
-#: address_gui.c:731 datebook_gui.c:706 memo_gui.c:546 todo_gui.c:697
-msgid "Overwrite File"
-msgstr "Ghi đè tập tin"
-
-#: address_gui.c:739 datebook_gui.c:714 memo_gui.c:554 todo_gui.c:705
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Gặp lỗi khi mở tập tin: %s"
 
-#: address_gui.c:742 datebook_gui.c:717 memo_gui.c:557 todo_gui.c:708
-msgid "Filename"
-msgstr "Tên tập tin"
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
 
-#: address_gui.c:750
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "Không thể xuất địa chỉ %d.\n"
 
-#: address_gui.c:815 address_gui.c:823 address_gui.c:840
-msgid "Field"
-msgstr "Trường"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "Loại: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "Riêng"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "Thư điện tử"
 
-#: address_gui.c:1039 datebook_gui.c:985 memo_gui.c:612 todo_gui.c:844
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "Kiểu xuất lạ\n"
 
-#: address_gui.c:1230 address_gui.c:2655
-msgid "Company/Name"
-msgstr "Công ty/Tên"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
 
-#: address_gui.c:1232 address_gui.c:2657
-msgid "Name/Company"
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
 msgstr "Tên/Công ty"
 
-#: address_gui.c:1330 datebook_gui.c:2602 memo_gui.c:913 todo_gui.c:1246
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
+msgstr "Tên/Công ty"
+
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "Công ty/Tên"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "Bạn không thể sửa đổi một mục ghi bị xoá bỏ.\n"
 
-#: address_gui.c:1473 address_gui.c:1857 address_gui.c:2368 memo_gui.c:821
-#: memo_gui.c:1079 memo_gui.c:1358 todo_gui.c:1112 todo_gui.c:1515
-#: todo_gui.c:1528 todo_gui.c:1961
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "Phân loại không được phép\n"
 
-#: address_gui.c:1531 alarms.c:607 dialer.c:165
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "đang thực hiện lệnh = [%s]\n"
 
-#: address_gui.c:1775 Expense/expense.c:1603 KeyRing/keyring.c:1577
-#: KeyRing/keyring.c:1656
-msgid "Category: "
-msgstr "Loại: "
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
 
-# Literal: don't translate / Nghĩa chữ: đừng dịch
-#: address_gui.c:1807 address_gui.c:2827
-msgid "kana("
-msgstr "kana("
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
 
-#: address_gui.c:1919 address_gui.c:2937
-msgid "E-mail"
-msgstr "Thư điện tử"
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "việc khoá bị lỗi\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
+#. Category menu
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
+msgid "Category: "
+msgstr "Loại: "
 
-#: address_gui.c:1921 address_gui.c:1924 address_gui.c:2938
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "Lá thư"
 
-#: address_gui.c:1929 address_gui.c:1932 address_gui.c:2941 dialer.c:308
-#: dialer.c:333
+#. Dial Phone Button
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "Quay số"
 
-#: address_gui.c:2142 address_gui.c:2166
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-Không tên-"
 
-#: address_gui.c:2239 memo_gui.c:1268 todo_gui.c:1850
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 mục ghi"
 
-#: address_gui.c:2242 datebook_gui.c:2399 memo_gui.c:1271 todo_gui.c:1853
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%d trên %d bản ghi"
 
-#: address_gui.c:2635 category.c:450 category.c:464 category.c:471
-#: category.c:489 category.c:496 category.c:514 category.c:594 category.c:789
-#: memo_gui.c:1508 todo_gui.c:2116 Expense/expense.c:1609
-msgid "Edit Categories"
-msgstr "Sửa đổi phân loại"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "Tên"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "Địa chỉ"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "Khác"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "Ghi chú"
 
-#: address_gui.c:2662
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
+
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: address_gui.c:2684
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "Tìm nhanh: "
 
-#: address_gui.c:2700 category.c:421 category.c:877 category.c:917
-#: datebook_gui.c:1154 datebook_gui.c:1582 datebook_gui.c:4371
-#: export_gui.c:344 memo_gui.c:1552 password.c:362 print_gui.c:338
-#: restore_gui.c:312 todo_gui.c:2169 utils.c:1094 KeyRing/keyring.c:1332
+#. Cancel button
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "Thôi"
 
-#: address_gui.c:2700 datebook_gui.c:4371 memo_gui.c:1552 todo_gui.c:2169
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "Thôi sửa đổi gì"
 
-#: address_gui.c:2705 category.c:421 category.c:844 datebook_gui.c:4376
-#: memo_gui.c:1557 todo_gui.c:2174 Expense/expense.c:1646
-#: KeyRing/keyring.c:1612
+#. Delete Button
+#. Delete button
+#. Delete Button
+#. Delete button
+#. Delete, Copy, New, etc. buttons
+#. Delete button
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "Xoá bỏ"
 
-#: address_gui.c:2705 datebook_gui.c:4376 memo_gui.c:1557 todo_gui.c:2174
-#: Expense/expense.c:1646 KeyRing/keyring.c:1612
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "Xoá bỏ mục ghi được chọn"
 
-#: address_gui.c:2711 datebook_gui.c:4382 memo_gui.c:1563 todo_gui.c:2180
+#. Undelete Button
+#. Undelete button
+#. Undelete Button
+#. Undelete button
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "Phục hồi"
 
-#: address_gui.c:2711 datebook_gui.c:4382 memo_gui.c:1563 todo_gui.c:2180
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "Phục hồi mục ghi được chọn"
 
-#: address_gui.c:2717 datebook_gui.c:4388 memo_gui.c:1569 todo_gui.c:2186
-#: Expense/expense.c:1651 KeyRing/keyring.c:1617
+#. Copy button
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "Chép"
 
-#: address_gui.c:2717 datebook_gui.c:4388 memo_gui.c:1569 todo_gui.c:2186
-#: Expense/expense.c:1651 KeyRing/keyring.c:1617
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "Sao chép mục ghi được chọn"
 
-#: address_gui.c:2723 datebook_gui.c:4394 memo_gui.c:1575 todo_gui.c:2192
-#: Expense/expense.c:1656 KeyRing/keyring.c:1622
+#. New button
+#. New Record button
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "Mục ghi mới"
 
-#: address_gui.c:2723 datebook_gui.c:4394 memo_gui.c:1575 todo_gui.c:2192
-#: Expense/expense.c:1656 KeyRing/keyring.c:1622
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "Thêm một mục ghi mới"
 
-#: address_gui.c:2728 datebook_gui.c:4400 memo_gui.c:1581 todo_gui.c:2198
-#: Expense/expense.c:1661 KeyRing/keyring.c:1627
+#. "Add Record" button
+#. Add Record button
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "Thêm mục ghi"
 
-#: address_gui.c:2728 datebook_gui.c:4400 memo_gui.c:1581 todo_gui.c:2198
-#: Expense/expense.c:1661 KeyRing/keyring.c:1627
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "Thêm mục ghi mới đó"
 
-#: address_gui.c:2738 datebook_gui.c:4410 memo_gui.c:1591 todo_gui.c:2208
-#: Expense/expense.c:1670 KeyRing/keyring.c:1636
+#. "Apply Changes" button
+#. Apply Changes button
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "Áp dụng thay đổi"
 
-#: address_gui.c:2738 datebook_gui.c:4410 memo_gui.c:1591 todo_gui.c:2208
-#: Expense/expense.c:1670 KeyRing/keyring.c:1636
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "Ghi lưu các sửa đổi"
 
-#: address_gui.c:2755 datebook_gui.c:4461 memo_gui.c:1609 todo_gui.c:2271
+#. Private check box
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "Riêng"
 
-#: address_gui.c:2775 KeyRing/keyring.c:1485
-msgid "Name"
-msgstr "Tên"
-
-#: address_gui.c:2783 prefs_gui.c:370
-msgid "Address"
-msgstr "Địa chỉ"
-
-#: address_gui.c:2791 Expense/expense.c:571 Expense/expense.c:1427
-msgid "Other"
-msgstr "Khác"
+#: ../address_gui.c:4169
+msgid "Change Photo"
+msgstr ""
 
-#: address_gui.c:2799 datebook_gui.c:1332 datebook_gui.c:1582 utils.c:2677
-msgid "All"
-msgstr "Tất cả"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Gỡ bỏ"
 
-#: address_gui.c:3002
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "Hiện trong\n"
 "danh sách"
 
-#: address_gui.c:3010
-msgid "Quick View"
-msgstr "Xem nhanh"
-
-#: alarms.c:232
-msgid "Remind me"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
 msgstr "Nhắc nhở tôi"
 
-#: alarms.c:242 datebook_gui.c:4443
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "Ngày"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "Tất cả"
+
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "Phút"
 
-#: alarms.c:244 datebook_gui.c:4447
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "Giờ"
 
-#: alarms.c:439
+#: ../alarms.c:253
+msgid "Remind me"
+msgstr "Nhắc nhở tôi"
+
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "Không thể mở tập tin %s%s.\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "Không thể mở tập tin: %s%s\n"
 
-#: alarms.c:524
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "Bộ nhắc nhở cuộc hẹn"
 
-#: alarms.c:527
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "Cuộc hẹn qua"
 
-#: alarms.c:530
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "Cuộc hẹn đã hoãn"
 
-#: alarms.c:533 datebook_gui.c:4279
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
-#: alarms.c:614
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "Báo động J-Pilot"
 
-#: alarms.c:1131
-msgid "infinite loop, breaking\n"
-msgstr "bị lặp vô hạn nên ngắt nó\n"
-
-#: alarms.c:1499
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "Không thể mở tập tin <%s.alarms>.\n"
-
-#: category.c:192 sync.c:2552 utils.c:2797 utils.c:2885 utils.c:3007
-#: utils.c:3077
-msgid "rename failed"
-msgstr "việc thay đổi tên bị lỗi"
-
-#: category.c:229 category.c:286 sync.c:1145 sync.c:2311
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "Tập tin PC bị hỏng không?\n"
 
-#: category.c:236 category.c:246 category.c:293 category.c:304 category.c:314
-#: sync.c:1190 sync.c:1210 sync.c:1270 sync.c:1281 sync.c:2373 sync.c:2400
-#: sync.c:2452 sync.c:2462
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "việc fseek bị lỗi — lỗi nghiêm trọng\n"
 
-#: category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "việc thay đổi tên bị lỗi"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "Chuyển"
 
-#: category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "Sửa đổi phân loại"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "Số phân loại tối (16) đa được dùng"
 
-#: category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "Gõ loại mới"
 
-#: category.c:465
+#: ../category.c:451 ../category.c:475
+#, fuzzy
+msgid "Edit Categories Error"
+msgstr "Sửa đổi phân loại"
+
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "Bạn phải chọn phân loại cần thay đổi tên"
 
-#: category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "Bạn không thể hiệu chỉnh phân loại %s.\n"
-
-#: category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "Gõ tên loại mới"
 
-#: category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "Bạn phải chọn phân loại cần xoá bỏ"
 
-#: category.c:494
-#, c-format
-msgid "You can't delete category %s.\n"
-msgstr "Bạn không thể xoá bỏ phân loại %s.\n"
-
-#: category.c:510
+#: ../category.c:494
 #, c-format
 msgid ""
 "There are %d records in %s.\n"
@@ -410,194 +620,338 @@ msgstr ""
 "Có %d mục ghi trong %s.\n"
 "Bạn có muốn di chuyển chúng vào %s, hoặc xoá bỏ chúng không?"
 
-#: category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "tập tin tính trạng không hợp lệ %s, dòng %d\n"
 
-#: category.c:592
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "Không thể dùng phân loại %s nhiều lần."
 
-#: category.c:814
-msgid "category name"
-msgstr "tên loại"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "Loại:"
 
-#: category.c:832
+#: ../category.c:834
 msgid "New"
 msgstr "Mới"
 
-#: category.c:838
+#: ../category.c:841
 msgid "Rename"
 msgstr "Đổi tên"
 
-#: category.c:924
-msgid "debug"
-msgstr "gỡ lỗi"
-
-#: dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "không biết kiểu ="
 
-#: dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "số trường trong mỗi hàng != %d, dạng thức không rõ\n"
 
-#: dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "số trường != %d, dạng thức không rõ\n"
 
-#: dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "Dạng thức không rõ, tập tin có giản đồ không đúng.\n"
 
-#: dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "Giản đồ tập tin là:"
 
-#: dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "Nó nên là:  "
 
-#: dat.c:674 dat.c:692 dat.c:874 dat.c:887 dat.c:1010 dat.c:1023 dat.c:1147
-#: dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr "%s:%d Mục ghi %d, trường %d: Kiểu không hợp lệ.  Ngờ %d, còn tìm %d\n"
 
-#: dat.c:675 dat.c:693 dat.c:875 dat.c:888 dat.c:992 dat.c:1011 dat.c:1024
-#: dat.c:1148 dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "việc đọc tập tin bị chấm dứt\n"
 
-#: datebook.c:650
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
-msgstr "Không biết kiểu làm lại repeatType (%d) được tìm trong cơ sở dữ liệu lịch DatebookDB\n"
+msgstr ""
+"Không biết kiểu làm lại repeatType (%d) được tìm trong cơ sở dữ liệu lịch "
+"DatebookDB\n"
+
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "Lặp lại theo :"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "Lập lại vào Hôm:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "Lặp lại theo :"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "Lập lại vào Hôm:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "Lập lại vào Hôm:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "Lập lại vào Hôm:"
 
-#: datebook_gui.c:222 datebook_gui.c:229 datebook_gui.c:4078
-#: datebook_gui.c:4085
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "CN"
 
-#: datebook_gui.c:223 datebook_gui.c:4079
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "T2"
 
-#: datebook_gui.c:224 datebook_gui.c:4080
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "T3"
 
-#: datebook_gui.c:225 datebook_gui.c:4081
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "T4"
 
-#: datebook_gui.c:226 datebook_gui.c:4082
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "T5"
 
-#: datebook_gui.c:227 datebook_gui.c:4083
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "T6"
 
-#: datebook_gui.c:228 datebook_gui.c:4084
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "T7"
 
-#: datebook_gui.c:561 datebook_gui.c:2055
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "Ngày cuối"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "Lập lại vào Hôm:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "số mục ghi = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "Ghi chú"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "Báo động"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "Lặp lại theo :"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "Hôm của tuần"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "Chuỗi mô tả cuộc hẹn > %d nên cắt xén nó thành %d\n"
 
-#: datebook_gui.c:571 datebook_gui.c:986 datebook_gui.c:2116
-#: datebook_gui.c:2123
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "Lỗi"
 
-#: datebook_gui.c:572
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "Tập tin có vẻ không phải có dạng thức <sổ_ngày.dat>\n"
 
-#: datebook_gui.c:986
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "Không biết kiểu xuất"
 
-#: datebook_gui.c:1095 export_gui.c:258 jpilot.c:554
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "Xuất"
 
-#: datebook_gui.c:1112
+#. Label for instructions
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "Xuất ra mọi mục ghi của Sổ Ngày"
 
-#: datebook_gui.c:1131 export_gui.c:320
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "Lưu dạng"
 
-#: datebook_gui.c:1141 export_gui.c:331
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "Duyệt"
 
-#: datebook_gui.c:1291
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "Loại Sổ Ngày"
 
-#: datebook_gui.c:1326 import_gui.c:311 prefs_gui.c:763
-msgid "Done"
-msgstr "Đã xong"
-
-#: datebook_gui.c:1338 datebook_gui.c:4626
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "Không có"
 
-#: datebook_gui.c:1450
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "Ngày đầu"
 
-#: datebook_gui.c:1455
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "Ngày cuối"
 
-#: datebook_gui.c:1549 prefs.c:413
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "Chủ Nhật"
 
-#: datebook_gui.c:1550 prefs.c:414
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "Thứ Hai"
 
-#: datebook_gui.c:1551
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: datebook_gui.c:1552
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: datebook_gui.c:1553
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: datebook_gui.c:1554
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: datebook_gui.c:1555
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: datebook_gui.c:1558
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "thứ 4"
 
-#: datebook_gui.c:1558
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "Cuối"
 
-#: datebook_gui.c:1561
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -612,21 +966,18 @@ msgstr ""
 "cuối của tháng.\n"
 "Bạn có muốn chón gì?"
 
-#: datebook_gui.c:1569 datebook_gui.c:1587
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "Hỏi ?"
 
-#: datebook_gui.c:1569 datebook_gui.c:1587
-msgid "Answer: "
-msgstr "Đáp :"
-
-#: datebook_gui.c:1577
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "Sự kiện này lặp lại.\n"
 "Bạn có muốn áp dụng các\n"
@@ -634,48 +985,57 @@ msgstr ""
 "HIỆN THỜI, hoặc vào MỌI\n"
 "lần gặp sự kiện này?"
 
-#: datebook_gui.c:1582
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "Hiện có"
 
-#: datebook_gui.c:1823
-msgid "none"
-msgstr "không có"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: datebook_gui.c:1824
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "ngày"
 
-#: datebook_gui.c:1825
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "tuần"
 
-#: datebook_gui.c:1826
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "tháng"
 
-#: datebook_gui.c:1827
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "năm"
 
-#: datebook_gui.c:2111 datebook_gui.c:2114
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "Bạn không thể có cuộc hẹn lặp lại từng %d %s\n"
 
-#: datebook_gui.c:2124
-msgid "You can not have a weekly repeating appointment that doesn't repeat on any day of the week."
-msgstr "Bạn không thể có cuộc hẹn lặp lại từng tuần mà không lặp lại vào hôm nào."
+#: ../datebook_gui.c:2339
+#, fuzzy
+msgid ""
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
+"day of the week."
+msgstr ""
+"Bạn không thể có cuộc hẹn lặp lại từng tuần mà không lặp lại vào hôm nào."
 
-#: datebook_gui.c:2277
+#. This is a timeless event
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "Chưa có giờ"
 
-#: datebook_gui.c:2618
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "Cuộc hẹn không hợp lệ"
 
-#: datebook_gui.c:2619
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -683,361 +1043,304 @@ msgstr ""
 "Ngày cuối cua cuộc hẹn này\n"
 "nằm trước ngày đầu."
 
-#: datebook_gui.c:2874 datebook_gui.c:4660 datebook_gui.c:4690
-#: datebook_gui.c:4746 datebook_gui.c:4795 todo_gui.c:135 todo_gui.c:2262
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "Chưa có ngày"
 
-#: datebook_gui.c:2988
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "Gặp lỗi trong cơ sở dữ liệu Sổ Ngày DateBookDB advanceUnits = %d\n"
 
-#: datebook_gui.c:3159
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "Không biết kiểu lặp lại repeatType được tìm trong cơ sở dữ liệu Sổ Ngày DatebookDB\n"
-
 # Variable: don't translate / Biến: đừng dịch
-#: datebook_gui.c:3192
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a., %s"
 
-#: datebook_gui.c:3197 monthview_gui.c:210 weekview_gui.c:204
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (HÔM NAY)"
 
-#: datebook_gui.c:4184 datebook_gui.c:4628
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "Tuần"
 
-#: datebook_gui.c:4190
-msgid "W"
-msgstr "Tn"
-
-#: datebook_gui.c:4192
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "Xem cuộc hẹn theo tuần"
 
-#: datebook_gui.c:4195 datebook_gui.c:4629
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "Tháng"
 
-#: datebook_gui.c:4202
-msgid "M"
-msgstr "Th"
-
-#: datebook_gui.c:4204
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "Xem cuộc hẹn theo tháng"
 
-#: datebook_gui.c:4209
+#. Make Category button
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "Ploại"
 
-#: datebook_gui.c:4278
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "Giờ"
 
-#: datebook_gui.c:4315
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "Hiện Cần Làm"
 
-#: datebook_gui.c:4330 todo_gui.c:2131
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "Tác vụ"
 
-#: datebook_gui.c:4331 todo_gui.c:2132
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "Đến hạn"
 
-#: datebook_gui.c:4428
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "Báo động"
 
-#: datebook_gui.c:4449
-msgid "Days"
-msgstr "Ngày"
-
-#: datebook_gui.c:4472
-msgid "This Event has no particular time"
-msgstr "Sự kiện này không có giờ riêng"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "Ngày:"
 
-#: datebook_gui.c:4480
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "Bắt đầu"
 
-#: datebook_gui.c:4494
-msgid "Start Time"
-msgstr "Giờ đầu"
-
-#: datebook_gui.c:4512
-msgid "End Time"
-msgstr "Giờ cuối"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "Kết thúc vào"
 
-#: datebook_gui.c:4610
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "Thẻ Sổ Ngày"
 
-#: datebook_gui.c:4627
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "Ngày"
 
-#: datebook_gui.c:4630
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "Năm"
 
-#: datebook_gui.c:4634
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "Sự kiện này không lặp lại."
 
-#: datebook_gui.c:4644 datebook_gui.c:4676 datebook_gui.c:4732
-#: datebook_gui.c:4779
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "Tần số là Từng"
 
-#: datebook_gui.c:4649
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "Ngày"
 
-#: datebook_gui.c:4652 datebook_gui.c:4684 datebook_gui.c:4740
-#: datebook_gui.c:4787
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "Kết thúc vào"
 
-#: datebook_gui.c:4681
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "Tuần"
 
-#: datebook_gui.c:4697
-msgid "Repeat on Days:"
-msgstr "Lập lại vào Hôm:"
-
-#: datebook_gui.c:4737
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "Tháng"
 
-#: datebook_gui.c:4754
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "Lặp lại theo :"
 
-#: datebook_gui.c:4758
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "Hôm của tuần"
 
-#: datebook_gui.c:4767
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "Ngày"
 
-#: datebook_gui.c:4784
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "Năm"
 
-#: dialer.c:196
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "Bộ Quay số Điện thoại"
 
-#: dialer.c:231
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "Tiền tố 1"
 
-#: dialer.c:253
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "Tiền tố 2"
 
-#: dialer.c:275
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "Tiền tố 3"
 
-#: dialer.c:290
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "Số điện thoại:"
 
-#: dialer.c:321
+#: ../dialer.c:319
 msgid "Extension"
 msgstr "Phần mở rộng"
 
-#: dialer.c:344
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "Lệnh Quay số"
 
-#: dialer.c:365
-msgid "Dismiss"
-msgstr "Bỏ qua"
-
-#: export_gui.c:116
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "Bộ duyệt tập tin"
 
-#: export_gui.c:276
+#. Label for instructions
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "Chọn mục ghi cần xuất"
 
-#: export_gui.c:278
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "Dùng phím Ctrl và Shift"
 
-#: import_gui.c:265 import_gui.c:304 import_gui.c:417 import_gui.c:497
-#: jpilot.c:510
+#. Import button
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "Nhập"
 
-#: import_gui.c:298 install_gui.c:311
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "Để chuyển đổi sang một kiểu thư mục bị ẩn, hãy gõ nó dưới đây rồi bấm phím TAB."
-
-#: import_gui.c:324
-msgid "Import File Type"
-msgstr "Kiểu tập tin nhập"
-
-#: import_gui.c:436
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "Mục ghi có nhãn Riêng"
 
-#: import_gui.c:438
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "Mục ghi không có nhãn Riêng"
 
-#: import_gui.c:445
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "Phân loại trước khi nhập là: [%s]"
 
-#: import_gui.c:451
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "Mục ghi sẽ nằm trong phân loại [%s]"
 
-#: import_gui.c:504
+#. Import All button
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "Nhập hết"
 
-#: import_gui.c:511
+#. Skip button
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "Bỏ qua"
 
-#: import_gui.c:518
-msgid "Quit"
-msgstr "Thoát"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr ""
+"Để chuyển đổi sang một kiểu thư mục bị ẩn, hãy gõ nó dưới đây rồi bấm phím "
+"TAB."
 
-#: install_gui.c:258
-msgid "Install"
-msgstr "Cài đặt"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "Kiểu tập tin nhập"
 
-#: install_gui.c:288
-msgid "Files to be installed"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
 msgstr "Tập tin cần cài đặt"
 
-#: install_gui.c:317
-msgid "Add"
-msgstr "Thêm"
-
-#: install_gui.c:324
-msgid "Remove"
-msgstr "Gỡ bỏ"
-
-#: install_gui.c:331 monthview_gui.c:511 search_gui.c:585 weekview_gui.c:337
-msgid "Close"
-msgstr "Đóng"
-
-#: jpilot-dump.c:64
-msgid " +B +M +A +T format like date +format (use -? for more info).\n"
-msgstr " dạng thức +B +M +A +T giống như dạng thức date+ (dùng « -? » sẽ xem thông tin thêm).\n"
-
-#: jpilot-dump.c:65
-msgid " -v displays version and exits.\n"
-msgstr " -v hiện phiên bản rồi thoát.\n"
-
-#: jpilot-dump.c:66 utils.c:77
-msgid " -h displays help and exits.\n"
-msgstr " -h hiện trợ giúp rồi thoát.\n"
-
-#: jpilot-dump.c:67
-msgid " -B dump dateBook.\n"
-msgstr " -B đổ Sổ Ngày.\n"
-
-#: jpilot-dump.c:68
-msgid " -NYYYY/MM/DD dump apps on YYYY/MM/DD in dateBook.\n"
-msgstr " -NNĂM/Th/Ng đổ các cuộc hẹn của NĂM/Th/Ng trong Sổ Ngày.\n"
-
-#: jpilot-dump.c:69
-msgid " -N dump apps on today in dateBook.\n"
-msgstr " -N đổ các cuộc hẹn của hôm nay trong Sổ Ngày\n"
-
-#: jpilot-dump.c:70
-msgid " -M dump Memos.\n"
-msgstr " -M đổ các Ghi nhớ\n"
-
-#: jpilot-dump.c:71
-msgid " -A dump Address book.\n"
-msgstr " -A đổ Sổ địa chỉ\n"
-
-#: jpilot-dump.c:72
-msgid " -T dump Todo list as CSV.\n"
-msgstr " -T đổ danh sách Cần Làm dạng .csv\n"
-
-#: jpilot-sync.c:65
-msgid " J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr "Tùy thích J-Pilot được đọc để biết cổng, tốc độ, số bản sao lưu v.v.\n"
-
-#: jpilot-sync.c:66
-msgid " -v = version\n"
-msgstr " -v = phiên bản\n"
-
-#: jpilot-sync.c:67
-msgid " -h = help\n"
-msgstr " -h = trợ giúp\n"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "Cài đặt"
 
-#: jpilot-sync.c:68
-msgid " -d = run in debug mode\n"
-msgstr " -d = chạy trong chế độ gỡ lỗi\n"
+#: ../install_user.c:116 ../install_user.c:218
+#, fuzzy
+msgid "Install User"
+msgstr "/Tập tin/Cài đặt người dùng"
 
-#: jpilot-sync.c:69
-msgid " -P = do not load plugins.\n"
-msgstr " -P = đừng tải bộ cầm phít\n"
+#: ../install_user.c:137
+msgid ""
+"A PalmOS(c) device needs a user name and a user ID in order to sync properly."
+msgstr ""
 
-#: jpilot-sync.c:70
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = đồng bộ hóa rồi sao lưu hết, không thì chỉ đồng bộ hóa.\n"
+#: ../install_user.c:144
+msgid ""
+"If you want to sync more than 1 PalmOS(c) device each one should have a "
+"different ID and preferably a different user name."
+msgstr ""
 
-#: jpilot-sync.c:71
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l = lặp lại, không thì đồng bộ hóa một lần rồi thoát.\n"
+#. Instruction label
+#: ../install_user.c:166
+msgid "Most people choose their name or nickname for the user name."
+msgstr ""
 
-#: jpilot-sync.c:72
-msgid " -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr " -p (cổng) = dùng cổng này để đồng bộ hóa, không đọc cổng từ tùy thích.\n"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
+msgstr "Tên người dùng"
 
-#: jpilot.c:142
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "Đặc tả dạng hình không hợp lệ: « %s ».\n"
+#: ../install_user.c:184
+msgid "The ID should be a random number."
+msgstr ""
 
-#: jpilot.c:386
-msgid "Help"
-msgstr "Trợ giúp"
+#: ../install_user.c:192 ../restore_gui.c:295
+msgid "User ID"
+msgstr "ID người dùng"
 
-#: jpilot.c:450 monthview_gui.c:517 print_gui.c:332 weekview_gui.c:343
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "In"
 
-#: jpilot.c:451
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "Không hỗ trợ khả năng in cho ống dẫn này."
 
-#: jpilot.c:511
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "Không hỗ trợ khả năng nhập cho ống dẫn này."
 
-#: jpilot.c:555
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "Không hỗ trợ khả năng xuất cho ống dẫn này."
 
-#: jpilot.c:731
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "Thôi đồng bộ"
+
+#. -------------------------------------------
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Máy Palm này không có cùng một tên người\n"
@@ -1045,14 +1348,17 @@ msgstr ""
 "lần trước. Như thế thì việc đồng bộ hóa có thể\n"
 "tác động một cách sai. Hãy đọc Sổ Tay nếu chưa chắc."
 
-#: jpilot.c:738
+#. -------------------------------------------
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "Máy Palm này có ID người dùng RỖNG.\n"
@@ -1063,248 +1369,228 @@ msgstr ""
 "« install-user », hoặc dùng « Cài đặt người dùng » từ trình đơn.\n"
 "Hãy đọc Sổ Tay nếu chưa chắc."
 
-#: jpilot.c:745
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "Thôi đồng bộ"
 
-#: jpilot.c:745
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "Vẫn đồng bộ"
 
-#: jpilot.c:755 jpilot.c:760
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "Lỗi đồng bộ"
 
-#: jpilot.c:755 jpilot.c:760
-msgid "Sync"
-msgstr "Đồng bộ"
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr " Người dùng: "
 
-#: jpilot.c:959
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "Không biết lệnh từ tiến trình đồng bộ\n"
 
-#: jpilot.c:980 Expense/expense.c:516 KeyRing/keyring.c:512
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "Giới thiệu về %s"
 
-#: jpilot.c:1382
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: jpilot.c:1383
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/Tập tin/tách rời"
 
-#: jpilot.c:1384
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/Tập tin/_Tìm"
 
-#: jpilot.c:1385 jpilot.c:1391 jpilot.c:1394
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/Tập tin/sep1"
 
-#: jpilot.c:1386
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/Tập tin/_Cài đặt"
 
-#: jpilot.c:1387
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/Tập tin/Nhập"
 
-#: jpilot.c:1388
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/Tập tin/Xuất"
 
-#: jpilot.c:1389 jpilot.c:2825
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/Tập tin/Tùy thích"
 
-#: jpilot.c:1390
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/Tập tin/_In"
 
-#: jpilot.c:1392
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/Tập tin/Cài đặt người dùng"
 
-#: jpilot.c:1393
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/Tập tin/Phục hồi bộ cầm tay"
 
-#: jpilot.c:1395
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/Tập tin/T_hoát"
 
-#: jpilot.c:1396
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/_Xem"
 
-#: jpilot.c:1397 jpilot.c:1398 jpilot.c:1399 jpilot.c:1653
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/Xem/Ẩn các mục ghi riêng"
 
-#: jpilot.c:1398
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/Xem/Hiện các mục ghi riêng"
 
-#: jpilot.c:1399
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/Xem/Lọc các mục ghi riêng"
 
-#: jpilot.c:1400
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/Xem/sep1"
 
-#: jpilot.c:1401
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/Xem/Sổ Ngày"
 
-#: jpilot.c:1402
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/Xem/Địa chỉ"
 
-#: jpilot.c:1403
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/Xem/Cần làm"
 
-#: jpilot.c:1404
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/Xem/Ghi nhớ"
 
-#: jpilot.c:1405 jpilot.c:1539
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/Xem/Bộ cầm _phít"
 
-#: jpilot.c:1407
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Mạng"
 
 # Name: don't translate /Tên: đừng dịch
-#: jpilot.c:1408
+#. web
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Mạng/Netscape"
 
 # Name: don't translate / Tên: đừng dịch
-#: jpilot.c:1412
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Mạng/Mozilla"
 
-#: jpilot.c:1417
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Mạng/Galeon"
 
-#: jpilot.c:1422
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Mạng/Opera"
 
-#: jpilot.c:1426
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Mạng/GnomeUrl"
 
-#: jpilot.c:1428
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Mạng/Lynx"
 
-#: jpilot.c:1430
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Mạng/Links"
 
-#: jpilot.c:1432
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Mạng/W3M"
 
-#: jpilot.c:1434
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Mạng/Konqueror"
 
-#: jpilot.c:1437
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/Trợ _giúp"
 
-#: jpilot.c:1438
-msgid "/Help/PayBack program"
-msgstr "/Trợ giúp/Chương trìinh trả lại"
-
-#: jpilot.c:1439
-msgid "/Help/J-Pilot"
+#: ../jpilot.c:1163
+#, fuzzy
+msgid "/Help/About J-Pilot"
 msgstr "/Trợ giúp/J-Pilot"
 
-#: jpilot.c:1506
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/Bộ cầm _phít/%s"
 
-#: jpilot.c:1517
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/Trợ _giúp/%s"
 
-#: jpilot.c:1816
-msgid "Font Selection Dialog"
-msgstr "Hộp thoại chọn phông chữ"
-
-#: jpilot.c:2154
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:0"
 
-#: jpilot.c:2199
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "Không tải bộ cầm phít.\n"
 
-#: jpilot.c:2203
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "Bỏ qua mọi bảo động.\n"
 
-#: jpilot.c:2207
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "Bỏ qua các bảo động qua.\n"
 
-#: jpilot.c:2302 jpilot.c:2310
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "Không thể mở ống\n"
 
-#: jpilot.c:2361
-msgid " User: "
-msgstr " Người dùng: "
-
-#: jpilot.c:2508
-msgid "Clear"
-msgstr "Xoá"
-
-#: jpilot.c:2579
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "Hiện bản ghi riêng   Ctrl-Z"
 
-#: jpilot.c:2584
-msgid "Show private records"
-msgstr "Hiện bản ghi riêng"
-
-#: jpilot.c:2589
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "Ẩn bản ghi riêng   Ctrl-Z"
 
-#: jpilot.c:2594
-msgid "Hide private records"
-msgstr "Ẩn bản ghi riêng"
-
-#: jpilot.c:2599
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "Lọc bản ghi riêng   Ctrl-Z"
 
-#: jpilot.c:2604
-msgid "Mask private records"
-msgstr "Lọc bản ghi riêng"
-
-#: jpilot.c:2614
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "Đồng bộ hóa Palm với máy tính   Ctrl-Y"
 
-#: jpilot.c:2620
-msgid "Font"
-msgstr "Phông chữ"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "Đồng bộ hóa Địa chỉ"
 
-#: jpilot.c:2635
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1312,746 +1598,1248 @@ msgstr ""
 "Đồng bộ hóa Palm với máy tính\n"
 "rồi sao lưu hết"
 
-#: jpilot.c:2749
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "Sổ Ngày/Đi tới ngày hôm nay"
 
-#: jpilot.c:2751
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: jpilot.c:2753
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "Danh sách Cần làm"
 
-#: jpilot.c:2755
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "Tập giấy Ghi nhớ"
 
-#: jpilot.c:2807
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "Làm ngay"
 
-#: jpilot.c:2807
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "Nhắc nhở lần sau"
 
-#: jpilot.c:2807
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "Đừng nói điều này lần nữa."
 
-#: jpilot.c:2821
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters (accents for example).\n"
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
+"(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
-"Chương trình J-Pilot đang dùng bộ công cụ đồ họa GTK2. Phiên bản bộ công cụ này dùng UTF-8 để mã hóa ký tự.\n"
-"Bạn nên chọn một bộ ký tự UTF-8 để có khả năng xem ký tự khác ASCII, v.d. chữ có giọng.\n"
+"Chương trình J-Pilot đang dùng bộ công cụ đồ họa GTK2. Phiên bản bộ công cụ "
+"này dùng UTF-8 để mã hóa ký tự.\n"
+"Bạn nên chọn một bộ ký tự UTF-8 để có khả năng xem ký tự khác ASCII, v.d. "
+"chữ có giọng.\n"
 "\n"
 
-#: jpilot.c:2824
-msgid "Go to the menu \""
-msgstr "Đi tới trình đơn \""
-
-#: jpilot.c:2826
-msgid "\" and change the \""
-msgstr "\" và thay đổi \""
-
-#: jpilot.c:2827 prefs_gui.c:390
-msgid "Character Set "
+#. Character Set
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "Bộ ký tự"
 
-#: jpilot.c:2828
-msgid "\"."
-msgstr "\"."
-
-#: jpilot.c:2830
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "Chọn bảng mã UTF-8"
 
-#: libplugin.c:153
-#, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "Không biết phiên bản phần đầu PC = %d\n"
-
-#: libplugin.c:441
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d Gặp lỗi khi mở tập tin: %s\n"
-
-#: libplugin.c:447 libplugin.c:476 sync.c:2880 todo.c:391
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Gặp lỗi khi đọc tập tin: %s\n"
-
-#: libplugin.c:503 utils.c:1899
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
+#: ../jpilot-dump.c:92
+#, fuzzy, c-format
+msgid " +D +A +T +M format like date +format.\n"
 msgstr ""
-"Mục ghi đã bị xoá bỏ.\n"
-"Nó sẽ bị xoá bỏ ra máy Palm vào lúc đồng bộ hóa kế tiếp.\n"
+" dạng thức +B +M +A +T giống như dạng thức date+ (dùng « -? » sẽ xem thông "
+"tin thêm).\n"
 
-#: libplugin.c:512 utils.c:1908 utils.c:1945
-msgid "Unable to open PC records file\n"
-msgstr "Không thể mở tập tin mục ghi PC.\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v hiện phiên bản rồi thoát.\n"
 
-#: libplugin.c:518 utils.c:1914
-msgid "Couldn't find record to delete\n"
-msgstr "Không thể tìm thấy mục ghi cần xoá bỏ.\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h hiện trợ giúp rồi thoát.\n"
 
-#: libplugin.c:537 utils.c:1932
-#, c-format
-msgid "Unknown header version %d\n"
-msgstr "Không biết phiên bản phần đầu %d\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -h hiện trợ giúp rồi thoát.\n"
 
-#: libplugin.c:550
-msgid "Couldn't open PC records file\n"
-msgstr "Không thể mở tập tin mục ghi PC\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -B đổ Sổ Ngày.\n"
 
-#: libplugin.c:607 libplugin.c:699 utils.c:1459 utils.c:1471
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "Error opening file: %s\n"
-msgstr "Gặp lỗi khi mở tập tin: %s\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: libplugin.c:636
-msgid "Error reading PC file 1\n"
-msgstr "Gặp lỗi khi đọc tập tin PC 1\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N đổ các cuộc hẹn của hôm nay trong Sổ Ngày\n"
 
-#: libplugin.c:652
-msgid "Error reading PC file 2\n"
-msgstr "Gặp lỗi khi đọc tập tin PC 2\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr " -NNĂM/Th/Ng đổ các cuộc hẹn của NĂM/Th/Ng trong Sổ Ngày.\n"
 
-#: libplugin.c:824
-#, c-format
-msgid "Error reading %s 5\n"
-msgstr "Gặp lỗi khi đọc %s 5.\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr " -A đổ Sổ địa chỉ\n"
 
-#: log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "Không thể mở tập tin bản ghi nên chịu thua.\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -T đổ danh sách Cần Làm dạng .csv\n"
+
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M đổ các Ghi nhớ\n"
 
-#: log.c:102
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "Không thể mở tập tin bản ghi.\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: memo_gui.c:318
-msgid "Memo text > 65535, truncating\n"
-msgstr "Chuỗi ghi nhớ >65535 nên cắt xén nó\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "Không thể mở tập tin: %s\n"
 
-#: memo_gui.c:348
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "Ghi nhớ đã nhập %s\n"
-
-#: memo_gui.c:419
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "Tập tin có vẻ không phải có dạng thức <tập_giấy_ghi_nhớ.dat>.\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: memo_gui.c:568 memo_gui.c:583
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "Không thể xuất ghi nhớ %d.\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: monthview_gui.c:475
-msgid "Monthly View"
-msgstr "Xem tháng"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: password.c:304
-msgid "Palm Password"
-msgstr "Mật khẩu Palm"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: password.c:329
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "Sai, hãy gõ lại mật khẩu PalmOS"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: password.c:331
-msgid "Enter PalmOS Password"
-msgstr "Gõ mật khẩu PalmOS"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: plugins.c:88 plugins.c:200 restore_gui.c:133
-msgid "infinite loop"
-msgstr "bị lặp vô hạn"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: plugins.c:213
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "Trong khi đọc %s%s dòng 1:[%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: plugins.c:214
-msgid "Wrong Version\n"
-msgstr "Phiên bản không đúng\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: plugins.c:215
-msgid "Check preferences->conduits\n"
-msgstr "Kiểm tra Tùy thích → Ống dẫn\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: plugins.c:271
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
-"Việc mở bị lỗi trên bộ cầm phít [%s]\n"
-" lỗi [%s]\n"
 
-#: plugins.c:288 plugins.c:314
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " bộ cầm phít không hợp lệ: [%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: plugins.c:296
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "Bộ cầm phít:[%s]\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: plugins.c:297
+#: ../jpilot-merge.c:299
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "Bộ cầm phít này là phiên bản (%d.%d).\n"
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "nó quá cũ để hoạt động với phiên bản J-Pilot này.\n"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: prefs.c:391
-msgid "%B %d, %Y"
-msgstr "%B %d, %Y"
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr "Tùy thích J-Pilot được đọc để biết cổng, tốc độ, số bản sao lưu v.v.\n"
 
-#: prefs.c:392
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v hiện phiên bản và tùy chọn biên dịch rồi thoát.\n"
 
-#: prefs.c:393
-msgid "%d. %B %Y"
-msgstr "%d. %B %Y"
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d hiện thông tin gỡ lỗi vào thiết bị xuất chuẩn.\n"
 
-#: prefs.c:394
-msgid "%d %B, %Y"
-msgstr "%d %B, %Y"
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr "Không tải bộ cầm phít.\n"
 
-#: prefs.c:395
-msgid "%Y. %B. %d"
-msgstr "%Y. %B. %d"
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
 
-#: prefs.c:396
-msgid "%Y %B %d"
-msgstr "%Y %B %d"
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l = lặp lại, không thì đồng bộ hóa một lần rồi thoát.\n"
 
-#: prefs_gui.c:334
-msgid "Preferences"
-msgstr "Tùy thích"
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr ""
+" -p (cổng) = dùng cổng này để đồng bộ hóa, không đọc cổng từ tùy thích.\n"
 
-#: prefs_gui.c:364
-msgid "Locale"
-msgstr "Miền địa phương"
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "Gặp lỗi khi mở tập tin: %s\n"
 
-#: prefs_gui.c:366
-msgid "Settings"
-msgstr "Thiết lập"
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
 
-#: prefs_gui.c:368
-msgid "Datebook"
-msgstr "Sổ Ngày"
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "Gặp lỗi khi mở tập tin: next_id\n"
 
-#: prefs_gui.c:372
-msgid "ToDo"
-msgstr "Cần làm"
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
 
-#: prefs_gui.c:374
-msgid "Memo"
-msgstr "Ghi nhớ"
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "Lỗi"
 
-#: prefs_gui.c:376
-msgid "Alarms"
-msgstr "Báo động"
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
 
-#: prefs_gui.c:378
-msgid "Conduits"
-msgstr "Ống dẫn"
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
 
-#: prefs_gui.c:403
-msgid "Short date format "
-msgstr "Dạng ngày ngắn"
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#: prefs_gui.c:416
-msgid "Long date format "
-msgstr "Dạng ngày dài"
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
 
-#: prefs_gui.c:429
-msgid "Time format "
-msgstr "Dạng giờ"
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
 
-#: prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "Hôm thứ nhất trong tuần là "
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "Biến môi trường HOME của bạn là quá dài.\n"
 
-#: prefs_gui.c:464
-msgid "My GTK colors file is "
-msgstr "Tập tin màu sắc GTK của tôi là "
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
 
-#: prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "Cổng nối tiếp (/dev/ttyS0, /dev/pilot)"
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
 
-#: prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr "Tốc độ nối tiếp (không có tác động USB)"
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
 
-#: prefs_gui.c:507
-msgid "Number of backups to be archived"
-msgstr "Số bản sao lưu cần lưu trữ"
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
 
-#: prefs_gui.c:524
-msgid "Show deleted records (default NO)"
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"Mục ghi đã bị xoá bỏ.\n"
+"Nó sẽ bị xoá bỏ ra máy Palm vào lúc đồng bộ hóa kế tiếp.\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "Không thể mở tập tin mục ghi PC.\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "Không thể tìm thấy mục ghi cần xoá bỏ.\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "Không biết phiên bản phần đầu %d\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d Gặp lỗi khi mở tập tin: %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Gặp lỗi khi đọc tập tin: %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "Gặp lỗi khi mở tập tin: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "Gặp lỗi khi đọc %s 5.\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "Gặp lỗi khi đọc tập tin PC 1\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "Gặp lỗi khi đọc tập tin PC 2\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "Không biết phiên bản phần đầu PC = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "Không thể mở tập tin bản ghi nên chịu thua.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "Không thể mở tập tin bản ghi.\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "Chuỗi ghi nhớ >65535 nên cắt xén nó\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "Ghi nhớ đã nhập %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "Tập tin có vẻ không phải có dạng thức <tập_giấy_ghi_nhớ.dat>.\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "Không thể xuất ghi nhớ %d.\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "Tập giấy Ghi nhớ"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "Xem tháng"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Mật khẩu Palm"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "Sai, hãy gõ lại mật khẩu PalmOS"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "Gõ mật khẩu PalmOS"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Gặp lỗi khi đọc tập tin: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "bị lặp vô hạn"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "Trong khi đọc %s%s dòng 1:[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "Phiên bản không đúng\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "Kiểm tra Tùy thích → Ống dẫn\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"Việc mở bị lỗi trên bộ cầm phít [%s]\n"
+" lỗi [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " bộ cầm phít không hợp lệ: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "Bộ cầm phít:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "Bộ cầm phít này là phiên bản (%d.%d).\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "nó quá cũ để hoạt động với phiên bản J-Pilot này.\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr "%B %d, %Y"
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr "%d. %B %Y"
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr "%d %B, %Y"
+
+#: ../prefs.c:422
+msgid "%Y. %B. %d"
+msgstr "%Y. %B. %d"
+
+#: ../prefs.c:423
+msgid "%Y %B %d"
+msgstr "%Y %B %d"
+
+#: ../prefs_gui.c:452
+msgid "Preferences"
+msgstr "Tùy thích"
+
+#: ../prefs_gui.c:483
+msgid "Locale"
+msgstr "Miền địa phương"
+
+#: ../prefs_gui.c:485
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: ../prefs_gui.c:487
+msgid "Datebook"
+msgstr "Sổ Ngày"
+
+#: ../prefs_gui.c:491
+msgid "ToDo"
+msgstr "Cần làm"
+
+#: ../prefs_gui.c:493
+msgid "Memo"
+msgstr "Ghi nhớ"
+
+#: ../prefs_gui.c:495
+msgid "Alarms"
+msgstr "Báo động"
+
+#: ../prefs_gui.c:497
+msgid "Conduits"
+msgstr "Ống dẫn"
+
+#. Shortdate
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
+msgstr "Dạng ngày ngắn"
+
+#. Longdate
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
+msgstr "Dạng ngày dài"
+
+#. Time
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
+msgstr "Dạng giờ"
+
+#. GTK colors file
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
+msgstr "Tập tin màu sắc GTK của tôi là "
+
+#. Port
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "Lỗi đồng bộ"
+
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
+
+#. Number of backups
+#: ../prefs_gui.c:625
+msgid "Number of backups to be archived"
+msgstr "Số bản sao lưu cần lưu trữ"
+
+#. Show deleted files check box
+#: ../prefs_gui.c:643
+msgid "Show deleted records (default NO)"
 msgstr "Hiển thị mục ghi bị xoá bỏ (mặc định là KHÔNG)"
 
-#: prefs_gui.c:528
+#. Show modified files check box
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "Hiển thị mục ghi bị xoá bỏ đã sửa đổi (mặc định là KHÔNG)"
 
-#: prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "Nhắc xác nhận cài đặt tập tin (J-Pilot → PDA) (mặc định là CÓ)"
 
-#: prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#. Show tooltips check box
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "Hiển thị mẹo công cụ bật lên (mặc định là CÓ)"
 
-#: prefs_gui.c:545
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
+#. Show highlight days check box
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "Làm nổi bật ngày trên lịch có cuộc hẹn"
 
-#: prefs_gui.c:551
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr "Đánh dấu ngày hôm nay trong khung xem ngày, tuần và tháng đều"
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr "Phụ thêm năm vào ngày kỉ niệm trong khung xem ngày, tuần và tháng đều"
+
+#. Show use DateBk check box
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "Dùng thẻ ghi chú Sổ Ngày"
 
-#: prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "Bản xây dựng này không hỗ trợ Sổ Ngày (DateBk)"
 
-#: prefs_gui.c:560
-msgid "Annotate today in day, week, and month views"
-msgstr "Đánh dấu ngày hôm nay trong khung xem ngày, tuần và tháng đều"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
+msgstr ""
 
-#: prefs_gui.c:565
-msgid "Append years on anniversaries in day, week, and month views"
-msgstr "Phụ thêm năm vào ngày kỉ niệm trong khung xem ngày, tuần và tháng đều"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
+msgstr ""
 
-#: prefs_gui.c:577
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "Lệnh thư"
 
-#: prefs_gui.c:591
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s được thay thế bằng địa chỉ thư điện tử"
 
-#: prefs_gui.c:599
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "Ẩn mọi tác vụ hoàn tất"
 
-#: prefs_gui.c:603
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "Ẩn tác vụ chưa tới hạn"
 
-#: prefs_gui.c:607
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "Ghi lưu Ngày hoàn tất"
 
-#: prefs_gui.c:612
+#. Use Manana check box
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "Dùng cơ sở dữ liệu Manana"
 
-#: prefs_gui.c:620
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "Dùng số ngày tới hạn mặc định"
 
-#: prefs_gui.c:640
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "Dùng Memo32 (pedit32)"
 
-#: prefs_gui.c:647
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
+#. ********************************************************************
+#. Alarms preference tab
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "Mở cửa sổ báo động khi nhắc nhở cuộc hẹn"
 
-#: prefs_gui.c:651
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "Thi hành lệnh này"
 
-#: prefs_gui.c:655
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "Cảnh báo : thực thi lệnh hệ vỏ tùy ý có thể gây nguy hiểm !!!"
 
-#: prefs_gui.c:663
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "Lệnh báo động"
 
-#: prefs_gui.c:676
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t được thay thế bằng giờ báo động"
 
-#: prefs_gui.c:680
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d được thay thế bằng ngày báo động"
 
-#: prefs_gui.c:685
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D được thay thế bằng mô tả báo động"
 
-#: prefs_gui.c:689
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N được thay thế bằng ghi chú báo động"
 
-#: prefs_gui.c:693
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "%D (thay thế mô tả) bị tắt trong bản xây dụng này"
 
-#: prefs_gui.c:697
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "%N (thay thế ghi chú) bị tắt trong bản xây dụng này"
 
-#: prefs_gui.c:706
+#. ********************************************************************
+#. Conduits preference tab
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "Đồng bộ hóa Sổ Ngày"
 
-#: prefs_gui.c:710
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "Đồng bộ hóa Địa chỉ"
 
-#: prefs_gui.c:714
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "Đồng bộ hóa Cần làm"
 
-#: prefs_gui.c:718
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "Đồng bộ hóa Ghi nhớ"
 
-#: prefs_gui.c:722
-msgid "Sync memo32 (pedit32)"
-msgstr "Đồng bộ hóa memo32 (pedit32)"
-
-#: prefs_gui.c:727
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "Đồng bộ hóa Manana"
 
-#: prefs_gui.c:733
+#. Show use Japanese Kana extention check box
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "Dùng J-OS (không phải PalmOS của Nhật: WorkPad/CLIE)"
 
-#: prefs_gui.c:746
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "Đồng bộ hóa %s (%s)"
 
-#: print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "Tùy chọn in"
 
-#: print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "Cỡ giấy"
 
-#: print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "Bản in hàng ngày"
 
-#: print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "Bản in hàng tuần"
 
-#: print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "Bản in hàng tháng"
 
-#: print_gui.c:261
-msgid "One record"
-msgstr "Một mục ghi"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "Mới xoá bỏ mục ghi %s."
 
-#: print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "Mọi mục ghi trong phân loại này"
 
-#: print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "In mọi mục ghi"
 
-#: print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "Một mục ghi trong mỗi trang"
 
-#: print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " Dòng trắng giữa hai mục ghi"
 
-#: print_gui.c:318
+#. Print Command
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "Lệnh in (ví dụ: lpr hay cat > tập_tin.ps)"
 
-#: restore_gui.c:68 restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "Phục hồi bộ cầm tay"
 
-#: restore_gui.c:249
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "Tập tin cần cài đặt"
+
+#. Label for instructions
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "Để phục hồi bộ cầm tay của bạn:"
 
-#: restore_gui.c:252
-msgid "1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1. Chọn mọi ứng dụng bạn muốn phục hồi. (Mặc định là tất cả.)"
 
-#: restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. Gõ tên người dùng và ID người dùng."
 
-#: restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. Nhấn nút Được."
 
-#: restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "Việc này sẽ ghi đè lên toàn bộ dữ liệu hiện thời trên bộ cầm phít."
 
-#: restore_gui.c:282
-msgid "User Name"
-msgstr "Tên người dùng"
-
-#: restore_gui.c:295
-msgid "User ID"
-msgstr "ID người dùng"
-
-#: search_gui.c:118
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "sổ ngày"
 
-#: search_gui.c:199
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "địa chỉ"
 
-#: search_gui.c:265
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "cần làm"
 
-#: search_gui.c:319
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "ghi nhớ"
 
-#: search_gui.c:375
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "ghi nhớ"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "bộ cầm phít ?"
 
-#: search_gui.c:447
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "Không tìm thấy"
 
-#: search_gui.c:526 search_gui.c:579
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: search_gui.c:541
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "Tìm kiếm:"
 
-#: search_gui.c:548
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "Phân biệt chữ hoa/thường"
 
-#: sync.c:139
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "việc mở tập tin khoá bị lỗi\n"
 
-#: sync.c:152
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "việc khoá bị lỗi\n"
 
-#: sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "tập tin đồng bộ bị khoá bởi PID %d\n"
 
-#: sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "việc mở khoá bị lỗi\n"
 
-#: sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "việc đồng bộ bị khoá bởi PID %d\n"
 
-#: sync.c:244
-#, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s: bấm nút Hotsync trên giá để, hoặc « kill %d ».\n"
-
-#: sync.c:297
-#, c-format
-msgid "Exiting with status %s\n"
-msgstr "Đang thoát với trạng thái %s\n"
-
-#: sync.c:298
-msgid "Finished\n"
-msgstr "Đã xong\n"
-
-#: sync.c:432
-msgid "Finished installing user information.\n"
-msgstr "Mới cài đặt xong thông tin người dùng.\n"
-
-#: sync.c:457 sync.c:574
-msgid "Check your serial port and settings\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
 msgstr "Hãy kiểm tra cổng nối tiếp và thiết lập\n"
 
-#: sync.c:672
-#, c-format
-msgid " Syncing on device %s\n"
-msgstr " Đang đồng bộ hóa thiết bị %s\n"
-
-#: sync.c:673
-msgid " Press the HotSync button now\n"
-msgstr " Hãy nhấn ngay nút HotSync\n"
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "Không thể đọc thư mục chính\n"
 
-#: sync.c:725 sync.c:747 sync.c:769
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "Tên người dùng được đồng bộ hóa mới đây → « %s »\n"
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (ID người tạo « %s ») là hiện thời nên việc lấy đã bỏ qua.\n"
 
-#: sync.c:726 sync.c:748 sync.c:770
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "ID người dùng được sync mới đây → « %d »\n"
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "Đang lấy « %s » (ID người tạo « %s »)..."
 
-#: sync.c:727 sync.c:749 sync.c:771
+#: ../sync.c:1096 ../sync.c:1433
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr " Tên người dùng này → « %s »\n"
+msgid "Failed, unable to create file %s\n"
+msgstr "Bị lỗi, không thể tạo tập tin %s.\n"
 
-#: sync.c:728 sync.c:750 sync.c:772
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr " ID người dùng này → %d\n"
+msgid "Failed, unable to back up database %s\n"
+msgstr "Bị lỗi, không thể cập nhật cơ sở dữ liệu %s.\n"
 
-#: sync.c:793
-#, c-format
-msgid "Username is \"%s\"\n"
-msgstr "Tên người dùng là « %s »\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "Được\n"
 
-#: sync.c:794
+#: ../sync.c:1304
 #, c-format
-msgid "User ID is %d\n"
-msgstr "ID người dùng là %d\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "Đang bỏ qua %s  (ID người tạo « %s »)\n"
 
-#: sync.c:796 sync.c:802
+#: ../sync.c:1498
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "đồng bộ hóa PC mới đây = %d\n"
+msgid "Installing %s "
+msgstr "Đang cài đặt %s..."
 
-#: sync.c:797
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
-msgid "This PC = %lu\n"
-msgstr "PC này = %lu\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"Không thể mở tập tin « %s »: %s\n"
 
-#: sync.c:798
+#: ../sync.c:1508
 #, c-format
-msgid "Last Username = [%s]\n"
-msgstr "Tên ngưởi dùng cuối cùng = [%s]\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"Không thể đồng bộ hóa tập tin « %s »: tập tin bị hỏng không?\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr " (ID người tạo « %s »)..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr " (ID người tạo « %s »)..."
 
-#: sync.c:799
+#: ../sync.c:1530
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "ID người dùng mới đây = %d\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: sync.c:800
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "Tên người dùng = [%s]\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"Không thể mở tập tin: %s\n"
 
-#: sync.c:801
+#: ../sync.c:1615
 #, c-format
-msgid "userID = %d\n"
-msgstr "ID người dùng = %d\n"
+msgid "Install %s failed"
+msgstr "Việc cài đặt %s bị lỗi."
 
-#: sync.c:819
-msgid "Sync canceled\n"
-msgstr "Đồng bộ hóa bị thôi\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "Bị lỗi.\n"
 
-#: sync.c:841
-msgid "Finished restoring handheld.\n"
-msgstr "Mới phục hồi xong bộ cầm tay.\n"
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "Đã cài đặt %s"
 
-#: sync.c:842
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "Có lẽ bạn cần phải đồng bộ hóa để cập nhật J-Pilot.\n"
+#: ../sync.c:1736
+#, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d Gặp lỗi khi lấy thông tin về ứng dụng %s\n"
 
-#: sync.c:872
-msgid "Doing a fast sync.\n"
-msgstr "Đang đồng bộ hóa nhanh.\n"
+#: ../sync.c:1742 ../sync.c:1772
+#, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d Gặp lỗi khi giải nén thông tin về ứng dụng %s\n"
 
-#: sync.c:911
-msgid "Doing a slow sync.\n"
-msgstr "Đang đồng bộ hóa chậm.\n"
+#: ../sync.c:1763
+#, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Gặp lỗi khi đọc khối thông tin về ứng dụng cho %s\n"
 
-#: sync.c:1012
-msgid "Thank you for using J-Pilot."
-msgstr "Cám ơn bạn đã dùng J-Pilot."
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "Không thể thêm phân loại %s vào bộ ở xa.\n"
 
-#: sync.c:1054
-msgid "Finished.\n"
-msgstr "Đã xong.\n"
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "Quá nhiều phân loại trên bộ ở xa.\n"
+
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "Mọi mục ghi trên máy tính trong %s sẽ được di chuyển sang %s.\n"
 
-#: sync.c:1090 sync.c:2612
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "Đang đồng bộ hóa %s\n"
 
-#: sync.c:1096 sync.c:2276 sync.c:2618
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "Mới ghi một mục ghi %s."
 
-#: sync.c:1098 sync.c:2278 sync.c:2620
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "Việc ghi mục ghi %s bị lỗi."
 
-#: sync.c:1100 sync.c:2280 sync.c:2622
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "Việc xoá bỏ mục ghi %s bị lỗi."
 
-#: sync.c:1102 sync.c:2282 sync.c:2624
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "Đang xoá bỏ mục ghi %s."
 
-#: sync.c:1105 sync.c:2285 sync.c:2627
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "Đang xoá bỏ mục ghi %s."
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "Mới ghi mục ghi %s."
 
-#: sync.c:1107 sync.c:2287 sync.c:2629
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "Việc ghi mục ghi %s bị lỗi."
 
-#: sync.c:1109 sync.c:2289 sync.c:2631
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "Việc xoá bỏ mục ghi %s bị lỗi."
 
-#: sync.c:1111 sync.c:2291 sync.c:2633
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "Mới xoá bỏ mục ghi %s."
 
-#: sync.c:1131
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "number of records = %d\n"
-msgstr "số mục ghi = %d\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
+
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: sync.c:1258 sync.c:2436
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2059,758 +2847,841 @@ msgstr ""
 "Việc « dlp_DeleteRecord » (xoá bỏ mục ghi) bị lỗi.\n"
 "Có lẽ vì mục ghi đó đã bị xoá bỏ trên Palm.\n"
 
-#: sync.c:1357 sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (ID người tạo « %s ») là hiện thời nên việc lấy đã bỏ qua.\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "Mới cài đặt xong thông tin người dùng.\n"
 
-#: sync.c:1361 sync.c:1774
+#: ../sync.c:3094
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "Đang lấy « %s » (ID người tạo « %s »)..."
+msgid " Syncing on device %s\n"
+msgstr " Đang đồng bộ hóa thiết bị %s\n"
 
-#: sync.c:1368 sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "Bị lỗi, không thể tạo tập tin %s.\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " Hãy nhấn ngay nút HotSync\n"
 
-#: sync.c:1379 sync.c:1789
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "Bị lỗi, không thể cập nhật cơ sở dữ liệu %s.\n"
-
-#: sync.c:1383 sync.c:1793 sync.c:1975
-msgid "OK\n"
-msgstr "Được\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "Tên người dùng được đồng bộ hóa mới đây → « %s »\n"
 
-#: sync.c:1686
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "Đang bỏ qua %s  (ID người tạo « %s »)\n"
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "ID người dùng được sync mới đây → « %d »\n"
 
-#: sync.c:1861
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid "Installing %s "
-msgstr "Đang cài đặt %s..."
+msgid " This Username-->\"%s\"\n"
+msgstr " Tên người dùng này → « %s »\n"
 
-#: sync.c:1867
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"Không thể mở tập tin « %s »: %s\n"
+msgid " This User ID-->%d\n"
+msgstr " ID người dùng này → %d\n"
 
-#: sync.c:1871
+#: ../sync.c:3204
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"Không thể đồng bộ hóa tập tin « %s »: tập tin bị hỏng không?\n"
+msgid "Username is \"%s\"\n"
+msgstr "Tên người dùng là « %s »\n"
 
-#: sync.c:1883
+#: ../sync.c:3205
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr " (ID người tạo « %s »)..."
+msgid "User ID is %d\n"
+msgstr "ID người dùng là %d\n"
 
-#: sync.c:1903 sync.c:1916 sync.c:1931 sync.c:1944
+#: ../sync.c:3207
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"Không thể mở tập tin: %s\n"
+msgid "lastSyncPC = %d\n"
+msgstr "đồng bộ hóa PC mới đây = %d\n"
 
-#: sync.c:1960
+#: ../sync.c:3208
 #, c-format
-msgid "Install %s failed"
-msgstr "Việc cài đặt %s bị lỗi."
-
-#: sync.c:1964
-msgid "Failed.\n"
-msgstr "Bị lỗi.\n"
+msgid "This PC = %lu\n"
+msgstr "PC này = %lu\n"
 
-#: sync.c:1971
-#, c-format
-msgid "Installed %s "
-msgstr "Đã cài đặt %s"
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "Đồng bộ hóa bị thôi\n"
 
-#: sync.c:1995 sync.c:2001
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "Không thể mở tập tin: %s%s\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "Mới phục hồi xong bộ cầm tay.\n"
 
-#: sync.c:2181
-msgid "Unable to read home dir\n"
-msgstr "Không thể đọc thư mục chính\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "Có lẽ bạn cần phải đồng bộ hóa để cập nhật J-Pilot.\n"
 
-#: sync.c:2710
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "palm: số mục ghi = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "Đang đồng bộ hóa nhanh.\n"
 
-#: sync.c:2711
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "đĩa: số mục ghi = %d\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "Đang đồng bộ hóa chậm.\n"
 
-#: sync.c:2889
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d Gặp lỗi khi lấy thông tin về ứng dụng %s\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "Cám ơn bạn đã dùng J-Pilot."
 
-#: sync.c:2895 sync.c:2937
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d Gặp lỗi khi giải nén thông tin về ứng dụng %s\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "Đã xong.\n"
 
-#: sync.c:2917 sync.c:2929
+#: ../sync.c:3446
 #, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Gặp lỗi khi đọc khối thông tin về ứng dụng cho %s\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#: sync.c:3077 sync.c:3081
+#: ../sync.c:3447
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "Không thể thêm phân loại %s vào bộ ở xa.\n"
-
-#: sync.c:3078 sync.c:3084
-msgid "Too many categories on remote.\n"
-msgstr "Quá nhiều phân loại trên bộ ở xa.\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: sync.c:3079 sync.c:3087
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "Mọi mục ghi trên máy tính trong %s sẽ được di chuyển sang %s.\n"
+msgid "Exiting with status %s\n"
+msgstr "Đang thoát với trạng thái %s\n"
 
-#: todo.c:248
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "Chuỗi mô tả Cần làm > %d nên cắt xén nó thành %d\n"
 
-#: todo.c:255
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "Chuỗi ghi chú Cần làm > %d nên cắt xén nó thành %d\n"
 
-#: todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d Gặp lỗi khi đọc thông tin phân loại %s\n"
-
-#: todo_gui.c:154
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "Ngày đến hạn"
 
-#: todo_gui.c:561
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "Tập tin có vẻ không phải có dạng thức <cần_làm.dat>.\n"
 
-#: todo_gui.c:720 todo_gui.c:735
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "Không thể xuất Cần làm %d\n"
 
-#: todo_gui.c:1556
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "Ngày đến hạn"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "Ngày đến hạn"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "Ưu tiên: "
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "Hoàn tất"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "Ưu tiên ở ngoại phạm vi.\n"
 
-#: todo_gui.c:1772
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
+#, c-format
+msgid "No date"
+msgstr "Không có ngày"
+
+#. Completed checkbox
+#: ../todo_gui.c:2411
+msgid "Completed"
+msgstr "Hoàn tất"
+
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
+msgstr "Ưu tiên: "
+
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
+msgid "Date Due:"
+msgstr "Ngày tới hạn:"
+
+#: ../utils.c:330
+msgid "Today"
+msgstr "Hôm nay"
+
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "Không tìm thấy tập tin cơ sở dữ liệu rỗng %s: %s\n"
+
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " không thể được cài đặt.\n"
+
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
 #, c-format
-msgid "No date"
-msgstr "Không có ngày"
+msgid "Can't create directory %s\n"
+msgstr "Không thể tạo thư mục %s\n"
 
-#: todo_gui.c:2223
-msgid "Completed"
-msgstr "Hoàn tất"
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s là thư mục"
 
-#: todo_gui.c:2231
-msgid "Priority: "
-msgstr "Ưu tiên: "
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "Không thể ghi tập tin trong thư mục %s\n"
 
-#: todo_gui.c:2251
-msgid "Date Due:"
-msgstr "Ngày tới hạn:"
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "Lưu mục ghi đã thay đổi không?"
 
-#: todo_gui.c:2313 Expense/expense.c:1862 KeyRing/keyring.c:1689
-msgid "Note"
-msgstr "Ghi chú"
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "Bạn có muốn lưu các thay đổi của mục ghi này không?"
 
-#: utils.c:76
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v hiện phiên bản và tùy chọn biên dịch rồi thoát.\n"
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "Lưu mục ghi mới không?"
 
-#: utils.c:78
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d hiện thông tin gỡ lỗi vào thiết bị xuất chuẩn.\n"
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "Bạn có muốn lưu mục ghi mới này không?"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "bị lặp vô hạn nên ngắt nó\n"
 
-#: utils.c:79
-msgid " -p do not load plugins.\n"
-msgstr " -p đừng tải bộ cầm phít.\n"
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
+msgstr "Không tải bộ cầm phít.\n"
 
-#: utils.c:80
-msgid " -a ignore missed alarms since the last time this program was run.\n"
-msgstr " -a bỏ qua các báo động nhỡ sau khi lần cuối cùng chạy chương trình này.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
+msgstr ""
+" -a bỏ qua các báo động nhỡ sau khi lần cuối cùng chạy chương trình này.\n"
 
-#: utils.c:81
-msgid " -A ignore all alarms)); past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A bỏ qua mọi báo động)); qua và tới.\n"
 
-#: utils.c:82
-msgid " -i makes jpilot iconify itself upon launch\n"
-msgstr " -i thu gọn J-Pilot vào lúc khởi chạy\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: utils.c:83
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " Hai biến môi trường PILOTPORT và PILOTRATE được dùng để ghi rõ\n"
 
-#: utils.c:84
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " cổng nào nơi cần đồng bộ hóa, tại tốc độ nào.\n"
 
-#: utils.c:85
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr "Nếu chưa đặt cổng PILOTPORT nên mặc định là </dev/pilot>.\n"
 
-#: utils.c:110
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Lỗi đọc tập tin"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "Ngày đã biên dịch"
 
-#: utils.c:111
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "Đã biên dịch với những tùy chọn này:"
 
-#: utils.c:113
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "Đường dẫn đã cài đặt"
 
-#: utils.c:115
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "phiên bản pilot-link"
 
-#: utils.c:119
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "Hỗ trợ USB"
 
-#: utils.c:121 utils.c:127 utils.c:133 utils.c:139 utils.c:145 utils.c:151
-#: utils.c:157
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "có"
 
-#: utils.c:123 utils.c:129 utils.c:135 utils.c:141 utils.c:147 utils.c:153
-#: utils.c:159
-msgid "no"
-msgstr "không"
-
-#: utils.c:125
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "Hỗ trợ mục ghi riêng"
 
-#: utils.c:131
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "không"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Hỗ trợ Sổ Ngày"
 
-#: utils.c:137
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "Hỗ trợ bộ cầm phít"
 
-#: utils.c:143
+#: ../utils.c:2002
 msgid "Manana support"
 msgstr "Hỗ trợ Manana"
 
-#: utils.c:149
+#: ../utils.c:2008
 msgid "NLS support (foreign languages)"
 msgstr "Hỗ trợ NLS (tiếng nước ngoài)"
 
-#: utils.c:155
+#: ../utils.c:2014
 msgid "GTK2 support"
 msgstr "Hỗ trợ GTK2"
 
-#: utils.c:198
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "Ngày hôm nay là %A, %x %X"
-
-#: utils.c:200
+#. No HOME var
+#: ../utils.c:2057
 #, c-format
-msgid "Today is %%A, %s %s"
-msgstr "Ngày hôm nay là %%A, %s %s"
-
-#: utils.c:1089
-msgid "Today"
-msgstr "Hôm nay"
+msgid "Can't get HOME environment variable\n"
+msgstr "Không thể lấy biến môi trường HOME\n"
 
-#: utils.c:1283
-msgid "Save Changed Record?"
-msgstr "Lưu mục ghi đã thay đổi không?"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
+msgstr "Biến môi trường HOME của bạn là quá dài.\n"
 
-#: utils.c:1284
-msgid "Do you want to save the changes to this record?"
-msgstr "Bạn có muốn lưu các thay đổi của mục ghi này không?"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "Sửa đổi phân loại"
 
-#: utils.c:1289
-msgid "Save New Record?"
-msgstr "Lưu mục ghi mới không?"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "ID PC là 0.\n"
 
-#: utils.c:1290
-msgid "Do you want to save this new record?"
-msgstr "Bạn có muốn lưu mục ghi mới này không?"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "Đã tạo ra một ID PC mới. Đó là %lu\n"
 
-#: utils.c:1310 KeyRing/keyring.c:1385
-msgid "Can't get HOME environment variable\n"
-msgstr "Không thể lấy biến môi trường HOME\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: utils.c:1317 KeyRing/keyring.c:1390
-msgid "Your HOME environment variable is too long for me\n"
-msgstr "Biến môi trường HOME của bạn là quá dài.\n"
+#: ../utils.c:3537
+#, c-format
+msgid "Today is %A, %x %X"
+msgstr "Ngày hôm nay là %A, %x %X"
 
-#: utils.c:1342 utils.c:1346
+#: ../utils.c:3539
 #, c-format
-msgid "Can't create directory %s\n"
-msgstr "Không thể tạo thư mục %s\n"
+msgid "Today is %%A, %s %s"
+msgstr "Ngày hôm nay là %%A, %s %s"
 
-#: utils.c:1352
+#: ../utils.c:3768
 #, c-format
 msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
 msgstr ""
-"%s không có vẻ là thư mục.\n"
-"Phải là thư mục.\n"
 
-#: utils.c:1360
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "Không thể ghi tập tin trong thư mục %s\n"
-
-#: utils.c:1418 utils.c:1427
-msgid "Error writing PC header to file: next_id\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
 msgstr "Gặp lỗi khi ghi phần đầu PC vào tập tin: next_id\n"
 
-#: utils.c:1423
-msgid "Error writing next id to file: next_id\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
 msgstr "Gặp lỗi khi ghi ID kế tiếp vào tập tin: next_id\n"
 
-#: utils.c:1440
-msgid "Error opening file: next_id\n"
-msgstr "Gặp lỗi khi mở tập tin: next_id\n"
-
-#: utils.c:1608
-#, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "Không tìm thấy tập tin cơ sở dữ liệu rỗng %s: %s\n"
-
-#: utils.c:1611
-msgid " may not be installed.\n"
-msgstr " không thể được cài đặt.\n"
-
-#: utils.c:1794
-msgid "Error reading file"
-msgstr "Lỗi đọc tập tin"
-
-#: utils.c:2475
-msgid "PC ID is 0.\n"
-msgstr "ID PC là 0.\n"
-
-#: utils.c:2476
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "Đã tạo ra một ID PC mới. Đó là %lu\n"
-
-#: weekview_gui.c:303
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "Xem tuần"
 
-#: Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "Úc"
 
-#: Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "Áo"
 
-#: Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "Bỉ"
 
-#: Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "Bra-xin"
 
-#: Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "Ca-na-đa"
 
-#: Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "Đan-mạch"
 
-#: Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "EU (đồng Âu €)"
 
-#: Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "Phần-lan"
 
-#: Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "Pháp"
 
-#: Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "Đức"
 
-#: Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "Hồng Kông"
 
-#: Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "Băng-đảo"
 
-#: Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "Ấn-độ"
 
-#: Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "Nam-dương"
 
-#: Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "Ái-nhĩ-lan"
 
-#: Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "Ý"
 
-#: Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "Nhật-bản"
 
-#: Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "Triều-tiên"
 
-#: Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "Lúc-xăm-buac"
 
-#: Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "Ma-lay-xi-a"
 
-#: Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "Mê-hi-cô"
 
-#: Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "Hoà-lan"
 
-#: Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "Niu Di-lân"
 
-#: Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "Na-uy"
 
-#: Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "P.R.C."
 
-#: Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "Phi-luật-tân"
 
-#: Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "Xin-ga-po"
 
-#: Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "Tây-ban-nha"
 
-#: Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "Thụy-điển"
 
-#: Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "Thụy-sĩ"
 
-#: Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "Đài-loan"
 
-#: Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "Thái-lan"
 
-#: Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "Vương quốc Anh Thống nhất"
 
-#: Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "Mỹ"
 
-#: Expense/expense.c:505 Expense/expense.c:516
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "Phí tổn"
 
-#: Expense/expense.c:537 Expense/expense.c:1410
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "Tiền vé"
 
-#: Expense/expense.c:539 Expense/expense.c:1411
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "Ăn sáng"
 
-#: Expense/expense.c:541 Expense/expense.c:1412
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "Xe búyt"
 
-#: Expense/expense.c:543 Expense/expense.c:1413
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "Ăn làm việc"
 
-#: Expense/expense.c:545 Expense/expense.c:1414
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "Thuê xe"
 
-#: Expense/expense.c:547 Expense/expense.c:1415
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "Ăn cơm"
 
-#: Expense/expense.c:549 Expense/expense.c:1416
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "Giải trí"
 
-#: Expense/expense.c:551 Expense/expense.c:1417
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "Điện thư"
 
-#: Expense/expense.c:553 Expense/expense.c:1418
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "Dầu"
 
-#: Expense/expense.c:555 Expense/expense.c:1419
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "Quà biếu"
 
-#: Expense/expense.c:557 Expense/expense.c:1420
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "Khách san"
 
-#: Expense/expense.c:559 Expense/expense.c:1421
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "Lặt vặt"
 
-#: Expense/expense.c:561 Expense/expense.c:1422
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "Giặt"
 
-#: Expense/expense.c:563 Expense/expense.c:1423
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "Xe hòm"
 
-#: Expense/expense.c:565 Expense/expense.c:1424
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "Chỗ trợ"
 
-#: Expense/expense.c:567 Expense/expense.c:1425
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "Ăn trưa"
 
-#: Expense/expense.c:569 Expense/expense.c:1426
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "Lý/giờ"
 
-#: Expense/expense.c:573 Expense/expense.c:1428
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "Đậu xe"
 
-#: Expense/expense.c:575 Expense/expense.c:1429
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "Bưu phí"
 
-#: Expense/expense.c:577 Expense/expense.c:1430
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "Ăn vội vàng"
 
-#: Expense/expense.c:579 Expense/expense.c:1431
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "Xe điện ngầm"
 
-#: Expense/expense.c:581 Expense/expense.c:1432
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "Đồ cung cấp"
 
-#: Expense/expense.c:583 Expense/expense.c:1433
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "Xe tắc xi"
 
-#: Expense/expense.c:585 Expense/expense.c:1434
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "Điện thoại"
 
-#: Expense/expense.c:587 Expense/expense.c:1435
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "Tiền chè lá "
 
-#: Expense/expense.c:589 Expense/expense.c:1436
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "Thuế qua đường"
 
-#: Expense/expense.c:591 Expense/expense.c:1437
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "Xe lửa"
 
-#: Expense/expense.c:605
-msgid "AmEx"
-msgstr "AmEx"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr "Phí tổn: kiểu phí tổn không rõ\n"
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr "Phí tổn: kiểu trả không rõ\n"
+
+# Name: don't translate / Tên: đừng dịch
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "American Express"
 
-#: Expense/expense.c:607 Expense/expense.c:1400
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "Tiền mặt"
 
-#: Expense/expense.c:609 Expense/expense.c:1401
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "Séc"
 
-#: Expense/expense.c:611
-msgid "CreditCard"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
 msgstr "Thẻ tín dụng"
 
 # Name: don't translate / Tên: đừng dịch
-#: Expense/expense.c:613
-msgid "MasterCard"
-msgstr "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
+msgstr "Master Card"
 
-#: Expense/expense.c:615 Expense/expense.c:1404
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "Trả trước"
 
 # Name: don't translate / Tên: đừng dịch
-#: Expense/expense.c:617 Expense/expense.c:1405
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA"
 
-#: Expense/expense.c:1210
-msgid "Expense: Unknown category\n"
-msgstr "Phí tổn: phân loại không rõ\n"
-
-#: Expense/expense.c:1216
-msgid "Expense: Unknown expense type\n"
-msgstr "Phí tổn: kiểu phí tổn không rõ\n"
-
-#: Expense/expense.c:1222
-msgid "Expense: Unknown payment type\n"
-msgstr "Phí tổn: kiểu trả không rõ\n"
-
-# Name: don't translate / Tên: đừng dịch
-#: Expense/expense.c:1399
-msgid "American Express"
-msgstr "American Express"
-
-#: Expense/expense.c:1402
-msgid "Credit Card"
-msgstr "Thẻ tín dụng"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "Kiểu :"
 
-# Name: don't translate / Tên: đừng dịch
-#: Expense/expense.c:1403
-msgid "Master Card"
-msgstr "Master Card"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "Số tiền:"
 
-#: Expense/expense.c:1687
+#. Category Menu
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "Loại:"
 
-#: Expense/expense.c:1700
+#. Type Menu
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "Kiểu :"
 
-#: Expense/expense.c:1713
+#. Payment Menu
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "Số tiền trả:"
 
-#: Expense/expense.c:1726
+#. Currency Menu
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "Tiền tệ:"
 
-#: Expense/expense.c:1739
-msgid "Date:"
-msgstr "Ngày:"
-
-#: Expense/expense.c:1756
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "Tháng:"
 
-#: Expense/expense.c:1770
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "Hôm:"
 
-#: Expense/expense.c:1784
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "Năm:"
 
-#: Expense/expense.c:1797
+#. Amount Entry
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "Số tiền:"
 
-#: Expense/expense.c:1811
+#. Vendor Entry
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "Nhà bán:"
 
-#: Expense/expense.c:1825
+#. City
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "Phố :"
 
-#: Expense/expense.c:1839
+#. Attendees
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "Người dự"
 
-#: KeyRing/keyring.c:182
-msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
-msgstr "Vòng chìa khoá: pack_KeyRing(): « buf_size » (kích cỡ bộ đệm) quá nhõ\n"
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
 
-#: KeyRing/keyring.c:501 KeyRing/keyring.c:512
-msgid "KeyRing"
-msgstr "Vòng chìa khoá"
+#: ../KeyRing/keyring.c:289
+msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
+msgstr ""
+"Vòng chìa khoá: pack_KeyRing(): « buf_size » (kích cỡ bộ đệm) quá nhõ\n"
 
-#: KeyRing/keyring.c:1297
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "Không đúng, gõ lại mật khẩu vòng chìa khoá"
 
-#: KeyRing/keyring.c:1299
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "Gõ mật khẩu vòng chìa khoá MỚI"
 
-#: KeyRing/keyring.c:1301
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "Gõ mật khẩu vòng chìa khoá"
 
-#: KeyRing/keyring.c:1395
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "KeyRing: không tìm thấy tập tin %s.\n"
 
-#: KeyRing/keyring.c:1396
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "KeyRing: hãy cố đồng bộ hoá.\n"
 
-#: KeyRing/keyring.c:1485
-msgid "Account"
-msgstr "Tài khoản"
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
+msgid "KeyRing"
+msgstr "Vòng chìa khoá"
+
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "Không thể xuất ghi nhớ %d.\n"
 
-#: KeyRing/keyring.c:1498
+#. Change Password button
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -2820,22 +3691,274 @@ msgstr ""
 "mật khẩu\n"
 "vòng chìa khoá"
 
-#: KeyRing/keyring.c:1662
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "Áp dụng thay đổi"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "Tài khoản"
+
+#. Name entry
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "tên: "
 
-#: KeyRing/keyring.c:1669
+#. Account entry
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "tài khoản: "
 
-#: KeyRing/keyring.c:1676
+#. Password entry
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "mật khẩu : "
 
-#: KeyRing/keyring.c:1682
+#. Last Changed entry
+#: ../KeyRing/keyring.c:2683
+msgid "last changed: "
+msgstr ""
+
+#. Generate Password button (creates random password)
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "Tạo ra mật khẩu"
 
+#: ../SyncTime/synctime.c:59
+#, fuzzy
+msgid "SyncTime"
+msgstr "Đồng bộ hóa Ghi nhớ"
+
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
+msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
+msgstr ""
+
+#: ../SyncTime/synctime.c:105
+msgid "synctime: NOT setting the time on the pilot\n"
+msgstr ""
+
+#: ../SyncTime/synctime.c:110
+msgid "synctime: Setting the time on the pilot... "
+msgstr ""
+
+#: ../SyncTime/synctime.c:115
+#, fuzzy
+msgid "Done\n"
+msgstr "Đã xong"
+
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "Ghi đè tập tin"
+
+#~ msgid "Directory"
+#~ msgstr "Thư mục"
+
+#~ msgid "Filename"
+#~ msgstr "Tên tập tin"
+
+#~ msgid "Field"
+#~ msgstr "Trường"
+
+# Literal: don't translate / Nghĩa chữ: đừng dịch
+#~ msgid "kana("
+#~ msgstr "kana("
+
+#~ msgid "Quick View"
+#~ msgstr "Xem nhanh"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "Không thể mở tập tin %s%s.\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "Không thể mở tập tin <%s.alarms>.\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "Bạn không thể hiệu chỉnh phân loại %s.\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "Bạn không thể xoá bỏ phân loại %s.\n"
+
+#~ msgid "category name"
+#~ msgstr "tên loại"
+
+#~ msgid "debug"
+#~ msgstr "gỡ lỗi"
+
+#~ msgid "Answer: "
+#~ msgstr "Đáp :"
+
+#~ msgid "none"
+#~ msgstr "không có"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr ""
+#~ "Không biết kiểu lặp lại repeatType được tìm trong cơ sở dữ liệu Sổ Ngày "
+#~ "DatebookDB\n"
+
+#~ msgid "W"
+#~ msgstr "Tn"
+
+#~ msgid "M"
+#~ msgstr "Th"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "Sự kiện này không có giờ riêng"
+
+#~ msgid "Start Time"
+#~ msgstr "Giờ đầu"
+
+#~ msgid "End Time"
+#~ msgstr "Giờ cuối"
+
+#~ msgid "Dismiss"
+#~ msgstr "Bỏ qua"
+
+#~ msgid "Quit"
+#~ msgstr "Thoát"
+
+#~ msgid "Add"
+#~ msgstr "Thêm"
+
+#~ msgid "Close"
+#~ msgstr "Đóng"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = phiên bản\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = trợ giúp\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = chạy trong chế độ gỡ lỗi\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = đừng tải bộ cầm phít\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr " -b = đồng bộ hóa rồi sao lưu hết, không thì chỉ đồng bộ hóa.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "Đặc tả dạng hình không hợp lệ: « %s ».\n"
+
+#~ msgid "Help"
+#~ msgstr "Trợ giúp"
+
+#~ msgid "Sync"
+#~ msgstr "Đồng bộ"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/Trợ giúp/Chương trìinh trả lại"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "Hộp thoại chọn phông chữ"
+
+#~ msgid "Clear"
+#~ msgstr "Xoá"
+
+#~ msgid "Show private records"
+#~ msgstr "Hiện bản ghi riêng"
+
+#~ msgid "Hide private records"
+#~ msgstr "Ẩn bản ghi riêng"
+
+#~ msgid "Mask private records"
+#~ msgstr "Lọc bản ghi riêng"
+
+#~ msgid "Font"
+#~ msgstr "Phông chữ"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "Đi tới trình đơn \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" và thay đổi \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "Không thể mở tập tin mục ghi PC\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "Hôm thứ nhất trong tuần là "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "Cổng nối tiếp (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "Tốc độ nối tiếp (không có tác động USB)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "Đồng bộ hóa memo32 (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "Một mục ghi"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s: bấm nút Hotsync trên giá để, hoặc « kill %d ».\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "Đã xong\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "Tên ngưởi dùng cuối cùng = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "ID người dùng mới đây = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "Tên người dùng = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "ID người dùng = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "palm: số mục ghi = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "đĩa: số mục ghi = %d\n"
+
+#~ msgid " -p do not load plugins.\n"
+#~ msgstr " -p đừng tải bộ cầm phít.\n"
+
+#~ msgid " -i makes jpilot iconify itself upon launch\n"
+#~ msgstr " -i thu gọn J-Pilot vào lúc khởi chạy\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s không có vẻ là thư mục.\n"
+#~ "Phải là thư mục.\n"
+
+#~ msgid "AmEx"
+#~ msgstr "AmEx"
+
+#~ msgid "CreditCard"
+#~ msgstr "Thẻ tín dụng"
+
+# Name: don't translate / Tên: đừng dịch
+#~ msgid "MasterCard"
+#~ msgstr "MasterCard"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "Phí tổn: phân loại không rõ\n"
+
 #~ msgid "\n"
 #~ msgstr "\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c3f4dfa9..69f7a95d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,40 +8,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot 0.99.8-pre12\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2005-10-18 13:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "内存溢出"
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "错误"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s:%d 读取类别信息 %s 出错\n"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "读取文件出错：%s\n"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "错误"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -49,413 +61,559 @@ msgstr ""
 "此记录已删除。\n"
 "请先取消删除，或者复制该记录，再进行更改。\n"
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "无法打开文件：%s\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "无法打开文件：%s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "文件似乎不是 address.dat 格式\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "未归档"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "确定"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "否"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "是"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s 是目录"
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "打开文件时发生错误"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "您要覆盖文件 %s 吗？"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "覆盖文件？"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "打开文件时出错：%s"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "无法导出第%d个地址\n"
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-msgid "Field"
-msgstr "域"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "类别："
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "私有"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "电子邮件"
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "未知的导出类型\n"
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "公司/姓名"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "姓名/公司"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "姓名/公司"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "公司/姓名"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "您无法修改已删除的记录\n"
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "类别非法\n"
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "执行此命令 = [%s]\n"
 
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
+
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "锁定失败\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
 #. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "类别："
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
-msgstr "kana("
-
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
-msgstr "电子邮件"
-
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "邮件"
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "拨号"
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-未命名-"
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 项记录"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "%2$d 项记录(共 %1$d 项)"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
-msgstr "编辑类别"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "姓名"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "地址"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "其他"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "注释"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "电话"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 msgid "Quick Find: "
 msgstr "快速查找："
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "取消"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 msgid "Cancel the modifications"
 msgstr "取消修改"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "删除"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete the selected record"
 msgstr "删除选中的记录"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "取消删除"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete the selected record"
 msgstr "取消选中记录的删除"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "复制"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy the selected record"
 msgstr "复制选中的记录"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "新建记录"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "Add a new record"
 msgstr "添加新记录"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "添加记录"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add the new record"
 msgstr "添加新记录"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "应用更改"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Commit the modifications"
 msgstr "确认修改"
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "私有"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "姓名"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "地址"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "其他"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "取消"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "全部"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "删除"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "在列表\n"
 "显示"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "快速查看"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "提醒我"
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "天"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "全部"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "分钟"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "小时"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "提醒我"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "无法打开 %s%s 文件\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "无法打开文件：%s%s\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "约会提醒"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "过往约会"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "延迟约会"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "约会"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "J-Pilot 提醒"
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr "无穷询问，跳出\n"
-
-#: ../alarms.c:1531
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "无法打开 %s.alarms 文件\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-msgid "rename failed"
-msgstr "重命名失败"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "PC 文件损坏了？\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek 失败 - 严重错误\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "重命名失败"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "移动"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "编辑类别"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "达到了可使用的最大类别数(16)"
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "输入新类别"
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 #, fuzzy
 msgid "Edit Categories Error"
 msgstr "编辑类别"
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "您必须选择要重命名的类别"
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "您无法编辑类别 %s。\n"
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "输入新类别名称"
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "您必须选择要删除的类别"
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr "您无法删除类别 %s。\n"
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
@@ -463,199 +621,336 @@ msgstr ""
 "%2$s 中有 %1$d 项记录。\n"
 "您是想要将其移动到 %3$s 中，还是删除？"
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "无效的状态文件 %s 第 %d 行\n"
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "无法多次使用类别 %s"
 
-#. correctly translate title
-#: ../category.c:813
-msgid "category name"
-msgstr "类别名称"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "类别："
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "新建"
 
-#: ../category.c:845
+#: ../category.c:841
 msgid "Rename"
 msgstr "重命名"
 
-#: ../category.c:960
-msgid "debug"
-msgstr "调试"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "未知类型 ="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "每行域数不等于 %d，格式未知\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "域数不等于 %d，格式未知\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "格式未知，文件的大纲不对\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "文件大纲为："
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "应该为："
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr "%s:%d 第%d条记录，第%d个域：无效的类型。应该是 %d，却是 %d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "读到文件结束\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "行事历中有未知的重复类型(%d)\n"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "重复方式："
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "哪天重复："
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "重复方式："
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "哪天重复："
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "哪天重复："
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "哪天重复："
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "日"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "一"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "二"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "三"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "四"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "五"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "六"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "终束日期"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "哪天重复："
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "记录数目 = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "注释"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "闹铃"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "重复方式："
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "第几周第几天"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "约会描述文本 > %d，截断为 %d\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "错误"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "文件似乎不是 datebook.dat 格式\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "未知导出类型"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "导出"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "导出全部 Datebook 记录"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "另存为"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "浏览"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "行事历类别"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "关闭"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "无"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "开始日期"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "终束日期"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "星期一"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "星期五"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "第四周"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "月尾周"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -668,249 +963,234 @@ msgstr ""
 "也可以在每月的最后一个%s重复。\n"
 "您想要哪种重复？"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "问题？"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "这是一个重复发生的事生。\n"
 "您刚做的修改，是仅适用于“当前”事件，\n"
 "抑或是这事件“每次发生”时都适用？"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "当前事件"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "无"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "天"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "周"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "个月"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "年"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "您添加的约会不可以每 %d %s重复一次。\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
+#, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr "您添加了一个每周重复约会，但该约会未在一周的任何一天重复。"
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "未定时间"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "无效约会"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
 msgstr "此约会的结束日期早于开始日期。"
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "无限期"
 
-#: ../datebook_gui.c:3021
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "DateBookDB 中有错，advanceUnits = %d\n"
 
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "DateBookDB 中有未知的 repeatType\n"
-
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr "%%a.，%s"
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr " (今天)"
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "周"
 
-#: ../datebook_gui.c:4206
-msgid "W"
-msgstr "周"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "按周查看约会"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "月"
 
-#: ../datebook_gui.c:4218
-msgid "M"
-msgstr "月"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "按月查看约会"
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "类别"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "时间"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "显示待办"
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "任务"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "到期日"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "闹铃"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "天"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "此事件无特定时间"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "日期："
 
-#: ../datebook_gui.c:4493
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "开始日期："
 
-#: ../datebook_gui.c:4507
-msgid "Start Time"
-msgstr "开始时间"
-
-#: ../datebook_gui.c:4525
-msgid "End Time"
-msgstr "结束时间"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "结束日期："
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "DateBk 标记"
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "天"
 
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "年"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "此事件不会重复"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "重复频率是每"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "天"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "结束日期："
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "周"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "哪天重复："
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "月"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "重复方式："
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "第几周第几天"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "该月的第几天"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "年"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "电话拨号器"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "前缀 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "前缀 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "前缀 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "电话号码："
 
@@ -918,232 +1198,138 @@ msgstr "电话号码："
 msgid "Extension"
 msgstr "分机"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "拨号命令"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "未接"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "文件浏览器"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "请选择要导出的记录"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "使用 Ctrl 和 Shift 键"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "导入"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "若要切换到隐藏目录，请在下面输入后按 TAB 键"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "完成"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "导入文件类型"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "记录已标记为私人的"
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "记录未标记为私人的"
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "导入前的类别是：[%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "记录将被存放于类别 [%s]"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "全部导入"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "跳过"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "安装"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "若要切换到隐藏目录，请在下面输入后按 TAB 键"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "要安装的文件"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "导入文件类型"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "添加"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "要安装的文件"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "删除"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "安装"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/文件(F)/安装用户"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "用户名"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "用户 ID"
 
-#: ../jpilot-dump.c:95
-#, fuzzy
-msgid " +D +A +T +M format like date +format.\n"
-msgstr " +B +M +A +T 格式就是日期+格式(请查看 -? 中的更多信息)。\n"
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr " -v 显示版本并退出。\n"
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr " -h 显示帮助并退出。\n"
-
-#: ../jpilot-dump.c:98
-#, fuzzy
-msgid " -f displays help for format codes.\n"
-msgstr " -h 显示帮助并退出。\n"
-
-#: ../jpilot-dump.c:99
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr " -B 转存行事历。\n"
-
-#: ../jpilot-dump.c:100
-#, fuzzy
-msgid " -N dump appts for today in DateBook.\n"
-msgstr " -N 将今天的应用转存到行事历。\n"
-
-#: ../jpilot-dump.c:101
-#, fuzzy
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr " -NYYYY/MM/DD 转存行事历中 YYYY/MM/DD 中的应用。\n"
-
-#: ../jpilot-dump.c:102
-msgid " -A dump Address book.\n"
-msgstr " -A 转存地址簿。\n"
-
-#: ../jpilot-dump.c:103
-#, fuzzy
-msgid " -T dump ToDo list as CSV.\n"
-msgstr " -M 将待办工作列表转存为 CSV。\n"
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr " -M 转存备忘。\n"
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr " J-Pilot 首选项可读取端口、速率、备份数，等等。\n"
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr " -v = 版本\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr " -h = 帮助\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = 以调试模式运行\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = 不装入插件。\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = 执行同步并备份，否则只同步。\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l = 循环，否则只同步一次并退出。\n"
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr " -p {端口} = 使用此端口同步，而不是从首选项获取端口。\n"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "指定了无效的地理位置：“%s”\n"
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "打印"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "这个管道不支持打印。"
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "这个管道不支持导入"
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "这个管道不支持导出"
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "取消同步"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "此 Palm 中的用户名或用户 ID 与上次同步所用\n"
@@ -1151,14 +1337,16 @@ msgstr ""
 "如果您不确定的话，请阅读用户手册。"
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
+#, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "此 Palm 的用户 ID 为 NULL。\n"
@@ -1168,246 +1356,226 @@ msgstr ""
 "户。\n"
 "如果您不确定的话，请阅读用户手册。"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "取消同步"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "忽略问题，照样同步"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "同步问题"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr " 用户："
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "同步进程中有未知命令\n"
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/文件(F)/tear"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "文件(F)/查找(_F)"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/文件(F)/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/文件(F)/安装(_I)"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/文件(F)/导入"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/文件(F)/导出"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/文件(F)/首选项"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/文件(F)/打印(_P)"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 msgid "/File/Install User"
 msgstr "/文件(F)/安装用户"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/文件(F)/恢复手持设备"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/文件(F)/退出"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/查看(V)/隐藏私人记录"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/查看(V)/显示私人记录"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/查看(V)/屏蔽私人记录"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/查看(V)/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/查看(V)/行事历"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/查看(V)/地址簿"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/查看(V)/待办工作"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/查看(V)/备忘录"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/插件(_P)"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/_Web"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web/Netscape"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web/Mozilla"
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web/Galeon"
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web/Opera"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web/GnomeUrl"
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web/Lynx"
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web/Links"
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web/W3M"
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web/Konqueror"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/帮助(H)/PayBack 计划"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 #, fuzzy
 msgid "/Help/About J-Pilot"
 msgstr "/帮助(H)/J-Pilot"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/插件(_P)/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/帮助(_H)/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr "字体选择对话框"
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:0"
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "未装入插件。\n"
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "忽略全部提醒。\n"
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "忽略过去的提醒。\n"
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "无法打开管道\n"
 
-#: ../jpilot.c:2422
-msgid " User: "
-msgstr " 用户："
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "清除"
-
-#: ../jpilot.c:2649
-msgid "Show private records   Ctrl-Z"
+#: ../jpilot.c:1949
+#, fuzzy
+msgid "Show private records   Ctrl+Z"
 msgstr "显示私人记录   Ctrl+Z"
 
-#: ../jpilot.c:2654
-msgid "Show private records"
-msgstr "显示私人记录"
-
-#: ../jpilot.c:2659
-msgid "Hide private records   Ctrl-Z"
+#: ../jpilot.c:1954
+#, fuzzy
+msgid "Hide private records   Ctrl+Z"
 msgstr "隐藏私人记录   Ctrl-Z"
 
-#: ../jpilot.c:2664
-msgid "Hide private records"
-msgstr "隐藏私人记录"
-
-#: ../jpilot.c:2669
-msgid "Mask private records   Ctrl-Z"
+#: ../jpilot.c:1959
+#, fuzzy
+msgid "Mask private records   Ctrl+Z"
 msgstr "屏蔽私人记录   Ctrl-Z"
 
-#: ../jpilot.c:2674
-msgid "Mask private records"
-msgstr "屏蔽私人记录"
-
-#: ../jpilot.c:2684
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "把您的 Palm 与桌面同步   Ctrl-Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
-msgid "Font"
-msgstr "字体"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "同步地址"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1415,787 +1583,1243 @@ msgstr ""
 "把您的 Palm 与桌面同步\n"
 "并作备份"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "行事历/跳到今天"
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "待办工作"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "备忘录"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "立即执行"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "稍后提醒我"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "别再通知我了"
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 "J-Pilot 使用 GTK2 图形前端。此版本的图形前端使用 UTF-8 对字符编码。\n"
 "您应该选择 UTF-8 字符集，才能看到非 ASCII 字符(如中文)。\n"
 "\n"
 
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr "转到菜单“"
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
-msgstr "”然后更改“"
-
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "字符集 "
 
-#: ../jpilot.c:2898
-msgid "\"."
-msgstr "”。"
-
-#: ../jpilot.c:2900
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "选择 UTF-8 编码"
 
-#: ../libplugin.c:153
-#, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "未知的 PC 头版本 = %d\n"
-
-#: ../libplugin.c:416
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d 打开文件错误：%s\n"
+#: ../jpilot-dump.c:92
+#, fuzzy, c-format
+msgid " +D +A +T +M format like date +format.\n"
+msgstr " +B +M +A +T 格式就是日期+格式(请查看 -? 中的更多信息)。\n"
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d 读取文件错误：%s\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v 显示版本并退出。\n"
 
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
-msgstr ""
-"此记录已删除。\n"
-"该记录已经计划为在下次同步时从 Palm 删除。\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h 显示帮助并退出。\n"
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-msgid "Unable to open PC records file\n"
-msgstr "无法打开 PC 记录文件\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -h 显示帮助并退出。\n"
 
-#: ../libplugin.c:493 ../utils.c:1959
-msgid "Couldn't find record to delete\n"
-msgstr "找不到要删除的记录\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -B 转存行事历。\n"
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "Unknown header version %d\n"
-msgstr "未知头版本 %d\n"
-
-#: ../libplugin.c:524
-msgid "Couldn't open PC records file\n"
-msgstr "无法打开 PC 记录文件\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
-#, c-format
-msgid "Error opening file: %s\n"
-msgstr "打开文件时发生错误：%s\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N 将今天的应用转存到行事历。\n"
 
-#: ../libplugin.c:714
-msgid "Error reading PC file 1\n"
-msgstr "读取 PC 文件1 出错\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr " -NYYYY/MM/DD 转存行事历中 YYYY/MM/DD 中的应用。\n"
 
-#: ../libplugin.c:730
-msgid "Error reading PC file 2\n"
-msgstr "读取 PC 文件2出错\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr " -A 转存地址簿。\n"
 
-#: ../libplugin.c:903
-#, c-format
-msgid "Error reading %s 5\n"
-msgstr "读取 %s 5 出错\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -M 将待办工作列表转存为 CSV。\n"
 
-#: ../log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "无法打开日志文件，放弃操作。\n"
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M 转存备忘。\n"
 
-#: ../log.c:102
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "无法打开日志文件\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "备忘文本 > 65535，已截断\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "无法打开文件：%s\n"
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "导入了备忘 %s\n"
-
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "文件似乎不是 memopad.dat 格式\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "无法导出备忘 %d\n"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "月份视图"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Palm 密码"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "不正确，请重新输入 PalmOS 密码"
+#: ../jpilot-merge.c:273
+#, c-format
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "请输入 PalmOS 密码"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "无穷循环"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:293
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "读取 %s%s 第一行时：[%s]\n"
+msgid ""
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
+msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
-msgstr "版本错误\n"
+#: ../jpilot-merge.c:294
+#, c-format
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
-msgstr "检查首选项->管道\n"
+#: ../jpilot-merge.c:295
+#, c-format
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:296
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
 msgstr ""
-"打开插件 [%s] 出错\n"
-"错误[%s]\n"
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:297
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " 插件无效：[%s]\n"
+msgid "  and where no syncing occurs to physical hardware.\n"
+msgstr ""
 
-#: ../plugins.c:296
+#: ../jpilot-merge.c:298
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "插件：[%s]\n"
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
+msgstr ""
 
-#: ../plugins.c:297
+#: ../jpilot-merge.c:299
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "此插件的版本是(%d.%d)。\n"
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
+msgstr ""
 
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "无法与此版本的 J-Pilot 共同工作。\n"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
+msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
-msgstr "%Y-%m-%d"
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr " J-Pilot 首选项可读取端口、速率、备份数，等等。\n"
+
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v 显示版本和编译选项并退出。\n"
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d 将调试信息显示在标准输出上。\n"
+
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr "未装入插件。\n"
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l = 循环，否则只同步一次并退出。\n"
+
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr " -p {端口} = 使用此端口同步，而不是从首选项获取端口。\n"
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "打开文件时发生错误：%s\n"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "打开文件时出错：next_id\n"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "错误"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "您的 HOME 环境变量太长\n"
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
 
-#: ../prefs.c:394
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"此记录已删除。\n"
+"该记录已经计划为在下次同步时从 Palm 删除。\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "无法打开 PC 记录文件\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "找不到要删除的记录\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "未知头版本 %d\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d 打开文件错误：%s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d 读取文件错误：%s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "打开文件时发生错误：%s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "读取 %s 5 出错\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "读取 PC 文件1 出错\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "读取 PC 文件2出错\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "未知的 PC 头版本 = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "无法打开日志文件，放弃操作。\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "无法打开日志文件\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "备忘文本 > 65535，已截断\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "导入了备忘 %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "文件似乎不是 memopad.dat 格式\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "无法导出备忘 %d\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "备忘录"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "月份视图"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Palm 密码"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "不正确，请重新输入 PalmOS 密码"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "请输入 PalmOS 密码"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "读取文件出错：%s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "无穷循环"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "读取 %s%s 第一行时：[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "版本错误\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "检查首选项->管道\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"打开插件 [%s] 出错\n"
+"错误[%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " 插件无效：[%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "插件：[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "此插件的版本是(%d.%d)。\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "无法与此版本的 J-Pilot 共同工作。\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr "%Y-%m-%d"
+
+#: ../prefs.c:419
 msgid "%d %B %Y"
 msgstr "%Y-%m-%d"
 
-#: ../prefs.c:395
+#: ../prefs.c:420
 msgid "%d. %B %Y"
 msgstr "%Y-%m-%d"
 
-#: ../prefs.c:396
+#: ../prefs.c:421
 msgid "%d %B, %Y"
 msgstr "%Y-%m-%d"
 
-#: ../prefs.c:397
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr "%Y年%m月%d日"
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr "%Y年%m月%d日"
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "语系"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "设置"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr "行事历"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "待办"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "备忘录"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "警告"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "管道"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "短日期格式 "
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "长日期格式 "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "时间格式 "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "一周的第一天是 "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "我的 GTK 色彩文件是 "
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "串行接口 (/dev/ttyS0，/dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "同步问题"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr "串口速率(不影响 USB)"
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "要归档的备份数目"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "显示已删除的记录(默认为否)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "显示已修改的已删除记录(默认为否)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "请求文件安装确认(J-Pilot -> PDA)(默认为是)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "显示弹出提示(默认为是)"
 
-#. ********************************************************************
-#. Datebook preference tab
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "日历上突出显示有约会的日子"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr "在天、周和月视图中批注今天"
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr "在天、周和月视图中追加年份纪念日"
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "使用 DateBk 记事标记"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "此版本没有启用 DateBk 支持"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
-msgstr "在天、周和月视图中批注今天"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
+msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
-msgstr "在天、周和月视图中追加年份纪念日"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
+msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "邮件命令"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s 将替换为电子邮件地址"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "隐藏已完成的工作"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "隐藏未到期的待办"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "记录完成日期"
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "使用 Manana 数据库"
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "使用默认的到期日"
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "使用 Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "约会提醒时打开闹铃窗口"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "执行此命令"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "警告：任意执行 shell 命令有相当的危险性!!!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "闹铃命令"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t 代表闹铃时间"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d 代表闹铃日期"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D 代表闹铃描述"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N 代表闹铃记事"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "此版本没有启用 %D (描述替代符) 功能"
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "此版本没有启用 %N (记事替代符) 功能"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "同步行事历"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "同步地址"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "同步待办"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "同步备忘录"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "同步 memo32 (pedit32)"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "同步 Manana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "使用 J-OS(不是日本 PalmOS:WorkPad/CLIE)"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "同步 %s(%s)"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "打印选项"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "纸张尺寸"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "一天报告"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "一周报告"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "月份报告"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "一项记录"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "删除了一项 %s 记录。"
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "该类别里的全部记录"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "打印全部记录"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "每页打印一项记录"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " 每项记录中间加空行"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "打印命令 (例如 lpr, 或 cat > file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "恢复手持设备"
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "要安装的文件"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "要恢复您的手持设备："
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1. 选择所有您要恢复的应用程序。默认是全部。"
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. 输入用户名和用户 ID。"
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. 点击“确定”按钮。"
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "此项操作会覆盖当前在手持设备上的全部数据。"
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "用户名"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "行事历"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "地址"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "待办"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "备忘"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "备忘"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "插件 ?"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "找不到记录"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "搜索"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "搜索："
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "区分大小写"
 
-#: ../sync.c:139
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "打开锁文件失败\n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "锁定失败\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "同步文件被 pid %d 锁定\n"
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "解锁失败\n"
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "同步由 pid %d 锁定\n"
 
-#: ../sync.c:244
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
+msgstr "检查您的串口和设置\n"
+
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "无法读取主目录\n"
+
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s：请按 HotSync 按钮，或者“kill %d”\n"
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (创建者 ID '%s') 已经是最新的了，跳过获取。\n"
 
-#: ../sync.c:297
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
-msgid "Exiting with status %s\n"
-msgstr "离开中，状态号是 %s\n"
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "正在获取 '%s' (创建者 ID '%s')... "
 
-#: ../sync.c:298
-msgid "Finished\n"
-msgstr "完成\n"
+#: ../sync.c:1096 ../sync.c:1433
+#, c-format
+msgid "Failed, unable to create file %s\n"
+msgstr "失败，无法创建文件 %s\n"
 
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
-msgstr "安装用户信息完成。\n"
+#: ../sync.c:1100 ../sync.c:1438
+#, c-format
+msgid "Failed, unable to back up database %s\n"
+msgstr "失败，无法备份数据库 %s\n"
 
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
-msgstr "检查您的串口和设置\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "确定\n"
 
-#: ../sync.c:674
+#: ../sync.c:1304
 #, c-format
-msgid " Syncing on device %s\n"
-msgstr " 正在与设备 %s 同步\n"
-
-#: ../sync.c:675
-msgid " Press the HotSync button now\n"
-msgstr " 现在请按 HotSync 键\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "跳过 %s (创建者 ID '%s')\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:1498
 #, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "上次同步的用户名-->\"%s\"\n"
+msgid "Installing %s "
+msgstr "安装 %s "
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "上次同步的用户 ID->\"%d\"\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"无法打开文件：“%s”：%s！\n"
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:1508
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr " 此用户名-->\"%s\"\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"无法同步文件：“%s”：文件可能已损坏。\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(创建者 ID 是“%s”)..."
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(创建者 ID 是“%s”)..."
+
+#: ../sync.c:1530
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr " 此用户 ID-->%d\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:795
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid "Username is \"%s\"\n"
-msgstr "用户名是“%s”\"\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"无法打开文件：%s\n"
 
-#: ../sync.c:796
+#: ../sync.c:1615
 #, c-format
-msgid "User ID is %d\n"
-msgstr "用户 ID 是 %d\n"
+msgid "Install %s failed"
+msgstr "安装 %s 失败"
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "失败。\n"
+
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "已安装 %s "
+
+#: ../sync.c:1736
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "上次同步的PC = %d\n"
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d 获取应用程序信息 %s 出错\n"
 
-#: ../sync.c:799
+#: ../sync.c:1742 ../sync.c:1772
 #, c-format
-msgid "This PC = %lu\n"
-msgstr "这部 PC = %lu\n"
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d 提取应用程序信息出错 %s\n"
 
-#: ../sync.c:800
+#: ../sync.c:1763
 #, c-format
-msgid "Last Username = [%s]\n"
-msgstr "上一个用户名 = [%s]\n"
+msgid "Error reading appinfo block for %s\n"
+msgstr "读取 %s 的应用程序信息块出错\n"
 
-#: ../sync.c:801
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "上一个用户 ID = %d\n"
+msgid "Could not add category %s to remote.\n"
+msgstr "无法将类别 %s 添加到远程。\n"
 
-#: ../sync.c:802
+#: ../sync.c:2002 ../sync.c:2008
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "用户名 [%s]\n"
+msgid "Too many categories on remote.\n"
+msgstr "远程的类别太多。\n"
 
-#: ../sync.c:803
+#: ../sync.c:2003 ../sync.c:2011
 #, c-format
-msgid "userID = %d\n"
-msgstr "用户 ID = %d\n"
-
-#: ../sync.c:821
-msgid "Sync canceled\n"
-msgstr "同步已取消\n"
-
-#: ../sync.c:843
-msgid "Finished restoring handheld.\n"
-msgstr "恢复手持设备完毕。\n"
-
-#: ../sync.c:844
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "您可能需要同步以更新 J-Pilot。\n"
-
-#: ../sync.c:874
-msgid "Doing a fast sync.\n"
-msgstr "正在进行快速同步。\n"
-
-#: ../sync.c:913
-msgid "Doing a slow sync.\n"
-msgstr "正在进行慢速同步。\n"
-
-#: ../sync.c:1014
-msgid "Thank you for using J-Pilot."
-msgstr "感谢您使用 J-Pilot。"
-
-#: ../sync.c:1056
-msgid "Finished.\n"
-msgstr "完成。\n"
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "桌面上 %s 中的全部记录都将移动到 %s 中。\n"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "同步 %s\n"
 
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "写了一项 %s 记录。"
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "写入一项 %s 记录失败。"
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "删除一项 %s 记录失败。"
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "删除了一项 %s 记录。"
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "删除了一项 %s 记录。"
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "写了一项 %s 记录。"
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "写入一项 %s 记录失败。"
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "删除一项 %s 记录失败。"
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "删除了一项 %s 记录。"
 
-#: ../sync.c:1133
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "number of records = %d\n"
-msgstr "记录数目 = %d\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
+
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:1260 ../sync.c:2435
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2203,785 +2827,836 @@ msgstr ""
 "dlp_DeleteRecord 失败\n"
 "可能是因为这项记录已经在 Palm 上删除了\n"
 
-#: ../sync.c:1358 ../sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (创建者 ID '%s') 已经是最新的了，跳过获取。\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr "安装用户信息完成。\n"
 
-#: ../sync.c:1362 ../sync.c:1774
+#: ../sync.c:3094
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "正在获取 '%s' (创建者 ID '%s')... "
+msgid " Syncing on device %s\n"
+msgstr " 正在与设备 %s 同步\n"
 
-#: ../sync.c:1369 ../sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "失败，无法创建文件 %s\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " 现在请按 HotSync 键\n"
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "失败，无法备份数据库 %s\n"
-
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "确定\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "上次同步的用户名-->\"%s\"\n"
 
-#: ../sync.c:1687
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "跳过 %s (创建者 ID '%s')\n"
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "上次同步的用户 ID->\"%d\"\n"
 
-#: ../sync.c:1861
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid "Installing %s "
-msgstr "安装 %s "
+msgid " This Username-->\"%s\"\n"
+msgstr " 此用户名-->\"%s\"\n"
 
-#: ../sync.c:1867
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"无法打开文件：“%s”：%s！\n"
+msgid " This User ID-->%d\n"
+msgstr " 此用户 ID-->%d\n"
 
-#: ../sync.c:1871
+#: ../sync.c:3204
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"无法同步文件：“%s”：文件可能已损坏。\n"
+msgid "Username is \"%s\"\n"
+msgstr "用户名是“%s”\"\n"
 
-#: ../sync.c:1883
+#: ../sync.c:3205
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(创建者 ID 是“%s”)..."
+msgid "User ID is %d\n"
+msgstr "用户 ID 是 %d\n"
 
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
+#: ../sync.c:3207
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"无法打开文件：%s\n"
+msgid "lastSyncPC = %d\n"
+msgstr "上次同步的PC = %d\n"
 
-#: ../sync.c:1960
+#: ../sync.c:3208
 #, c-format
-msgid "Install %s failed"
-msgstr "安装 %s 失败"
-
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "失败。\n"
+msgid "This PC = %lu\n"
+msgstr "这部 PC = %lu\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
-#, c-format
-msgid "Installed %s "
-msgstr "已安装 %s "
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "同步已取消\n"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "无法打开文件：%s%s\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "恢复手持设备完毕。\n"
 
-#: ../sync.c:2180
-msgid "Unable to read home dir\n"
-msgstr "无法读取主目录\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "您可能需要同步以更新 J-Pilot。\n"
 
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "Palm：记录数目 = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "正在进行快速同步。\n"
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "磁盘：记录数目 = %d\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "正在进行慢速同步。\n"
 
-#: ../sync.c:2888
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d 获取应用程序信息 %s 出错\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "感谢您使用 J-Pilot。"
 
-#: ../sync.c:2894 ../sync.c:2936
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d 提取应用程序信息出错 %s\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "完成。\n"
 
-#: ../sync.c:2916 ../sync.c:2928
+#: ../sync.c:3446
 #, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "读取 %s 的应用程序信息块出错\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
+#: ../sync.c:3447
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "无法将类别 %s 添加到远程。\n"
-
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
-msgstr "远程的类别太多。\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "桌面上 %s 中的全部记录都将移动到 %s 中。\n"
+msgid "Exiting with status %s\n"
+msgstr "离开中，状态号是 %s\n"
 
-#: ../todo.c:248
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "待办工作的描述长度 > %d，截断为 %d\n"
 
-#: ../todo.c:255
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "待办工作的记事长度 > %d，截断为 %d\n"
 
-#: ../todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s:%d 读取类别信息 %s 出错\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "到期日"
 
-#: ../todo_gui.c:535
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "文件似乎不是 todo.dat 格式\n"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "无法导出待办 %d\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "到期日"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "到期日"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "优先级："
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "已完成"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "优先级超出范围\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "无限期"
 
-#. The completed check box
-#: ../todo_gui.c:2206
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "已完成"
 
-#: ../todo_gui.c:2214
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "优先级："
 
-#: ../todo_gui.c:2234
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "到期日："
 
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "注释"
+#: ../utils.c:330
+msgid "Today"
+msgstr "今天"
 
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v 显示版本和编译选项并退出。\n"
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "找不到空的 DB 文件 %s：%s\n"
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d 将调试信息显示在标准输出上。\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " 可能未安装。\n"
 
-#: ../utils.c:75
-#, fuzzy
-msgid " -p skips loading plugins.\n"
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "无法创建目录 %s\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s 是目录"
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "无法在目录 %s 中写入文件\n"
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "保存记录修改？"
+
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "您要保存对于此项记录的修改吗？"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "保存新记录？"
+
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "您要保存此项新建的记录吗？"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "无穷询问，跳出\n"
+
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr "未装入插件。\n"
 
-#: ../utils.c:76
-#, fuzzy
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr " -a 忽略自从程序上次运行后错过的提醒。\n"
 
-#: ../utils.c:77
-#, fuzzy
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A 忽略全部提醒，包括过去的未来的。\n"
 
-#: ../utils.c:78
-#, fuzzy
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i 调用后将 jpilot 缩小为图标。\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " PILOTPORT 及 PILOTRATE 环境变量用于指定要使用哪个端口\n"
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " 来同步，以及端口的速度。\n"
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " 如果没有设置 PILOTPORT，则默认为 /dev/pilot。\n"
 
-#: ../utils.c:107
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "读入文件出错"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "编译日期"
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "带这些选项编译："
 
-#: ../utils.c:110
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "安装路径"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link 版本"
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "USB 支持"
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "是"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-msgid "no"
-msgstr "否"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "私人记录支持"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "否"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Datebk 支持"
 
-#: ../utils.c:134
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "插件支持"
 
-#: ../utils.c:140
-msgid "Manana support"
-msgstr "Manana 支持"
-
-#: ../utils.c:146
-msgid "NLS support (foreign languages)"
-msgstr "NLS 支持(外语)"
-
-#: ../utils.c:152
-msgid "GTK2 support"
-msgstr "GTK2 支持"
-
-#: ../utils.c:207
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "今天是%A，%x %X"
-
-#: ../utils.c:209
-#, c-format
-msgid "Today is %%A, %s %s"
-msgstr "今天是%%A，%s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "今天"
-
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "保存记录修改？"
-
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "您要保存对于此项记录的修改吗？"
+#: ../utils.c:2002
+msgid "Manana support"
+msgstr "Manana 支持"
 
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "保存新记录？"
+#: ../utils.c:2008
+msgid "NLS support (foreign languages)"
+msgstr "NLS 支持(外语)"
 
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "您要保存此项新建的记录吗？"
+#: ../utils.c:2014
+msgid "GTK2 support"
+msgstr "GTK2 支持"
 
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
+#. No HOME var
+#: ../utils.c:2057
+#, c-format
 msgid "Can't get HOME environment variable\n"
 msgstr "无法获得 HOME 环境变量\n"
 
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
 msgstr "您的 HOME 环境变量太长\n"
 
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
-#, c-format
-msgid "Can't create directory %s\n"
-msgstr "无法创建目录 %s\n"
-
-#: ../utils.c:1399
-#, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr ""
-"%s 似乎不是目录。\n"
-"但需要目录。\n"
-
-#: ../utils.c:1405
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "无法在目录 %s 中写入文件\n"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "编辑类别"
 
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
-msgstr "将 PC 头写入文件出错：next_id\n"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC ID 是 0。\n"
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
-msgstr "将 next id 写入文件出错：next_id\n"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "我生成了一项新的 PC ID，是 %lu\n"
 
-#: ../utils.c:1483
-msgid "Error opening file: next_id\n"
-msgstr "打开文件时出错：next_id\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1657
+#: ../utils.c:3537
 #, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "找不到空的 DB 文件 %s：%s\n"
+msgid "Today is %A, %x %X"
+msgstr "今天是%A，%x %X"
 
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-msgid " may not be installed.\n"
-msgstr " 可能未安装。\n"
+#: ../utils.c:3539
+#, c-format
+msgid "Today is %%A, %s %s"
+msgstr "今天是%%A，%s %s"
 
-#: ../utils.c:1839
-msgid "Error reading file"
-msgstr "读入文件出错"
+#: ../utils.c:3768
+#, c-format
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
+msgstr ""
 
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC ID 是 0。\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
+msgstr "将 PC 头写入文件出错：next_id\n"
 
-#: ../utils.c:2517
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "我生成了一项新的 PC ID，是 %lu\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
+msgstr "将 next id 写入文件出错：next_id\n"
 
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "每周视图"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "澳大利亚"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "丹麦"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "欧盟(欧洲)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "法国"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "德国"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "香港"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "冰岛"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "印度"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "印度尼西亚"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "爱尔兰"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "意大利"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "日本"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "韩国"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "卢森堡"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "马来西亚"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "新西兰"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "挪威"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "中国"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "菲律宾"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "泰国"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "美国"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "开支"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "飞机票"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "早餐"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "公共汽车"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "商务客饭"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "租车"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "晚餐"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "娱乐"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "传真"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "汽油"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "礼品"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "酒店"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "附带开支"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "洗衣"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "豪华轿车"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "寄宿"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "午餐"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "里程"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "泊车"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "邮费"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "快餐"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "地铁"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "用品"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "的士"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "电话"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "小帐"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "通行费"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "火车"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
-msgstr "美国运通(AmEx)"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr "花费：未知花费类型\n"
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr "花费：未知支付类型\n"
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "美国运通 (American Express)"
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "现金"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "支票"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
 msgstr "信用卡"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
-msgstr "万事达卡(MasterCard)"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
+msgstr "万事达卡 (MasterCard)"
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "预付费"
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA 卡"
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr "花费：未知类别\n"
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr "花费：未知花费类型\n"
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr "花费：未知支付类型\n"
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr "美国运通 (American Express)"
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "信用卡"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "类型："
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr "万事达卡 (MasterCard)"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "金额："
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "类别："
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "类型："
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "支付："
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "货币："
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-msgid "Date:"
-msgstr "日期："
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "月："
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "日："
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "年："
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "金额："
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "商户："
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "城市："
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "参加者"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "密钥环：pack_KeyRing()：buf_size 太小\n"
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "不正确，请重新输入密钥环密码"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "输入新的密钥环密码"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "输入密钥环密码"
 
-#: ../KeyRing/keyring.c:1636
-#, fuzzy
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "您的 HOME 环境变量太长\n"
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "密钥环：文件 %s 未找到。\n"
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "密钥环：尝试同步。\n"
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "密钥环"
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "取消"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "账户"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "无法导出备忘 %d\n"
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -2991,53 +3666,261 @@ msgstr ""
 "密钥环\n"
 "密码"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "取消"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "账户"
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "名字："
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "账户："
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "密码："
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "生成密码"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "同步备忘录"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "完成"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "覆盖文件"
+
+#~ msgid "Field"
+#~ msgstr "域"
+
+#~ msgid "kana("
+#~ msgstr "kana("
+
+#~ msgid "Quick View"
+#~ msgstr "快速查看"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "无法打开 %s%s 文件\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "无法打开 %s.alarms 文件\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "您无法编辑类别 %s。\n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "您无法删除类别 %s。\n"
+
+#~ msgid "category name"
+#~ msgstr "类别名称"
+
+#~ msgid "debug"
+#~ msgstr "调试"
+
+#~ msgid "Close"
+#~ msgstr "关闭"
+
+#~ msgid "none"
+#~ msgstr "无"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "DateBookDB 中有未知的 repeatType\n"
+
+#~ msgid "W"
+#~ msgstr "周"
+
+#~ msgid "M"
+#~ msgstr "月"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "此事件无特定时间"
+
+#~ msgid "Start Time"
+#~ msgstr "开始时间"
+
+#~ msgid "End Time"
+#~ msgstr "结束时间"
+
+#~ msgid "Dismiss"
+#~ msgstr "未接"
+
+#~ msgid "Done"
+#~ msgstr "完成"
+
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "用户名"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = 版本\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = 帮助\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = 以调试模式运行\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = 不装入插件。\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr " -b = 执行同步并备份，否则只同步。\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "指定了无效的地理位置：“%s”\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/帮助(H)/PayBack 计划"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "字体选择对话框"
+
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#~ msgid "Show private records"
+#~ msgstr "显示私人记录"
+
+#~ msgid "Hide private records"
+#~ msgstr "隐藏私人记录"
+
+#~ msgid "Mask private records"
+#~ msgstr "屏蔽私人记录"
+
+#~ msgid "Font"
+#~ msgstr "字体"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "转到菜单“"
+
+#~ msgid "\" and change the \""
+#~ msgstr "”然后更改“"
+
+#~ msgid "\"."
+#~ msgstr "”。"
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "无法打开 PC 记录文件\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "一周的第一天是 "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "串行接口 (/dev/ttyS0，/dev/pilot)"
+
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "串口速率(不影响 USB)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "同步 memo32 (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "一项记录"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s：请按 HotSync 按钮，或者“kill %d”\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "完成\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "上一个用户名 = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "上一个用户 ID = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "用户名 [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "用户 ID = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "Palm：记录数目 = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "磁盘：记录数目 = %d\n"
+
+#, fuzzy
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i 调用后将 jpilot 缩小为图标。\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s 似乎不是目录。\n"
+#~ "但需要目录。\n"
+
+#~ msgid "AmEx"
+#~ msgstr "美国运通(AmEx)"
+
+#~ msgid "CreditCard"
+#~ msgstr "信用卡"
+
+#~ msgid "MasterCard"
+#~ msgstr "万事达卡(MasterCard)"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "花费：未知类别\n"
+
+#, fuzzy
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "您的 HOME 环境变量太长\n"
+
 #~ msgid "Quit"
 #~ msgstr "退出"
 
@@ -3047,9 +3930,6 @@ msgstr "完成"
 #~ msgid "Directory"
 #~ msgstr "目录"
 
-#~ msgid "Overwrite File"
-#~ msgstr "覆盖文件"
-
 #~ msgid "Filename"
 #~ msgstr "文件名"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 143a859a..244cf940 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,41 +7,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jpilot-0.99.8-pre7\n"
 "Report-Msgid-Bugs-To: jpilot-devel@jpilot.org\n"
-"POT-Creation-Date: 2006-09-28 15:06-0700\n"
+"POT-Creation-Date: 2014-05-24 22:46-0400\n"
 "PO-Revision-Date: 2005-01-14 22:27+0800\n"
 "Last-Translator: Jouston Huang <jouston@jouston.no-ip.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=BIG5\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../address.c:288 ../address.c:552 ../alarms.c:382 ../dat.c:181 ../dat.c:655
-#: ../dat.c:857 ../dat.c:991 ../dat.c:1130 ../datebook.c:89 ../datebook.c:390
-#: ../datebook.c:397 ../datebook.c:427 ../datebook.c:1046 ../jpilot.c:1558
-#: ../libplugin.c:442 ../libplugin.c:724 ../libplugin.c:832 ../libplugin.c:911
-#: ../libplugin.c:952 ../memo.c:95 ../memo.c:367 ../plugins.c:108
-#: ../prefs.c:316 ../prefs.c:341 ../prefs.c:880 ../sync.c:252 ../sync.c:1155
-#: ../sync.c:2319 ../todo.c:206 ../todo.c:548 ../utils.c:2349
+#: ../address.c:274 ../address.c:446 ../alarms.c:330 ../calendar.c:307
+#: ../calendar.c:545 ../contact.c:322 ../contact.c:736 ../dat.c:203
+#: ../dat.c:733 ../dat.c:937 ../dat.c:1071 ../dat.c:1210 ../datebook.c:128
+#: ../datebook.c:163 ../datebook.c:170 ../datebook.c:229 ../jpilot.c:1256
+#: ../jpilot-merge.c:93 ../libplugin.c:206 ../libplugin.c:453
+#: ../libplugin.c:532 ../libplugin.c:561 ../libplugin.c:809 ../memo.c:212
+#: ../memo.c:285 ../otherconv.c:278 ../plugins.c:110 ../prefs.c:348
+#: ../prefs.c:373 ../prefs.c:906 ../sync.c:2180 ../sync.c:2197 ../sync.c:2306
+#: ../sync.c:2320 ../sync.c:2517 ../sync.c:2656 ../todo.c:234 ../todo.c:488
+#: ../utils.c:746
+#, c-format
 msgid "Out of memory"
 msgstr "�O���餣��"
 
-#: ../address.c:345 ../address.c:352 ../datebook.c:340 ../libplugin.c:179
-#: ../memo.c:163 ../memo.c:170 ../todo.c:291 ../todo.c:298 ../utils.c:2010
-#: ../utils.c:2015 ../utils.c:2026 ../utils.c:2031 ../utils.c:2042
-#: ../utils.c:2047 ../utils.c:2059 ../utils.c:2064
-msgid "error"
-msgstr "���~"
+#: ../address.c:330 ../calendar.c:228 ../contact.c:578 ../datebook.c:492
+#: ../memo.c:85 ../todo.c:88
+#, fuzzy, c-format
+msgid "%s:%d Error reading application info %s\n"
+msgstr "%s: %d Ū�J���O��T %s ���~\n"
 
-#: ../address.c:412 ../address_gui.c:1657 ../datebook.c:686 ../libplugin.c:784
-#: ../libplugin.c:809 ../memo.c:244 ../memo_gui.c:977 ../todo_gui.c:1289
-#: ../Expense/expense.c:1122 ../Expense/expense.c:2127
+#: ../address.c:342 ../address_gui.c:2339 ../address_gui.c:2378
+#: ../calendar.c:244 ../contact.c:594 ../datebook.c:512 ../datebook_gui.c:3734
+#: ../libplugin.c:403 ../libplugin.c:429 ../memo.c:97 ../memo_gui.c:943
+#: ../todo_gui.c:1070 ../Expense/expense.c:1103
 #, c-format
 msgid "Error reading file: %s\n"
 msgstr "Ū���ɮ׿��~: %s\n"
 
-#: ../address_gui.c:249 ../datebook_gui.c:2537 ../memo_gui.c:166
-#: ../todo_gui.c:280 ../KeyRing/keyring.c:619
+#: ../address.c:490 ../calendar.c:596 ../calendar.c:605 ../contact.c:778
+#: ../libplugin.c:844 ../memo.c:351 ../todo.c:300 ../utils.c:1122
+#: ../utils.c:1129 ../utils.c:1136 ../utils.c:1143 ../utils.c:1150
+#: ../utils.c:1157
+msgid "error"
+msgstr "���~"
+
+#: ../address_gui.c:323 ../datebook_gui.c:2841 ../memo_gui.c:174
+#: ../todo_gui.c:290 ../KeyRing/keyring.c:832
 msgid ""
 "This record is deleted.\n"
 "Undelete it or copy it to make changes.\n"
@@ -49,421 +61,567 @@ msgstr ""
 "�o�������w�g�R��.\n"
 "�ϧR���άO�ƻs�@������~��ק�.\n"
 
-#: ../address_gui.c:457 ../category.c:159 ../category.c:165 ../category.c:213
-#: ../category.c:270 ../datebook_gui.c:368 ../memo_gui.c:283 ../sync.c:1118
-#: ../sync.c:1124 ../sync.c:2294 ../sync.c:2514 ../sync.c:2520 ../sync.c:2637
-#: ../sync.c:2903 ../todo_gui.c:420 ../utils.c:2758 ../utils.c:2807
-#: ../utils.c:2813 ../utils.c:2886 ../utils.c:2892 ../utils.c:2955
-#: ../utils.c:3018 ../utils.c:3024 ../utils.c:3087 ../utils.c:3094
+#: ../address_gui.c:450 ../address_gui.c:456 ../address_gui.c:467
+#: ../address_gui.c:479 ../address_gui.c:491 ../address_gui.c:504
+#, c-format
+msgid "%s%s: %s"
+msgstr ""
+
+#: ../address_gui.c:540 ../category.c:116 ../category.c:174 ../category.c:328
+#: ../category.c:334 ../datebook_gui.c:428 ../jpilot-merge.c:86
+#: ../jpilot-merge.c:144 ../jpilot-merge.c:149 ../memo_gui.c:278
+#: ../sync.c:2139 ../sync.c:2145 ../sync.c:2491 ../sync.c:2852
+#: ../todo_gui.c:414 ../utils.c:2684 ../utils.c:2721 ../utils.c:2727
+#: ../utils.c:2786 ../utils.c:2792 ../utils.c:2846 ../utils.c:2900
+#: ../utils.c:2906 ../utils.c:2964 ../utils.c:2971
 #, c-format
 msgid "Unable to open file: %s\n"
 msgstr "�L�k�}���ɮ�: %s\n"
 
-#: ../address_gui.c:535
+#: ../address_gui.c:559
+#, fuzzy, c-format
+msgid "Unable to read file: %s\n"
+msgstr "�L�k�}���ɮ�: %s\n"
+
+#: ../address_gui.c:713
 msgid "File doesn't appear to be address.dat format\n"
 msgstr "�ɮצ��G���O address.dat �榡\n"
 
-#: ../address_gui.c:545 ../datebook_gui.c:577 ../memo_gui.c:417
-#: ../todo_gui.c:545 ../Expense/expense.c:603 ../Expense/expense.c:1397
+#: ../address_gui.c:723 ../datebook_gui.c:647 ../memo_gui.c:324
+#: ../memo_gui.c:419 ../todo_gui.c:542 ../Expense/expense.c:1382
 msgid "Unfiled"
 msgstr "���k��"
 
-#. JPA
+#: ../address_gui.c:779 ../datebook_gui.c:698 ../memo_gui.c:472
+#: ../todo_gui.c:595
+msgid "CSV (Comma Separated Values)"
+msgstr ""
+
+#: ../address_gui.c:780
+msgid "DAT/ABA (Palm Archive Formats)"
+msgstr ""
+
 #. current category name
 #. previous category name
-#. yes!
 #. entry text, in Pilot character set
-#: ../address_gui.c:682 ../alarms.c:289 ../category.c:420 ../category.c:899
-#: ../category.c:952 ../datebook_gui.c:662 ../datebook_gui.c:1161
-#: ../export_gui.c:353 ../jpilot.c:361 ../jpilot.c:406 ../jpilot.c:474
-#: ../jpilot.c:518 ../jpilot.c:991 ../jpilot.c:1892 ../memo_gui.c:505
-#: ../password.c:368 ../restore_gui.c:322 ../todo_gui.c:633 ../utils.c:1122
-#: ../utils.c:1303 ../KeyRing/keyring.c:1582
+#: ../address_gui.c:866 ../category.c:406 ../datebook_gui.c:729
+#: ../jpilot.c:232 ../jpilot.c:276 ../jpilot.c:350 ../jpilot.c:394
+#: ../jpilot.c:953 ../memo_gui.c:508 ../todo_gui.c:635 ../utils.c:1303
+#: ../KeyRing/keyring.c:2088
 msgid "OK"
 msgstr "�T�w"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "No"
 msgstr "�_"
 
-#: ../address_gui.c:683 ../datebook_gui.c:663 ../memo_gui.c:506
-#: ../todo_gui.c:634 ../utils.c:1321
+#: ../address_gui.c:867 ../address_gui.c:1020 ../datebook_gui.c:360
+#: ../datebook_gui.c:388 ../datebook_gui.c:730 ../memo_gui.c:509
+#: ../memo_gui.c:646 ../todo_gui.c:636 ../todo_gui.c:764 ../todo_gui.c:772
+#: ../utils.c:1320 ../utils.c:1344 ../KeyRing/keyring.c:2089
 msgid "Yes"
 msgstr "�O"
 
-#: ../address_gui.c:706 ../datebook_gui.c:689 ../memo_gui.c:516
-#: ../todo_gui.c:659
+#: ../address_gui.c:886 ../datebook_gui.c:753 ../memo_gui.c:524
+#: ../todo_gui.c:655 ../KeyRing/keyring.c:2103
 #, c-format
 msgid "%s is a directory"
 msgstr "%s �O�ؿ�"
 
-#: ../address_gui.c:708 ../address_gui.c:725 ../datebook_gui.c:691
-#: ../datebook_gui.c:708 ../memo_gui.c:518 ../memo_gui.c:535 ../todo_gui.c:661
-#: ../todo_gui.c:678
+#: ../address_gui.c:888 ../address_gui.c:905 ../datebook_gui.c:755
+#: ../datebook_gui.c:772 ../memo_gui.c:526 ../memo_gui.c:543 ../todo_gui.c:657
+#: ../todo_gui.c:674 ../KeyRing/keyring.c:2105 ../KeyRing/keyring.c:2122
 msgid "Error Opening File"
 msgstr "�}���ɮ׮ɵo�Ϳ��~"
 
-#: ../address_gui.c:712 ../datebook_gui.c:695 ../memo_gui.c:522
-#: ../todo_gui.c:665
+#: ../address_gui.c:892 ../datebook_gui.c:759 ../memo_gui.c:530
+#: ../todo_gui.c:661 ../KeyRing/keyring.c:2109
 #, c-format
 msgid "Do you want to overwrite file %s?"
 msgstr "�z�n�мg�ɮ� %s ��?"
 
-#: ../address_gui.c:714 ../datebook_gui.c:697 ../memo_gui.c:524
-#: ../todo_gui.c:667
+#: ../address_gui.c:894 ../datebook_gui.c:761 ../memo_gui.c:532
+#: ../todo_gui.c:663 ../KeyRing/keyring.c:2111
 msgid "Overwrite File?"
 msgstr "�мg�ɮ�?"
 
-#: ../address_gui.c:723 ../datebook_gui.c:706 ../memo_gui.c:533
-#: ../todo_gui.c:676
+#: ../address_gui.c:903 ../datebook_gui.c:770 ../memo_gui.c:541
+#: ../todo_gui.c:672 ../KeyRing/keyring.c:2120
 #, c-format
 msgid "Error opening file: %s"
 msgstr "�}���ɮ׮ɵo�Ϳ��~: %s"
 
-#: ../address_gui.c:734
+#: ../address_gui.c:920
+#, c-format
+msgid ""
+"Address exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:923
+#, c-format
+msgid ""
+"Contact exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../address_gui.c:998
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ldif file may not be standards-compliant\n"
+msgstr ""
+
+#: ../address_gui.c:1011
 #, c-format
 msgid "Can't export address %d\n"
 msgstr "�L�k�ץX�a�} %d\n"
 
-#: ../address_gui.c:799 ../address_gui.c:807 ../address_gui.c:824
-msgid "Field"
-msgstr "����"
+#: ../address_gui.c:1017 ../memo_gui.c:643 ../todo_gui.c:760
+#, fuzzy, c-format
+msgid "Category: %s\n"
+msgstr "���O: "
+
+#: ../address_gui.c:1019 ../memo_gui.c:645 ../todo_gui.c:763
+#, fuzzy, c-format
+msgid "Private: %s\n"
+msgstr "�p�H"
+
+#: ../address_gui.c:1027 ../address_gui.c:1041 ../address_gui.c:1045
+#: ../address_gui.c:1054 ../address_gui.c:1057
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: ../address_gui.c:1031
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#. E-mail should be the Palm dropdown menu item for email
+#. Set dial/email button text and callback data
+#: ../address_gui.c:1248 ../address_gui.c:2900 ../address_gui.c:4236
+msgid "E-mail"
+msgstr "�q�l�l��"
 
-#: ../address_gui.c:1024 ../datebook_gui.c:982 ../memo_gui.c:591
-#: ../todo_gui.c:815
+#: ../address_gui.c:1534 ../datebook_gui.c:1147 ../memo_gui.c:656
+#: ../todo_gui.c:844 ../KeyRing/keyring.c:2225
 msgid "Unknown export type\n"
 msgstr "�����ץX���O\n"
 
-#: ../address_gui.c:1207 ../address_gui.c:2625
-msgid "Company/Name"
-msgstr "���q/�m�W"
+#: ../address_gui.c:1560 ../datebook_gui.c:1226 ../memo_gui.c:471
+#: ../memo_gui.c:745 ../todo_gui.c:870 ../KeyRing/keyring.c:2296
+msgid "Text"
+msgstr ""
+
+#: ../address_gui.c:1561 ../datebook_gui.c:1227 ../memo_gui.c:746
+#: ../todo_gui.c:871 ../KeyRing/keyring.c:2296
+msgid "CSV"
+msgstr ""
+
+#: ../address_gui.c:1562
+msgid "vCard"
+msgstr ""
+
+#: ../address_gui.c:1563
+msgid "vCard (Optimized for Gmail/Android Import)"
+msgstr ""
+
+#: ../address_gui.c:1564
+msgid "ldif"
+msgstr ""
+
+#: ../address_gui.c:1565 ../memo_gui.c:747 ../KeyRing/keyring.c:2296
+msgid "B-Folders CSV"
+msgstr ""
+
+#. Initialize variable if default case taken
+#: ../address_gui.c:1831 ../address_gui.c:3953
+#, fuzzy
+msgid "Last Name/Company"
+msgstr "�m�W/���q"
 
-#: ../address_gui.c:1209 ../address_gui.c:2627
-msgid "Name/Company"
+#: ../address_gui.c:1834 ../address_gui.c:3956
+#, fuzzy
+msgid "First Name/Company"
 msgstr "�m�W/���q"
 
-#: ../address_gui.c:1306 ../datebook_gui.c:2615 ../memo_gui.c:894
-#: ../todo_gui.c:1217 ../KeyRing/keyring.c:959
+#: ../address_gui.c:1837 ../address_gui.c:3959
+#, fuzzy
+msgid "Company/Last Name"
+msgstr "���q/�m�W"
+
+#: ../address_gui.c:1974 ../datebook_gui.c:2904 ../memo_gui.c:1116
+#: ../todo_gui.c:1329 ../KeyRing/keyring.c:1179
 msgid "You can't modify a record that is deleted\n"
 msgstr "�L�k�ק�w�R������\n"
 
-#. Illegal category
-#: ../address_gui.c:1449 ../address_gui.c:1834 ../address_gui.c:2355
-#: ../memo_gui.c:800 ../memo_gui.c:1065 ../memo_gui.c:1355 ../todo_gui.c:1083
-#: ../todo_gui.c:1506 ../todo_gui.c:1519 ../todo_gui.c:1966
+#. Illegal category, Assume that category 0 is Unfiled and valid
+#: ../address_gui.c:2173 ../address_gui.c:2424 ../address_gui.c:2857
+#: ../address_gui.c:2863 ../address_gui.c:3652 ../datebook_gui.c:1994
+#: ../datebook_gui.c:3431 ../datebook_gui.c:3780 ../datebook_gui.c:4071
+#: ../memo_gui.c:980 ../memo_gui.c:1026 ../memo_gui.c:1241 ../memo_gui.c:1625
+#: ../todo_gui.c:1106 ../todo_gui.c:1200 ../todo_gui.c:1589 ../todo_gui.c:2138
+#: ../Expense/expense.c:687 ../Expense/expense.c:1141
+#: ../Expense/expense.c:1225 ../Expense/expense.c:1885
+#: ../KeyRing/keyring.c:1068 ../KeyRing/keyring.c:1510
+#: ../KeyRing/keyring.c:1572 ../KeyRing/keyring.c:2755
 msgid "Category is not legal\n"
 msgstr "���O�����T\n"
 
-#: ../address_gui.c:1508 ../alarms.c:639 ../dialer.c:163
+#: ../address_gui.c:2233 ../alarms.c:596 ../dialer.c:162
 #, c-format
 msgid "executing command = [%s]\n"
 msgstr "����R�O = [%s]\n"
 
+#: ../address_gui.c:2235
+#, c-format
+msgid "Failed to execute [%s] at %s %d\n"
+msgstr ""
+
+#: ../address_gui.c:2479
+msgid "Birthday"
+msgstr ""
+
+#: ../address_gui.c:2575
+msgid "External program not found, or other error"
+msgstr ""
+
+#: ../address_gui.c:2577
+msgid ""
+"J-Pilot can not find the external program \"convert\"\n"
+"or an error occurred while executing convert.\n"
+"You may need to install package ImageMagick"
+msgstr ""
+
+#: ../address_gui.c:2578
+#, c-format
+msgid "Command executed was \"%s\"\n"
+msgstr ""
+
+#: ../address_gui.c:2579
+#, c-format
+msgid "return code was %d\n"
+msgstr ""
+
+#: ../address_gui.c:2657
+#, fuzzy
+msgid "chdir() failed\n"
+msgstr "����.\n"
+
+#: ../address_gui.c:2660
+msgid "Add Photo"
+msgstr ""
+
 #. Category menu
-#: ../address_gui.c:1752 ../Expense/expense.c:1594 ../KeyRing/keyring.c:2097
-#: ../KeyRing/keyring.c:2194
+#: ../address_gui.c:2882 ../KeyRing/keyring.c:2652
 msgid "Category: "
 msgstr "���O: "
 
-#: ../address_gui.c:1784 ../address_gui.c:2796
-msgid "kana("
-msgstr "���W("
-
-#: ../address_gui.c:1896 ../address_gui.c:2906
-msgid "E-mail"
-msgstr "�q�l�l��"
-
-#: ../address_gui.c:1898 ../address_gui.c:1901 ../address_gui.c:2907
+#: ../address_gui.c:2902 ../address_gui.c:4237
 msgid "Mail"
 msgstr "�l��"
 
 #. Dial Phone Button
-#: ../address_gui.c:1906 ../address_gui.c:1909 ../address_gui.c:2910
-#: ../dialer.c:306 ../dialer.c:331
+#: ../address_gui.c:2905 ../address_gui.c:4240 ../dialer.c:307 ../dialer.c:331
 msgid "Dial"
 msgstr "����"
 
-#: ../address_gui.c:2129 ../address_gui.c:2153
+#: ../address_gui.c:3095 ../datebook_gui.c:2757 ../memo_gui.c:1308
+#: ../todo_gui.c:1697
+msgid "Could not get temporary file name\n"
+msgstr ""
+
+#: ../address_gui.c:3103 ../datebook_gui.c:2765 ../memo_gui.c:1316
+#: ../todo_gui.c:1705
+msgid "Could not open temporary file for external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3140 ../datebook_gui.c:2803 ../memo_gui.c:1354
+#: ../todo_gui.c:1743
+msgid "Could not open temporary file from external editor\n"
+msgstr ""
+
+#: ../address_gui.c:3312 ../address_gui.c:3343
 msgid "-Unnamed-"
 msgstr "-���R�W-"
 
-#: ../address_gui.c:2226 ../memo_gui.c:1265 ../todo_gui.c:1855
+#: ../address_gui.c:3425 ../memo_gui.c:1531 ../todo_gui.c:2016
 msgid "0 records"
 msgstr "0 ������"
 
-#: ../address_gui.c:2229 ../datebook_gui.c:2414 ../memo_gui.c:1268
-#: ../todo_gui.c:1858
+#: ../address_gui.c:3428 ../datebook_gui.c:2637 ../memo_gui.c:1534
+#: ../todo_gui.c:2019
 #, c-format
 msgid "%d of %d records"
 msgstr "�� %d �� �@ %d ������"
 
-#. Edit category button
-#: ../address_gui.c:2600 ../category.c:450 ../category.c:496 ../category.c:514
-#: ../category.c:593 ../category.c:786 ../memo_gui.c:1483 ../todo_gui.c:2099
-#: ../Expense/expense.c:1600
-msgid "Edit Categories"
-msgstr "�s�����O"
+#: ../address_gui.c:3823 ../address_gui.c:3831 ../KeyRing/keyring.c:2565
+msgid "Name"
+msgstr "�m�W"
+
+#: ../address_gui.c:3824 ../address_gui.c:3825 ../address_gui.c:3826
+#: ../address_gui.c:3832
+msgid "Address"
+msgstr "�a�}"
+
+#: ../address_gui.c:3827 ../address_gui.c:3833 ../Expense/expense.c:582
+#: ../Expense/expense.c:1403
+msgid "Other"
+msgstr "��L"
+
+#. Note textbox
+#: ../address_gui.c:3828 ../address_gui.c:3834 ../todo_gui.c:2481
+#: ../Expense/expense.c:1834 ../KeyRing/keyring.c:2699
+msgid "Note"
+msgstr "����"
+
+#: ../address_gui.c:3844
+msgid "Reverting to Address database\n"
+msgstr ""
 
-#: ../address_gui.c:2631
+#: ../address_gui.c:3965
 msgid "Phone"
 msgstr "�q��"
 
-#: ../address_gui.c:2653
+#: ../address_gui.c:3997
 #, fuzzy
 msgid "Quick Find: "
 msgstr "�ֳt�M��"
 
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create "event" button
-#. Create Cancel button
-#. Add record modification buttons on right side
-#. Create Cancel button
 #. Cancel button
-#: ../address_gui.c:2669 ../category.c:421 ../category.c:889 ../category.c:942
-#: ../datebook_gui.c:1152 ../datebook_gui.c:1599 ../datebook_gui.c:4384
-#: ../export_gui.c:344 ../install_user.c:207 ../memo_gui.c:1517
-#: ../password.c:358 ../print_gui.c:348 ../restore_gui.c:313
-#: ../todo_gui.c:2152 ../utils.c:1108 ../KeyRing/keyring.c:1572
-#: ../KeyRing/keyring.c:2135
+#. Add record modification buttons
+#. Cancel button
+#: ../address_gui.c:4015 ../category.c:407 ../datebook_gui.c:1782
+#: ../datebook_gui.c:5121 ../memo_gui.c:1769 ../todo_gui.c:2342
+#: ../utils.c:1344 ../KeyRing/keyring.c:2595
 msgid "Cancel"
 msgstr "����"
 
-#: ../address_gui.c:2669 ../datebook_gui.c:4384 ../memo_gui.c:1517
-#: ../todo_gui.c:2152 ../KeyRing/keyring.c:2135
+#: ../address_gui.c:4015 ../datebook_gui.c:5121 ../memo_gui.c:1769
+#: ../todo_gui.c:2342 ../KeyRing/keyring.c:2595
 #, fuzzy
 msgid "Cancel the modifications"
 msgstr "�M�έק�   Ctrl+Enter"
 
 #. Delete Button
-#. Create "Delete" button
+#. Delete button
 #. Delete Button
 #. Delete button
 #. Delete, Copy, New, etc. buttons
 #. Delete button
-#: ../address_gui.c:2674 ../category.c:421 ../category.c:854
-#: ../datebook_gui.c:4389 ../memo_gui.c:1522 ../todo_gui.c:2157
-#: ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../category.c:407 ../category.c:850
+#: ../datebook_gui.c:5126 ../memo_gui.c:1774 ../todo_gui.c:2347
+#: ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 msgid "Delete"
 msgstr "�R��"
 
-#: ../address_gui.c:2674 ../datebook_gui.c:4389 ../memo_gui.c:1522
-#: ../todo_gui.c:2157 ../Expense/expense.c:1637 ../KeyRing/keyring.c:2140
+#: ../address_gui.c:4020 ../datebook_gui.c:5126 ../memo_gui.c:1774
+#: ../todo_gui.c:2347 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2600
 #, fuzzy
 msgid "Delete the selected record"
 msgstr "�R����ܪ�����   Ctrl+D"
 
 #. Undelete Button
-#. Create "Undelete" button
+#. Undelete button
 #. Undelete Button
 #. Undelete button
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 msgid "Undelete"
 msgstr "�ϧR��"
 
-#: ../address_gui.c:2680 ../datebook_gui.c:4395 ../memo_gui.c:1528
-#: ../todo_gui.c:2163 ../KeyRing/keyring.c:2146
+#: ../address_gui.c:4026 ../datebook_gui.c:5132 ../memo_gui.c:1780
+#: ../todo_gui.c:2353 ../KeyRing/keyring.c:2606
 #, fuzzy
 msgid "Undelete the selected record"
 msgstr "�R����ܪ�����   Ctrl+D"
 
-#. Create "Copy" button
 #. Copy button
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 msgid "Copy"
 msgstr "�ƻs"
 
-#: ../address_gui.c:2686 ../datebook_gui.c:4401 ../memo_gui.c:1534
-#: ../todo_gui.c:2169 ../Expense/expense.c:1642 ../KeyRing/keyring.c:2152
+#: ../address_gui.c:4032 ../datebook_gui.c:5138 ../memo_gui.c:1786
+#: ../todo_gui.c:2359 ../Expense/expense.c:1666 ../KeyRing/keyring.c:2612
 #, fuzzy
 msgid "Copy the selected record"
 msgstr "�R����ܪ�����   Ctrl+D"
 
-#. Create "New" button
+#. New button
 #. New Record button
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 msgid "New Record"
 msgstr "�s�W����"
 
-#: ../address_gui.c:2692 ../datebook_gui.c:4407 ../memo_gui.c:1540
-#: ../todo_gui.c:2175 ../Expense/expense.c:1647 ../KeyRing/keyring.c:2158
+#: ../address_gui.c:4038 ../datebook_gui.c:5144 ../memo_gui.c:1792
+#: ../todo_gui.c:2365 ../Expense/expense.c:1671 ../KeyRing/keyring.c:2618
 #, fuzzy
 msgid "Add a new record"
 msgstr "�[�J�o�ӷs����   Ctrl+R"
 
-#. Create "Add Record" button
+#. "Add Record" button
 #. Add Record button
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 msgid "Add Record"
 msgstr "�[�J����"
 
-#: ../address_gui.c:2697 ../datebook_gui.c:4413 ../memo_gui.c:1546
-#: ../todo_gui.c:2181 ../Expense/expense.c:1652 ../KeyRing/keyring.c:2164
+#: ../address_gui.c:4043 ../datebook_gui.c:5150 ../memo_gui.c:1798
+#: ../todo_gui.c:2371 ../Expense/expense.c:1676 ../KeyRing/keyring.c:2624
 #, fuzzy
 msgid "Add the new record"
 msgstr "�[�J�o�ӷs����   Ctrl+R"
 
-#. Create "apply changes" button
+#. "Apply Changes" button
 #. Apply Changes button
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 msgid "Apply Changes"
 msgstr "�M���ܧ�"
 
-#: ../address_gui.c:2707 ../datebook_gui.c:4423 ../memo_gui.c:1556
-#: ../todo_gui.c:2191 ../Expense/expense.c:1661 ../KeyRing/keyring.c:2174
+#: ../address_gui.c:4053 ../datebook_gui.c:5160 ../memo_gui.c:1808
+#: ../todo_gui.c:2381 ../Expense/expense.c:1685 ../KeyRing/keyring.c:2633
 #, fuzzy
 msgid "Commit the modifications"
 msgstr "�M�έק�   Ctrl+Enter"
 
 #. Private check box
-#: ../address_gui.c:2724 ../datebook_gui.c:4474 ../memo_gui.c:1574
-#: ../todo_gui.c:2254
+#. Private checkbox
+#: ../address_gui.c:4084 ../datebook_gui.c:5188 ../datebook_gui.c:5230
+#: ../memo_gui.c:1824 ../todo_gui.c:2407
 msgid "Private"
 msgstr "�p�H"
 
-#. Page 1
-#: ../address_gui.c:2744 ../KeyRing/keyring.c:2009
-msgid "Name"
-msgstr "�m�W"
-
-#. Page 2
-#: ../address_gui.c:2752 ../prefs_gui.c:370
-msgid "Address"
-msgstr "�a�}"
-
-#. Page 3
-#: ../address_gui.c:2760 ../Expense/expense.c:555 ../Expense/expense.c:1418
-msgid "Other"
-msgstr "��L"
+#: ../address_gui.c:4169
+#, fuzzy
+msgid "Change Photo"
+msgstr "����"
 
-#. Page 4
-#. Create a "All" button
-#: ../address_gui.c:2768 ../datebook_gui.c:1350 ../datebook_gui.c:1599
-#: ../utils.c:2714
-msgid "All"
-msgstr "����"
+#: ../address_gui.c:4174
+#, fuzzy
+msgid "Remove Photo"
+msgstr "����"
 
-#: ../address_gui.c:2973
-msgid ""
-"Show\n"
-"In List"
+#: ../address_gui.c:4246
+#, fuzzy
+msgid "Show In List"
 msgstr ""
 "�b�M��\n"
 "���"
 
-#. The Quickview page
-#: ../address_gui.c:2981
-msgid "Quick View"
-msgstr "�ֳt�˵�"
+#: ../address_gui.c:4347
+#, fuzzy
+msgid "Reminder"
+msgstr "������"
+
+#: ../address_gui.c:4363 ../datebook_gui.c:236 ../datebook_gui.c:5218
+#: ../datebook_gui.c:5375
+msgid "Days"
+msgstr "��"
+
+#. The Quickview (ALL) page
+#. All button
+#: ../address_gui.c:4407 ../datebook_gui.c:1478 ../datebook_gui.c:1782
+#: ../utils.c:2538
+msgid "All"
+msgstr "����"
 
-#: ../alarms.c:257 ../datebook_gui.c:4456
+#: ../alarms.c:230 ../datebook_gui.c:234 ../datebook_gui.c:5212
+#: ../datebook_gui.c:5369
 msgid "Minutes"
 msgstr "����"
 
-#: ../alarms.c:259 ../datebook_gui.c:4460
+#: ../alarms.c:232 ../datebook_gui.c:235 ../datebook_gui.c:5216
+#: ../datebook_gui.c:5373
 msgid "Hours"
 msgstr "�p��"
 
-#: ../alarms.c:280
+#: ../alarms.c:253
 msgid "Remind me"
 msgstr "������"
 
-#: ../alarms.c:469
+#: ../alarms.c:423 ../alarms.c:991 ../sync.c:1649 ../sync.c:1655
+#: ../utils.c:3784
 #, c-format
-msgid "Unable to open %s%s file\n"
-msgstr "�L�k�}�� %s%s �ɮ�\n"
+msgid "Unable to open file: %s%s\n"
+msgstr "�L�k�}���ɮ� %s%s\n"
 
-#: ../alarms.c:554
+#: ../alarms.c:510
 msgid "Appointment Reminder"
 msgstr "���|����"
 
-#: ../alarms.c:557
+#: ../alarms.c:513
 msgid "Past Appointment"
 msgstr "�L�����|"
 
-#: ../alarms.c:560
+#: ../alarms.c:516
 msgid "Postponed Appointment"
 msgstr "������|"
 
-#: ../alarms.c:563 ../datebook_gui.c:4292
+#: ../alarms.c:519 ../datebook_gui.c:5022
 msgid "Appointment"
 msgstr "���|"
 
-#: ../alarms.c:646
+#: ../alarms.c:605
 msgid "J-Pilot Alarm"
 msgstr "J-Pilot �x�a"
 
-#: ../alarms.c:1163
-msgid "infinite loop, breaking\n"
-msgstr "�L���j��, �Ȱ�\n"
-
-#: ../alarms.c:1531
-#, c-format
-msgid "Unable to open %s.alarms file\n"
-msgstr "�L�k�}�� %s �x�a�ɮ�\n"
-
-#: ../category.c:192 ../sync.c:2551 ../utils.c:2834 ../utils.c:2922
-#: ../utils.c:3044 ../utils.c:3114
-msgid "rename failed"
-msgstr "�ק�W�٥���"
-
-#: ../category.c:229 ../category.c:286 ../sync.c:1147 ../sync.c:2310
+#: ../category.c:129 ../category.c:186 ../sync.c:2168 ../sync.c:2505
 msgid "PC file corrupt?\n"
 msgstr "PC �ɮ׷l�a�F?\n"
 
-#: ../category.c:236 ../category.c:246 ../category.c:293 ../category.c:304
-#: ../category.c:314 ../sync.c:1192 ../sync.c:1212 ../sync.c:1272
-#: ../sync.c:1283 ../sync.c:2372 ../sync.c:2399 ../sync.c:2451 ../sync.c:2461
+#: ../category.c:136 ../category.c:146 ../category.c:194 ../category.c:204
+#: ../category.c:214 ../sync.c:2290 ../sync.c:2344 ../sync.c:2381
+#: ../sync.c:2396 ../sync.c:2420 ../sync.c:2640 ../sync.c:2685 ../sync.c:2722
+#: ../sync.c:2735 ../sync.c:2760
 msgid "fseek failed - fatal error\n"
 msgstr "fseek ���� - �Y�����~\n"
 
-#: ../category.c:421
+#: ../category.c:362 ../utils.c:2748 ../utils.c:2822 ../utils.c:2926
+#: ../utils.c:2991
+msgid "rename failed"
+msgstr "�ק�W�٥���"
+
+#: ../category.c:407
 msgid "Move"
 msgstr "����"
 
-#: ../category.c:451
+#: ../category.c:436 ../category.c:498 ../category.c:578 ../category.c:767
+msgid "Edit Categories"
+msgstr "�s�����O"
+
+#: ../category.c:437
 msgid "The maximum number of categories (16) are already used"
 msgstr "�̦h�u��ϥ�16�����O, �w�F�W��"
 
-#: ../category.c:454
+#: ../category.c:440
 msgid "Enter New Category"
 msgstr "��J�s���O"
 
-#: ../category.c:464 ../category.c:471 ../category.c:489
+#: ../category.c:451 ../category.c:475
 #, fuzzy
 msgid "Edit Categories Error"
 msgstr "�s�����O"
 
-#: ../category.c:465
+#: ../category.c:452
 msgid "You must select a category to rename"
 msgstr "�A�����n����ܤ@�����O�~���W"
 
-#: ../category.c:469
-#, c-format
-msgid "You can't edit category %s.\n"
-msgstr "�L�k�s�����O %s \n"
-
-#: ../category.c:476
+#: ../category.c:461
 msgid "Enter New Category Name"
 msgstr "�п�J�s���O���W��"
 
-#: ../category.c:490
+#: ../category.c:476
 msgid "You must select a category to delete"
 msgstr "�A��������ܤ@�����O�~��R��"
 
 #: ../category.c:494
 #, c-format
-msgid "You can't delete category %s.\n"
-msgstr "�L�k�R�����O %s \n"
-
-#: ../category.c:510
-#, c-format
 msgid ""
 "There are %d records in %s.\n"
 "Do you want to move them to %s, or delete them?"
@@ -471,199 +629,336 @@ msgstr ""
 "�`�@�� %d ����Ʀb %s.��.\n"
 "�T�w�n���� %s �άO�R��?"
 
-#: ../category.c:569
+#: ../category.c:554
 #, c-format
 msgid "invalid state file %s line %d\n"
 msgstr "�L�ij��z�ɮ� %s �� %d ��\n"
 
-#: ../category.c:591
+#: ../category.c:576
 #, c-format
 msgid "The category %s can't be used more than once"
 msgstr "���O %s �u�঳�@��"
 
-#. correctly translate title
-#: ../category.c:813
-msgid "category name"
-msgstr "���O�W��"
+#. Category names in host character set
+#: ../category.c:733
+#, fuzzy
+msgid "Category"
+msgstr "���O:"
 
-#: ../category.c:838
+#: ../category.c:834
 msgid "New"
 msgstr "�s�W"
 
-#: ../category.c:845
+#: ../category.c:841
 msgid "Rename"
 msgstr "��W"
 
-#: ../category.c:960
-msgid "debug"
-msgstr "����"
-
-#: ../dat.c:455
+#: ../dat.c:512
 msgid "unknown type ="
 msgstr "�������� ="
 
-#: ../dat.c:536
+#: ../dat.c:603
 #, c-format
 msgid "fields per row count != %d, unknown format\n"
 msgstr "fields per row count != %d, �����榡\n"
 
-#: ../dat.c:550
+#: ../dat.c:625
 #, c-format
 msgid "field count != %d, unknown format\n"
 msgstr "field count != %d, �����榡\n"
 
-#: ../dat.c:558
+#: ../dat.c:635
 msgid "Unknown format, file has wrong schema\n"
 msgstr "�����榡, file has wrong schema\n"
 
-#: ../dat.c:559
+#: ../dat.c:636
 msgid "File schema is:"
 msgstr "�ɮת�schema�O:"
 
-#: ../dat.c:564
-msgid "It should be:  "
+#: ../dat.c:640
+#, fuzzy
+msgid "It should be:"
 msgstr "�����ӬO:  "
 
-#: ../dat.c:674 ../dat.c:692 ../dat.c:874 ../dat.c:887 ../dat.c:1010
-#: ../dat.c:1023 ../dat.c:1147 ../dat.c:1160
+#: ../dat.c:752 ../dat.c:770 ../dat.c:954 ../dat.c:967 ../dat.c:1090
+#: ../dat.c:1103 ../dat.c:1227 ../dat.c:1240
 #, c-format
 msgid "%s:%d Record %d, field %d: Invalid type.  Expected %d, found %d\n"
 msgstr "%s:%d Record %d, field %d: �L������.  �w�� %d �o��� %d\n"
 
-#: ../dat.c:675 ../dat.c:693 ../dat.c:875 ../dat.c:888 ../dat.c:992
-#: ../dat.c:1011 ../dat.c:1024 ../dat.c:1148 ../dat.c:1161
+#: ../dat.c:753 ../dat.c:771 ../dat.c:955 ../dat.c:968 ../dat.c:1072
+#: ../dat.c:1091 ../dat.c:1104 ../dat.c:1228 ../dat.c:1241
 msgid "read of file terminated\n"
 msgstr "Ū���ɮפ��_\n"
 
-#: ../datebook.c:643
+#: ../datebook.c:703 ../datebook_gui.c:3645
 #, c-format
 msgid "Unknown repeatType (%d) found in DatebookDB\n"
 msgstr "�bDatebookDB�������� repeatType (%d)\n"
 
-#: ../datebook_gui.c:218 ../datebook_gui.c:225 ../datebook_gui.c:4117
-#: ../datebook_gui.c:4124
+#: ../datebook_gui.c:239
+#, fuzzy
+msgid "Repeat Never"
+msgstr "���Ƥ覡:"
+
+#: ../datebook_gui.c:240
+#, fuzzy
+msgid "Repeat Daily"
+msgstr "���Ʃ�:"
+
+#: ../datebook_gui.c:241
+#, fuzzy
+msgid "Repeat Weekly"
+msgstr "���Ƥ覡:"
+
+#: ../datebook_gui.c:242
+#, fuzzy
+msgid "Repeat MonthlyByDay"
+msgstr "���Ʃ�:"
+
+#: ../datebook_gui.c:243
+#, fuzzy
+msgid "Repeat MonthlyByDate"
+msgstr "���Ʃ�:"
+
+#: ../datebook_gui.c:244
+msgid "Repeat YearlyDate"
+msgstr ""
+
+#: ../datebook_gui.c:245
+#, fuzzy
+msgid "Repeat YearlyDay"
+msgstr "���Ʃ�:"
+
+#: ../datebook_gui.c:248 ../datebook_gui.c:255 ../datebook_gui.c:4800
+#: ../datebook_gui.c:4807
 msgid "Su"
 msgstr "��"
 
-#: ../datebook_gui.c:219 ../datebook_gui.c:4118
+#: ../datebook_gui.c:249 ../datebook_gui.c:4801
 msgid "Mo"
 msgstr "�@"
 
-#: ../datebook_gui.c:220 ../datebook_gui.c:4119
+#: ../datebook_gui.c:250 ../datebook_gui.c:4802
 msgid "Tu"
 msgstr "�G"
 
-#: ../datebook_gui.c:221 ../datebook_gui.c:4120
+#: ../datebook_gui.c:251 ../datebook_gui.c:4803
 msgid "We"
 msgstr "�T"
 
-#: ../datebook_gui.c:222 ../datebook_gui.c:4121
+#: ../datebook_gui.c:252 ../datebook_gui.c:4804
 msgid "Th"
 msgstr "�|"
 
-#: ../datebook_gui.c:223 ../datebook_gui.c:4122
+#: ../datebook_gui.c:253 ../datebook_gui.c:4805
 msgid "Fr"
 msgstr "��"
 
-#: ../datebook_gui.c:224 ../datebook_gui.c:4123
+#: ../datebook_gui.c:254 ../datebook_gui.c:4806
 msgid "Sa"
 msgstr "��"
 
-#: ../datebook_gui.c:556 ../datebook_gui.c:2070
+#: ../datebook_gui.c:267
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: Event"
+msgstr ""
+
+#: ../datebook_gui.c:275
+#, c-format
+msgid ""
+"Start Date: %s\n"
+"Time: %s to %s"
+msgstr ""
+
+#: ../datebook_gui.c:285 ../datebook_gui.c:295
+msgid "Unknown"
+msgstr ""
+
+#. End Date
+#: ../datebook_gui.c:298
+#, fuzzy
+msgid "End Date: "
+msgstr "�ק����"
+
+#: ../datebook_gui.c:300
+msgid "Never"
+msgstr ""
+
+#: ../datebook_gui.c:306
+#, c-format
+msgid "Repeat Frequency: %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:314
+#, c-format
+msgid "Monthly Repeat Day %d\n"
+msgstr ""
+
+#: ../datebook_gui.c:319 ../datebook_gui.c:5517
+msgid "Repeat on Days:"
+msgstr "���Ʃ�:"
+
+#: ../datebook_gui.c:330
+#, fuzzy, c-format
+msgid "Number of exceptions: %d"
+msgstr "�����ƥ� = %d\n"
+
+#: ../datebook_gui.c:336
+msgid ""
+"\n"
+"more..."
+msgstr ""
+
+#: ../datebook_gui.c:357 ../datebook_gui.c:384
+msgid "Description:"
+msgstr ""
+
+#: ../datebook_gui.c:358 ../datebook_gui.c:385
+#, fuzzy
+msgid "Note:"
+msgstr "����"
+
+#: ../datebook_gui.c:360 ../datebook_gui.c:388
+#, fuzzy
+msgid "Alarm:"
+msgstr "�x�a"
+
+#: ../datebook_gui.c:361 ../datebook_gui.c:389
+#, fuzzy
+msgid "Repeat Type:"
+msgstr "���Ƥ覡:"
+
+#: ../datebook_gui.c:364 ../datebook_gui.c:392
+#, fuzzy
+msgid "Start of Week:"
+msgstr "�C�g����"
+
+#: ../datebook_gui.c:386 ../datebook_gui.c:5340
+msgid "Location:"
+msgstr ""
+
+#: ../datebook_gui.c:620 ../datebook_gui.c:2271
 #, c-format
 msgid "Appointment description text > %d, truncating to %d\n"
 msgstr "���|�y�z��r > %d, �I�_�� %d\n"
 
-#: ../datebook_gui.c:566 ../datebook_gui.c:983 ../datebook_gui.c:2131
-#: ../datebook_gui.c:2138
+#: ../datebook_gui.c:631 ../datebook_gui.c:1148 ../datebook_gui.c:2331
+#: ../datebook_gui.c:2338
 msgid "Error"
 msgstr "���~"
 
-#: ../datebook_gui.c:567
+#: ../datebook_gui.c:632
 msgid "File doesn't appear to be datebook.dat format\n"
 msgstr "�ɮצ��G���O datebook.dat �榡\n"
 
-#: ../datebook_gui.c:983
+#: ../datebook_gui.c:699
+msgid "DAT/DBA (Palm Archive Formats)"
+msgstr ""
+
+#: ../datebook_gui.c:787
+#, c-format
+msgid ""
+"Datebook exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:790
+#, c-format
+msgid ""
+"Calendar exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../datebook_gui.c:817 ../todo_gui.c:701
+msgid ""
+"Host character encoding is not UTF-8 based.\n"
+" Exported ical file may not be standards-compliant\n"
+msgstr ""
+
+#: ../datebook_gui.c:1148
 msgid "Unknown export type"
 msgstr "�����ץX����"
 
-#: ../datebook_gui.c:1092 ../export_gui.c:257 ../jpilot.c:551
+#: ../datebook_gui.c:1228 ../todo_gui.c:872
+msgid "iCalendar"
+msgstr ""
+
+#: ../datebook_gui.c:1240 ../export_gui.c:251 ../jpilot.c:427
 msgid "Export"
 msgstr "�ץX"
 
 #. Label for instructions
-#: ../datebook_gui.c:1109
+#: ../datebook_gui.c:1257
 msgid "Export All Datebook Records"
 msgstr "�ץX���� Datebook ����"
 
-#: ../datebook_gui.c:1128 ../export_gui.c:319
+#: ../datebook_gui.c:1276 ../export_gui.c:316
 msgid "Save as"
 msgstr "�t�s��"
 
-#: ../datebook_gui.c:1138 ../export_gui.c:330
+#. Browse button
+#: ../datebook_gui.c:1286 ../export_gui.c:329
 msgid "Browse"
 msgstr "�s��"
 
-#: ../datebook_gui.c:1300
+#: ../datebook_gui.c:1432
 msgid "Datebook Categories"
 msgstr "��ƾ����O"
 
-#: ../datebook_gui.c:1343 ../import_gui.c:533 ../install_gui.c:341
-#: ../monthview_gui.c:545 ../search_gui.c:620 ../weekview_gui.c:369
-msgid "Close"
-msgstr "����"
-
-#. Create a "None" button
-#. labels for notebook
-#: ../datebook_gui.c:1356 ../datebook_gui.c:4639
+#. None button
+#. Labels for notebook tabs
+#: ../datebook_gui.c:1484 ../datebook_gui.c:2026 ../datebook_gui.c:5446
 msgid "None"
 msgstr "�L"
 
-#: ../datebook_gui.c:1468
+#: ../datebook_gui.c:1633
 msgid "Begin On Date"
 msgstr "�}�l���"
 
-#: ../datebook_gui.c:1473
+#: ../datebook_gui.c:1639
 msgid "End On Date"
 msgstr "�ק����"
 
-#: ../datebook_gui.c:1567 ../prefs.c:424
+#: ../datebook_gui.c:1751 ../prefs.c:449
 msgid "Sunday"
 msgstr "�P����"
 
-#: ../datebook_gui.c:1568 ../prefs.c:425
+#: ../datebook_gui.c:1752 ../prefs.c:450
 msgid "Monday"
 msgstr "�P���@"
 
-#: ../datebook_gui.c:1569
+#: ../datebook_gui.c:1753
 msgid "Tuesday"
 msgstr "�P���G"
 
-#: ../datebook_gui.c:1570
+#: ../datebook_gui.c:1754
 msgid "Wednesday"
 msgstr "�P���T"
 
-#: ../datebook_gui.c:1571
+#: ../datebook_gui.c:1755
 msgid "Thursday"
 msgstr "�P���|"
 
-#: ../datebook_gui.c:1572
+#: ../datebook_gui.c:1756
 msgid "Friday"
 msgstr "�P����"
 
-#: ../datebook_gui.c:1573
+#: ../datebook_gui.c:1757
 msgid "Saturday"
 msgstr "�P����"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "4th"
 msgstr "�ĥ|�g"
 
-#: ../datebook_gui.c:1576
+#: ../datebook_gui.c:1760
 msgid "Last"
 msgstr "����g"
 
-#: ../datebook_gui.c:1579
+#: ../datebook_gui.c:1763
 #, c-format
 msgid ""
 "This appointment can either\n"
@@ -677,69 +972,74 @@ msgstr ""
 "�̫�@�g %s����\n"
 "�аݦp����?"
 
-#: ../datebook_gui.c:1586 ../datebook_gui.c:1603
+#: ../datebook_gui.c:1770 ../datebook_gui.c:1786
 msgid "Question?"
 msgstr "�ð�?"
 
-#. ---------------------------
-#: ../datebook_gui.c:1594
+#: ../datebook_gui.c:1777
+#, fuzzy
 msgid ""
 "This is a repeating event.\n"
-"Do you want to apply these\n"
-"changes to just the CURRENT\n"
-"event, or ALL of the\n"
-"occurrences of this event?"
+"Do you want to apply these changes to\n"
+"only the CURRENT event,\n"
+"just FUTURE events, or\n"
+"ALL of the occurrences of this event?"
 msgstr ""
 "�o�O�@�ӭ��Ƶo�ͪ��ƥ�.\n"
 "�z�谵���ק�, �O�ȾA�Ω�\n"
 "�y�ثe�z�ƥ���άO�o�ƥ�\n"
 "�y�C���o�͡z�ɳ��A��?"
 
-#: ../datebook_gui.c:1599
+#: ../datebook_gui.c:1782
 msgid "Current"
 msgstr "�ثe�ƥ�"
 
-#: ../datebook_gui.c:1838
-msgid "none"
-msgstr "�L"
+#: ../datebook_gui.c:1782
+msgid "Future"
+msgstr ""
 
-#: ../datebook_gui.c:1839
+#: ../datebook_gui.c:2027
 msgid "day"
 msgstr "��"
 
-#: ../datebook_gui.c:1840
+#: ../datebook_gui.c:2028
 msgid "week"
 msgstr "�g"
 
-#: ../datebook_gui.c:1841
+#: ../datebook_gui.c:2029
 msgid "month"
 msgstr "�Ӥ�"
 
-#: ../datebook_gui.c:1842
+#: ../datebook_gui.c:2030
 msgid "year"
 msgstr "�~"
 
-#: ../datebook_gui.c:2126 ../datebook_gui.c:2129
+#: ../datebook_gui.c:2326 ../datebook_gui.c:2329
 #, c-format
 msgid "You cannot have an appointment that repeats every %d %s(s)\n"
 msgstr "�z�[�J�����|�L�k�C %d %s���Ƥ@��.\n"
 
-#: ../datebook_gui.c:2139
+#: ../datebook_gui.c:2339
+#, fuzzy
 msgid ""
-"You can not have a weekly repeating appointment that doesn't repeat on any "
+"You cannot have a weekly repeating appointment that doesn't repeat on any "
 "day of the week."
 msgstr "�z�]�w�F�@�ӨC�g���ƪ����|, ���z���w�b����@�ѭ���."
 
 #. This is a timeless event
-#: ../datebook_gui.c:2292
+#: ../datebook_gui.c:2516 ../datebook_gui.c:5261
 msgid "No Time"
 msgstr "���w�ɶ�"
 
-#: ../datebook_gui.c:2631
+#: ../datebook_gui.c:2788 ../memo_gui.c:1339 ../todo_gui.c:1728
+msgid "External editor command too long to execute\n"
+msgstr ""
+
+#: ../datebook_gui.c:2940
 msgid "Invalid Appointment"
 msgstr "�L�Ĭ��|"
 
-#: ../datebook_gui.c:2632
+#: ../datebook_gui.c:2941
 msgid ""
 "The End Date of this appointment\n"
 "is before the start date."
@@ -747,182 +1047,162 @@ msgstr ""
 "�o�Ӭ��|���������\n"
 "��}�l����٦�."
 
-#. The No due date check box
-#: ../datebook_gui.c:2901 ../datebook_gui.c:4673 ../datebook_gui.c:4703
-#: ../datebook_gui.c:4758 ../datebook_gui.c:4807 ../todo_gui.c:130
-#: ../todo_gui.c:2245
+#. "No Date" check box
+#: ../datebook_gui.c:3336 ../datebook_gui.c:5479 ../datebook_gui.c:5510
+#: ../datebook_gui.c:5562 ../datebook_gui.c:5610 ../todo_gui.c:140
+#: ../todo_gui.c:2451
 msgid "No Date"
 msgstr "�L����"
 
-#: ../datebook_gui.c:3021
-#, c-format
-msgid "Error in DateBookDB advanceUnits = %d\n"
+#: ../datebook_gui.c:3491
+#, fuzzy, c-format
+msgid "Error in DateBookDB or Calendar advanceUnits = %d\n"
 msgstr "DateBookDB �������~advanceUnits = %d\n"
 
-#: ../datebook_gui.c:3192
-msgid "Unknown repeatType found in DatebookDB\n"
-msgstr "�bDatebookDB��������repeatType\n"
-
-#: ../datebook_gui.c:3225
+#: ../datebook_gui.c:3678
 #, c-format
 msgid "%%a., %s"
 msgstr ""
 
-#: ../datebook_gui.c:3230 ../monthview_gui.c:230 ../weekview_gui.c:219
+#: ../datebook_gui.c:3683
 msgid " (TODAY)"
 msgstr ""
 
-#. Make Weekview button
-#: ../datebook_gui.c:4200 ../datebook_gui.c:4641
+#. Weekview button
+#: ../datebook_gui.c:4931 ../datebook_gui.c:5448
 msgid "Week"
 msgstr "�g"
 
-#: ../datebook_gui.c:4206
-msgid "W"
-msgstr "�P"
-
-#: ../datebook_gui.c:4208
-msgid "View appointments by week"
+#: ../datebook_gui.c:4940
+#, fuzzy
+msgid "View appointments by week   Ctrl+W"
 msgstr "�g�˵�"
 
-#. Make Monthview button
-#: ../datebook_gui.c:4211 ../datebook_gui.c:4642
+#. Monthview button
+#: ../datebook_gui.c:4943 ../datebook_gui.c:5449
 msgid "Month"
 msgstr "��"
 
-#: ../datebook_gui.c:4218
-msgid "M"
-msgstr "��"
-
-#: ../datebook_gui.c:4220
-msgid "View appointments by month"
+#: ../datebook_gui.c:4952
+#, fuzzy
+msgid "View appointments by month   Ctrl+M"
 msgstr "���˵�"
 
 #. Make Category button
-#: ../datebook_gui.c:4225
+#: ../datebook_gui.c:4957
 msgid "Cats"
 msgstr "���O"
 
-#: ../datebook_gui.c:4291
+#: ../datebook_gui.c:5021
 msgid "Time"
 msgstr "�ɶ�"
 
-#.
-#. * Hide ToDo button
-#.
-#: ../datebook_gui.c:4328
+#. "Show ToDos" button
+#: ../datebook_gui.c:5064
 msgid "Show ToDos"
 msgstr "��ܥN��ƶ�"
 
-#: ../datebook_gui.c:4343 ../todo_gui.c:2114
+#: ../datebook_gui.c:5078 ../todo_gui.c:2282
 msgid "Task"
 msgstr "�u�@"
 
-#: ../datebook_gui.c:4344 ../todo_gui.c:2115
+#: ../datebook_gui.c:5079 ../todo_gui.c:2283
 msgid "Due"
 msgstr "�����"
 
-#: ../datebook_gui.c:4441
+#: ../datebook_gui.c:5198 ../datebook_gui.c:5355
 msgid "Alarm"
 msgstr "�x�a"
 
-#: ../datebook_gui.c:4462
-msgid "Days"
-msgstr "��"
-
-#: ../datebook_gui.c:4485
-msgid "This Event has no particular time"
-msgstr "���ƥ�L�S�w�ɶ�"
+#. Date Spinners
+#: ../datebook_gui.c:5238 ../Expense/expense.c:1734
+msgid "Date:"
+msgstr "���:"
 
-#: ../datebook_gui.c:4493
-msgid "Starts on"
+#. Start date and time
+#: ../datebook_gui.c:5280
+#, fuzzy
+msgid "Start"
 msgstr "�}�l��"
 
-#: ../datebook_gui.c:4507
-msgid "Start Time"
-msgstr "�}�l�ɶ�"
-
-#: ../datebook_gui.c:4525
-msgid "End Time"
-msgstr "�����ɶ�"
+#. End date and time
+#: ../datebook_gui.c:5297
+#, fuzzy
+msgid "End"
+msgstr "������"
 
-#: ../datebook_gui.c:4623
+#: ../datebook_gui.c:5430
 msgid "DateBk Tags"
 msgstr "DateBk �аO"
 
-#: ../datebook_gui.c:4640
+#: ../datebook_gui.c:5447
 msgid "Day"
 msgstr "��"
 
-#: ../datebook_gui.c:4643
+#: ../datebook_gui.c:5450
 msgid "Year"
 msgstr "�~"
 
-#. no repeat page for notebook
-#: ../datebook_gui.c:4647
+#. "No Repeat" page for notebook
+#: ../datebook_gui.c:5453
 msgid "This event will not repeat"
 msgstr "���ƥ󤣷|����"
 
-#: ../datebook_gui.c:4657 ../datebook_gui.c:4689 ../datebook_gui.c:4744
-#: ../datebook_gui.c:4791
+#: ../datebook_gui.c:5462 ../datebook_gui.c:5495 ../datebook_gui.c:5547
+#: ../datebook_gui.c:5593
 msgid "Frequency is Every"
 msgstr "�����W�v�O�C"
 
-#: ../datebook_gui.c:4662
+#: ../datebook_gui.c:5468
 msgid "Day(s)"
 msgstr "��"
 
-#. checkbutton
-#: ../datebook_gui.c:4665 ../datebook_gui.c:4697 ../datebook_gui.c:4752
-#: ../datebook_gui.c:4799
+#: ../datebook_gui.c:5471 ../datebook_gui.c:5504 ../datebook_gui.c:5556
+#: ../datebook_gui.c:5602
 msgid "End on"
 msgstr "������"
 
-#: ../datebook_gui.c:4694
+#: ../datebook_gui.c:5501
 msgid "Week(s)"
 msgstr "�g"
 
-#: ../datebook_gui.c:4710
-msgid "Repeat on Days:"
-msgstr "���Ʃ�:"
-
-#: ../datebook_gui.c:4749
+#: ../datebook_gui.c:5553
 msgid "Month(s)"
 msgstr "��"
 
-#: ../datebook_gui.c:4766
+#: ../datebook_gui.c:5570
 msgid "Repeat by:"
 msgstr "���Ƥ覡:"
 
-#: ../datebook_gui.c:4770
+#: ../datebook_gui.c:5574
 msgid "Day of week"
 msgstr "�C�g����"
 
-#: ../datebook_gui.c:4779
+#: ../datebook_gui.c:5583 ../Expense/expense.c:1616
 msgid "Date"
 msgstr "�Ӥ몺�ĴX��"
 
-#: ../datebook_gui.c:4796
+#: ../datebook_gui.c:5599
 msgid "Year(s)"
 msgstr "�C�~"
 
-#: ../dialer.c:194
+#: ../dialer.c:195
 msgid "Phone Dialer"
 msgstr "�q�ܼ�����"
 
-#: ../dialer.c:229
+#: ../dialer.c:230
 msgid "Prefix 1"
 msgstr "�e�m�X 1"
 
-#: ../dialer.c:251
+#: ../dialer.c:252
 msgid "Prefix 2"
 msgstr "�e�m�X 2"
 
-#: ../dialer.c:273
+#: ../dialer.c:274
 msgid "Prefix 3"
 msgstr "�e�m�X 3"
 
-#: ../dialer.c:288
+#: ../dialer.c:289
 msgid "Phone number:"
 msgstr "�q�ܸ��X:"
 
@@ -930,233 +1210,138 @@ msgstr "
 msgid "Extension"
 msgstr "�������X"
 
-#: ../dialer.c:342
+#: ../dialer.c:341
 msgid "Dial Command"
 msgstr "�����R�O"
 
-#: ../dialer.c:367
-msgid "Dismiss"
-msgstr "����"
-
-#: ../export_gui.c:115
+#: ../export_gui.c:121
 msgid "File Browser"
 msgstr "�ɮ��s����"
 
 #. Label for instructions
-#: ../export_gui.c:275
+#: ../export_gui.c:273
 msgid "Select records to be exported"
 msgstr "�п�ܭn�ץX������"
 
-#: ../export_gui.c:277
+#: ../export_gui.c:275
 msgid "Use Ctrl and Shift Keys"
 msgstr "�ϥ� Ctrl �M Shift ��"
 
 #. Import button
-#: ../import_gui.c:265 ../import_gui.c:315 ../import_gui.c:423
-#: ../import_gui.c:509 ../jpilot.c:507
+#: ../import_gui.c:300 ../import_gui.c:369 ../import_gui.c:426
+#: ../import_gui.c:471 ../jpilot.c:383
 msgid "Import"
 msgstr "�פJ"
 
-#: ../import_gui.c:298 ../install_gui.c:310
-msgid "To change to a hidden directory type it below and hit TAB"
-msgstr "�Y�n���������åؿ�, �Цb�U����J��� TAB ��"
-
-#: ../import_gui.c:307 ../prefs_gui.c:771
-msgid "Done"
-msgstr "����"
-
-#: ../import_gui.c:328
-msgid "Import File Type"
-msgstr "�פJ�ɮ�����"
-
-#: ../import_gui.c:442
+#: ../import_gui.c:317
+#, c-format
 msgid "Record was marked as private"
 msgstr "�����w�аO��\"�p�H\""
 
-#: ../import_gui.c:444
+#: ../import_gui.c:319
+#, c-format
 msgid "Record was not marked as private"
 msgstr "�������аO��\"�p�H\""
 
-#: ../import_gui.c:453
+#: ../import_gui.c:328
 #, c-format
 msgid "Category before import was: [%s]"
 msgstr "�פJ�e�����O��: [%s]"
 
-#: ../import_gui.c:461
+#: ../import_gui.c:336
 #, c-format
 msgid "Record will be put in category [%s]"
 msgstr "�����N��m�����O [%s]"
 
 #. Import All button
-#: ../import_gui.c:516
+#: ../import_gui.c:376
 msgid "Import All"
 msgstr "�פJ����"
 
 #. Skip button
-#: ../import_gui.c:523
+#: ../import_gui.c:383
 msgid "Skip"
 msgstr "���L"
 
-#: ../install_gui.c:257
-msgid "Install"
-msgstr "�w��"
+#: ../import_gui.c:457 ../install_gui.c:427
+msgid "To change to a hidden directory type it below and hit TAB"
+msgstr "�Y�n���������åؿ�, �Цb�U����J��� TAB ��"
 
-#. i18n hack to have title correctly translated
-#: ../install_gui.c:287
-msgid "Files to be installed"
-msgstr "�N�w�˪��ɮ�"
+#: ../import_gui.c:484
+msgid "Import File Type"
+msgstr "�פJ�ɮ�����"
 
-#: ../install_gui.c:319
-msgid "Add"
-msgstr "�[�J"
+#: ../install_gui.c:364
+#, fuzzy
+msgid "Files to install"
+msgstr "�N�w�˪��ɮ�"
 
-#: ../install_gui.c:330
-msgid "Remove"
-msgstr "����"
+#: ../install_gui.c:372
+msgid "Install"
+msgstr "�w��"
 
-#: ../install_user.c:115 ../install_user.c:214
+#: ../install_user.c:116 ../install_user.c:218
 #, fuzzy
 msgid "Install User"
 msgstr "/�ɮ�(F)/�w��(I)"
 
-#: ../install_user.c:138
+#: ../install_user.c:137
 msgid ""
 "A PalmOS(c) device needs a user name and a user ID in order to sync properly."
 msgstr ""
 
-#: ../install_user.c:145
+#: ../install_user.c:144
 msgid ""
 "If you want to sync more than 1 PalmOS(c) device each one should have a "
 "different ID and preferably a different user name."
 msgstr ""
 
-#: ../install_user.c:175
+#. Instruction label
+#: ../install_user.c:166
 msgid "Most people choose their name or nickname for the user name."
 msgstr ""
 
-#: ../install_user.c:182
-#, fuzzy
-msgid "User name"
+#: ../install_user.c:174 ../restore_gui.c:276
+msgid "User Name"
 msgstr "�ϥΪ̦W��"
 
-#: ../install_user.c:187
+#: ../install_user.c:184
 msgid "The ID should be a random number."
 msgstr ""
 
-#: ../install_user.c:194 ../restore_gui.c:295
+#: ../install_user.c:192 ../restore_gui.c:295
 msgid "User ID"
 msgstr "�ϥΪ� ID"
 
-#: ../jpilot-dump.c:95
-#, fuzzy
-msgid " +D +A +T +M format like date +format.\n"
-msgstr " +B +M +A +T �榡�۪�� date +�榡 (�Шϥ� -? �F�ѧ�h�ԲӸ�T).\n"
-
-#: ../jpilot-dump.c:96
-msgid " -v displays version and exits.\n"
-msgstr " -v �N���jpilot���������}\n"
-
-#: ../jpilot-dump.c:97 ../utils.c:73
-msgid " -h displays help and exits.\n"
-msgstr " -h �N��ܨD�U�����}.\n"
-
-#: ../jpilot-dump.c:98
-#, fuzzy
-msgid " -f displays help for format codes.\n"
-msgstr " -h �N��ܨD�U�����}.\n"
-
-#: ../jpilot-dump.c:99
-#, fuzzy
-msgid " -D dump DateBook.\n"
-msgstr " -B �ɦL��ƾ�.\n"
-
-#: ../jpilot-dump.c:100
-#, fuzzy
-msgid " -N dump appts for today in DateBook.\n"
-msgstr " -N �ɦL��ƾ䪺������.\n"
-
-#: ../jpilot-dump.c:101
-#, fuzzy
-msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook.\n"
-msgstr " -NYYYY/MM/DD �N�|�� YYYY/MM/DD �榡�ɦL��ƾ䪺���.\n"
-
-#: ../jpilot-dump.c:102
-msgid " -A dump Address book.\n"
-msgstr " -A �ɦL�a�}ï.\n"
-
-#: ../jpilot-dump.c:103
-#, fuzzy
-msgid " -T dump ToDo list as CSV.\n"
-msgstr " -T �N�N��ƶ���CSV�榡�ɦL�X��.\n"
-
-#: ../jpilot-dump.c:104
-msgid " -M dump Memos.\n"
-msgstr " -M �ɦL�Ƨѿ�.\n"
-
-#: ../jpilot-sync.c:66
-msgid ""
-" J-Pilot preferences are read to get port, rate, number of backups, etc.\n"
-msgstr ""
-" J-Pilot �����n�]�w�N�|Ū���s���Ψ��Ӱ�, �s���t�v�άO�n�O�d�X���ƥ�����.\n"
-
-#: ../jpilot-sync.c:67
-msgid " -v = version\n"
-msgstr " -v = ����\n"
-
-#: ../jpilot-sync.c:68
-msgid " -h = help\n"
-msgstr " -h = �D�U\n"
-
-#: ../jpilot-sync.c:69
-msgid " -d = run in debug mode\n"
-msgstr " -d = �H�����Ҧ�����\n"
-
-#: ../jpilot-sync.c:70
-msgid " -P = do not load plugins.\n"
-msgstr " -P = �����J�~���{��.\n"
-
-#: ../jpilot-sync.c:71
-msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
-msgstr " -b = �P�B�åB�ƥ�, �_�h�N�u�P�B.\n"
-
-#: ../jpilot-sync.c:72
-msgid " -l = loop, otherwise sync once and exit.\n"
-msgstr " -l = ��������, �_�h�N�u�P�B�@���åB���}.\n"
-
-#: ../jpilot-sync.c:73
-msgid ""
-" -p {port} = Use this port to sync with instead of getting preferences.\n"
-msgstr " -p {port} = �ϥγo�ӳs����P�B�Ӥ��ϥΰ��n�]�w���ҫ��w���s����.\n"
-
-#. The log window hasn't been created yet
-#: ../jpilot.c:140
-#, c-format
-msgid "Invalid geometry specification: \"%s\"\n"
-msgstr "���X�z��������m����j�p�]�w: \"%s\"\n"
-
-#: ../jpilot.c:447 ../monthview_gui.c:555 ../print_gui.c:338
-#: ../weekview_gui.c:379
+#: ../jpilot.c:317
 msgid "Print"
 msgstr "�C�L"
 
-#: ../jpilot.c:448
+#: ../jpilot.c:318
 msgid "There is no print support for this conduit."
 msgstr "�o�ӦP�B�q�D���䴩�C�L."
 
-#: ../jpilot.c:508
+#: ../jpilot.c:384
 msgid "There is no import support for this conduit."
 msgstr "�o�ӦP�B�q�D���䴩�פJ."
 
-#: ../jpilot.c:552
+#: ../jpilot.c:428
 msgid "There is no export support for this conduit."
 msgstr "�o�ӦP�B�q�D���䴩�ץX."
 
+#: ../jpilot.c:657
+#, fuzzy
+msgid " Cancelling HotSync\n"
+msgstr "�����P�B"
+
 #. -------------------------------------------
-#: ../jpilot.c:728
+#: ../jpilot.c:673
+#, fuzzy
 msgid ""
-"This palm doesn't have the same user name\n"
-"or user ID as the one that was synced the\n"
-"last time.  Syncing could have unwanted effects.\n"
+"This handheld does not have the same user name or user ID\n"
+"as the one that was synced the last time.\n"
+"Syncing could have unwanted effects including data loss.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "�o��Palm PDA�MJ-Pilot�W���ϥΪ̦W�٤��P,\n"
@@ -1165,15 +1350,16 @@ msgstr ""
 "�p�G���T�w���ܽиԲӾ\Ū�ϥΪ̤�U."
 
 #. -------------------------------------------
-#: ../jpilot.c:735
+#: ../jpilot.c:680
 #, fuzzy
 msgid ""
-"This palm has a NULL user id.\n"
-"Every palm must have a unique user id in order to sync properly.\n"
-"If it has been hard reset, use restore from the menu to restore it,\n"
-"or use pilot-xfer.\n"
-"To add a user name and ID use the install-user command line tool,\n"
-"or use install-user from the menu\n"
+"This handheld has a NULL user ID.\n"
+"Every handheld must have a unique user ID in order to sync properly.\n"
+"If the handheld has been hard reset, \n"
+"   use restore from the menu to restore it.\n"
+"Otherwise, to add a new user name and ID\n"
+"   use install-user from the menu.\n"
+"\n"
 "Read the user manual if you are uncertain."
 msgstr ""
 "�o�� Palm PDA �����ϥΪ� ID �O\"�Ū�\"\n"
@@ -1186,250 +1372,227 @@ msgstr ""
 "�Ҧp install-user \"�W��\" 12345.\n"
 "�p�G���T�w���ܽиԲӾ\Ū�ϥΪ̤�U."
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Cancel Sync"
 msgstr "�����P�B"
 
-#: ../jpilot.c:742
+#: ../jpilot.c:688
 msgid "Sync Anyway"
 msgstr "�������D, �Ӽ˦P�B"
 
-#: ../jpilot.c:751 ../jpilot.c:755
+#: ../jpilot.c:697 ../jpilot.c:701
 msgid "Sync Problem"
 msgstr "�P�B���D"
 
-#: ../jpilot.c:982
+#: ../jpilot.c:932 ../jpilot.c:1787
+msgid " User: "
+msgstr " �ϥΪ�: "
+
+#: ../jpilot.c:944
 msgid "Unknown command from sync process\n"
 msgstr "�P�B���L�{���ϥΤF�������R�O\n"
 
-#: ../jpilot.c:1003 ../Expense/expense.c:500 ../KeyRing/keyring.c:1737
-#: ../SyncTime/synctime.c:48
+#: ../jpilot.c:963 ../Expense/expense.c:527 ../KeyRing/keyring.c:1870
+#: ../SyncTime/synctime.c:59
 #, c-format
 msgid "About %s"
 msgstr "���� %s"
 
-#: ../jpilot.c:1406
+#: ../jpilot.c:1107
 msgid "/_File"
 msgstr "/�ɮ�(F)"
 
-#: ../jpilot.c:1407
+#: ../jpilot.c:1108
 msgid "/File/tear"
 msgstr "/�ɮ�(F)/tear"
 
-#: ../jpilot.c:1408
+#: ../jpilot.c:1109
 msgid "/File/_Find"
 msgstr "/�ɮ�(F)/�M��(F)"
 
-#: ../jpilot.c:1409 ../jpilot.c:1415 ../jpilot.c:1418
+#: ../jpilot.c:1110 ../jpilot.c:1116 ../jpilot.c:1119
 msgid "/File/sep1"
 msgstr "/�ɮ�(F)/sep1"
 
-#: ../jpilot.c:1410
+#: ../jpilot.c:1111
 msgid "/File/_Install"
 msgstr "/�ɮ�(F)/�w��(I)"
 
-#: ../jpilot.c:1411
+#: ../jpilot.c:1112
 msgid "/File/Import"
 msgstr "/�ɮ�(F)/�פJ"
 
-#: ../jpilot.c:1412
+#: ../jpilot.c:1113
 msgid "/File/Export"
 msgstr "/�ɮ�(F)/�ץX"
 
-#: ../jpilot.c:1413 ../jpilot.c:2895
+#: ../jpilot.c:1114 ../jpilot.c:2192
 msgid "/File/Preferences"
 msgstr "/�ɮ�(F)/���n�]�w"
 
-#: ../jpilot.c:1414
+#: ../jpilot.c:1115
 msgid "/File/_Print"
 msgstr "/�ɮ�(F)/�C�L(P)"
 
-#: ../jpilot.c:1416
+#: ../jpilot.c:1117
 #, fuzzy
 msgid "/File/Install User"
 msgstr "/�ɮ�(F)/�w��(I)"
 
-#: ../jpilot.c:1417
+#: ../jpilot.c:1118
 msgid "/File/Restore Handheld"
 msgstr "/�ɮ�(F)/�_��PDA"
 
-#: ../jpilot.c:1419
+#: ../jpilot.c:1120
 msgid "/File/_Quit"
 msgstr "/�ɮ�(F)/���}(Q)"
 
-#: ../jpilot.c:1420
+#: ../jpilot.c:1121
 msgid "/_View"
 msgstr "/�˵�(V)"
 
-#: ../jpilot.c:1421 ../jpilot.c:1422 ../jpilot.c:1423 ../jpilot.c:1677
+#: ../jpilot.c:1122 ../jpilot.c:1123 ../jpilot.c:1124 ../jpilot.c:1370
 msgid "/View/Hide Private Records"
 msgstr "/�˵�(V)/���èp�H����"
 
-#: ../jpilot.c:1422
+#: ../jpilot.c:1123 ../jpilot.c:1373
 msgid "/View/Show Private Records"
 msgstr "/�˵�(V)/��ܨp�H����"
 
-#: ../jpilot.c:1423
+#: ../jpilot.c:1124 ../jpilot.c:1376
 msgid "/View/Mask Private Records"
 msgstr "/�˵�(V)/�B�n�p�H����"
 
-#: ../jpilot.c:1424
+#: ../jpilot.c:1125
 msgid "/View/sep1"
 msgstr "/�˵�(V)/sep1"
 
-#: ../jpilot.c:1425
+#: ../jpilot.c:1126
 msgid "/View/Datebook"
 msgstr "/�˵�(V)/��ƾ�"
 
-#: ../jpilot.c:1426
+#: ../jpilot.c:1127
 msgid "/View/Addresses"
 msgstr "/�˵�(V)/�a�}ï"
 
-#: ../jpilot.c:1427
+#: ../jpilot.c:1128
 msgid "/View/Todos"
 msgstr "/�˵�(V)/�ݿ�ƶ�"
 
-#: ../jpilot.c:1428
+#: ../jpilot.c:1129
 msgid "/View/Memos"
 msgstr "/�˵�(V)/�Ƨѿ�"
 
-#: ../jpilot.c:1429 ../jpilot.c:1563
+#: ../jpilot.c:1130 ../jpilot.c:1261
 msgid "/_Plugins"
 msgstr "/�~���{��(P)"
 
-#: ../jpilot.c:1431
+#: ../jpilot.c:1132
 msgid "/_Web"
 msgstr "/Web(W)"
 
 #. web
-#: ../jpilot.c:1432
+#: ../jpilot.c:1133
 msgid "/Web/Netscape"
 msgstr "/Web(W)/Netscape"
 
-#: ../jpilot.c:1436
+#: ../jpilot.c:1137
 msgid "/Web/Mozilla"
 msgstr "/Web(W)/Mozilla"
 
-#: ../jpilot.c:1441
+#: ../jpilot.c:1142
 msgid "/Web/Galeon"
 msgstr "/Web(W)/Galeon"
 
-#: ../jpilot.c:1446
+#: ../jpilot.c:1147
 msgid "/Web/Opera"
 msgstr "/Web(W)/Opera"
 
-#: ../jpilot.c:1450
+#: ../jpilot.c:1151
 msgid "/Web/GnomeUrl"
 msgstr "/Web(W)/GnomeUrl"
 
-#: ../jpilot.c:1452
+#: ../jpilot.c:1153
 msgid "/Web/Lynx"
 msgstr "/Web(W)/Lynx"
 
-#: ../jpilot.c:1454
+#: ../jpilot.c:1155
 msgid "/Web/Links"
 msgstr "/Web(W)/Links"
 
-#: ../jpilot.c:1456
+#: ../jpilot.c:1157
 msgid "/Web/W3M"
 msgstr "/Web(W)/W3M"
 
-#: ../jpilot.c:1458
+#: ../jpilot.c:1159
 msgid "/Web/Konqueror"
 msgstr "/Web(W)/Konqueror"
 
-#: ../jpilot.c:1461
+#: ../jpilot.c:1162
 msgid "/_Help"
 msgstr "/����(H)"
 
-#: ../jpilot.c:1462
-msgid "/Help/PayBack program"
-msgstr "/����(H)/PayBack program"
-
-#: ../jpilot.c:1463
+#: ../jpilot.c:1163
 #, fuzzy
 msgid "/Help/About J-Pilot"
 msgstr "/����(H)/J-Pilot"
 
-#: ../jpilot.c:1530
+#: ../jpilot.c:1229
 #, c-format
 msgid "/_Plugins/%s"
 msgstr "/�~���{��(P)/%s"
 
-#: ../jpilot.c:1541
+#: ../jpilot.c:1239
 #, c-format
 msgid "/_Help/%s"
 msgstr "/����(H)/%s"
 
-#: ../jpilot.c:1840
-msgid "Font Selection Dialog"
-msgstr "�r����ܹ�ܮ�"
-
-#: ../jpilot.c:2211
+#: ../jpilot.c:1593
 msgid "calendar:week_start:0"
 msgstr "��ƾ�:�C�g���}�l:0"
 
-#: ../jpilot.c:2260
+#: ../jpilot.c:1636 ../jpilot-sync.c:169
 msgid "Not loading plugins.\n"
 msgstr "�����J�~���{��.\n"
 
-#: ../jpilot.c:2264
+#: ../jpilot.c:1640
 msgid "Ignoring all alarms.\n"
 msgstr "�����Ҧ����x�a�]�w.\n"
 
-#: ../jpilot.c:2268
+#: ../jpilot.c:1644
 msgid "Ignoring past alarms.\n"
 msgstr "�����L���x�a�]�w.\n"
 
-#: ../jpilot.c:2363 ../jpilot.c:2371
+#: ../jpilot.c:1732 ../jpilot.c:1740
 msgid "Unable to open pipe\n"
 msgstr "�L�k�}�Һ޽u\n"
 
-#: ../jpilot.c:2422
-msgid " User: "
-msgstr " �ϥΪ�: "
-
-#: ../jpilot.c:2564
-msgid "Clear"
-msgstr "�M��"
-
-#: ../jpilot.c:2649
-msgid "Show private records   Ctrl-Z"
-msgstr "��ܨp�H����   Ctrl-Z"
-
-#: ../jpilot.c:2654
+#: ../jpilot.c:1949
 #, fuzzy
-msgid "Show private records"
+msgid "Show private records   Ctrl+Z"
 msgstr "��ܨp�H����   Ctrl-Z"
 
-#: ../jpilot.c:2659
-msgid "Hide private records   Ctrl-Z"
-msgstr "���èp�H����   Ctrl-Z"
-
-#: ../jpilot.c:2664
+#: ../jpilot.c:1954
 #, fuzzy
-msgid "Hide private records"
+msgid "Hide private records   Ctrl+Z"
 msgstr "���èp�H����   Ctrl-Z"
 
-#: ../jpilot.c:2669
-msgid "Mask private records   Ctrl-Z"
-msgstr "�B�n�p�H����   Ctrl-Z"
-
-#: ../jpilot.c:2674
+#: ../jpilot.c:1959
 #, fuzzy
-msgid "Mask private records"
+msgid "Mask private records   Ctrl+Z"
 msgstr "�B�n�p�H����   Ctrl-Z"
 
-#: ../jpilot.c:2684
-msgid "Sync your palm to the desktop   Ctrl-Y"
+#: ../jpilot.c:1971
+#, fuzzy
+msgid "Sync your palm to the desktop   Ctrl+Y"
 msgstr "�� Palm �P J-Pilot �P�B   Ctrl-Y"
 
-#. Create "Font" button
-#: ../jpilot.c:2690
-msgid "Font"
-msgstr "�r��"
+#: ../jpilot.c:1983
+#, fuzzy
+msgid "Stop Sync process"
+msgstr "�P�B�a�}"
 
-#: ../jpilot.c:2705
+#: ../jpilot.c:1995
 msgid ""
 "Sync your palm to the desktop\n"
 "and then do a backup"
@@ -1437,788 +1600,1245 @@ msgstr ""
 "�P�B Palm �P J-Pilot \n"
 "�ç@�ƥ�"
 
-#: ../jpilot.c:2819
+#: ../jpilot.c:2143
 msgid "Datebook/Go to Today"
 msgstr "��ƾ�/����\"����\""
 
-#: ../jpilot.c:2821
+#: ../jpilot.c:2144
 msgid "Address Book"
 msgstr "�a�}ï"
 
-#: ../jpilot.c:2823
+#: ../jpilot.c:2145
 msgid "ToDo List"
 msgstr "�ݿ�ƶ�"
 
-#: ../jpilot.c:2825
+#: ../jpilot.c:2146
 msgid "Memo Pad"
 msgstr "�Ƨѿ�"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Do it now"
 msgstr "�N�o�򰵧a"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Remind me later"
 msgstr "�y�ᴣ����"
 
-#: ../jpilot.c:2877
+#: ../jpilot.c:2174
 msgid "Don't tell me again!"
 msgstr "�O�A�Ч�, �ڤw�g���D�F!"
 
-#: ../jpilot.c:2891
+#: ../jpilot.c:2187
+#, fuzzy, c-format
 msgid ""
-"J-Pilot is using the GTK2 graphical toolkit. This version of the toolkit "
-"uses UTF-8 to encode characters.\n"
-"You should select a UTF-8 charset so you can see the non-ASCII characters "
+"J-Pilot uses the GTK2 graphical toolkit. This version of the toolkit uses "
+"UTF-8 to encode characters.\n"
+"You should select a UTF-8 charset so that you can see non-ASCII characters "
 "(accents for example).\n"
 "\n"
+"Go to the menu \"%s\" and change the \"%s\"."
 msgstr ""
 "�ثe�� J-Pilot �ϥ� GTK2 graphical toolkit. �o�Ӫ����� GTK2 �ϥ� UTF-8 �@���w"
 "�]�s�X.\n"
 "�A������ܤ@�� UTF-8 �r�����~��ݨ�DASCII���r�� (�Ҧp����).\n"
 "\n"
 
-#: ../jpilot.c:2894
-msgid "Go to the menu \""
-msgstr "�ܿ�� \""
-
-#: ../jpilot.c:2896
-msgid "\" and change the \""
-msgstr "\" �åB���ܨ� \""
-
 #. Character Set
-#: ../jpilot.c:2897 ../prefs_gui.c:390
-msgid "Character Set "
+#: ../jpilot.c:2192 ../prefs_gui.c:509
+#, fuzzy
+msgid "Character Set"
 msgstr "�r���� "
 
-#: ../jpilot.c:2898
-msgid "\"."
-msgstr "\"."
-
-#: ../jpilot.c:2900
+#: ../jpilot.c:2194
 msgid "Select a UTF-8 encoding"
 msgstr "��ܤ@�� UTF-8 �r����"
 
-#: ../libplugin.c:153
-#, c-format
-msgid "Unknown PC header version = %d\n"
-msgstr "���� PC ���Y���� = %d\n"
-
-#: ../libplugin.c:416
-#, c-format
-msgid "%s:%d Error opening file: %s\n"
-msgstr "%s:%d �}���ɮ׮ɵo�Ϳ��~: %s\n"
+#: ../jpilot-dump.c:92
+#, fuzzy, c-format
+msgid " +D +A +T +M format like date +format.\n"
+msgstr " +B +M +A +T �榡�۪�� date +�榡 (�Шϥ� -? �F�ѧ�h�ԲӸ�T).\n"
 
-#: ../libplugin.c:422 ../libplugin.c:451 ../sync.c:2879 ../todo.c:391
-#, c-format
-msgid "%s:%d Error reading file: %s\n"
-msgstr "%s:%d Ū�J�ɮ׿��~: %s\n"
+#: ../jpilot-dump.c:93
+#, fuzzy, c-format
+msgid " -v display version and exit\n"
+msgstr " -v �N���jpilot���������}\n"
 
-#: ../libplugin.c:478 ../utils.c:1944
-msgid ""
-"This record is already deleted.\n"
-"It is scheduled to be deleted from the Palm on the next sync.\n"
-msgstr ""
-"�o�Ӭ����w�g�Q�R��.\n"
-"�����e�Q�]�w�Ƶ{�N�b�U�@���P�B�ɱqPalm�R��.\n"
+#: ../jpilot-dump.c:94 ../jpilot-sync.c:66 ../utils.c:1872
+#, fuzzy, c-format
+msgid " -h display help text\n"
+msgstr " -h �N��ܨD�U�����}.\n"
 
-#: ../libplugin.c:487 ../utils.c:1953 ../utils.c:1990
-msgid "Unable to open PC records file\n"
-msgstr "�L�k�}�� PC �W�������ɮ�\n"
+#: ../jpilot-dump.c:95
+#, fuzzy, c-format
+msgid " -f display help for format codes\n"
+msgstr " -h �N��ܨD�U�����}.\n"
 
-#: ../libplugin.c:493 ../utils.c:1959
-msgid "Couldn't find record to delete\n"
-msgstr "�䤣��n�R��������\n"
+#: ../jpilot-dump.c:96
+#, fuzzy, c-format
+msgid " -D dump DateBook\n"
+msgstr " -B �ɦL��ƾ�.\n"
 
-#: ../libplugin.c:511 ../utils.c:1977
+#: ../jpilot-dump.c:97
 #, c-format
-msgid "Unknown header version %d\n"
-msgstr "�������Y���� %d\n"
-
-#: ../libplugin.c:524
-msgid "Couldn't open PC records file\n"
-msgstr "�L�k�}�� PC ��������\n"
+msgid " -i dump DateBook in iCalendar format\n"
+msgstr ""
 
-#: ../libplugin.c:685 ../libplugin.c:777 ../utils.c:1504 ../utils.c:1517
-#, c-format
-msgid "Error opening file: %s\n"
-msgstr "�}���ɮ׮ɵo�Ϳ��~: %s\n"
+#: ../jpilot-dump.c:98
+#, fuzzy, c-format
+msgid " -N dump appts for today in DateBook\n"
+msgstr " -N �ɦL��ƾ䪺������.\n"
 
-#: ../libplugin.c:714
-msgid "Error reading PC file 1\n"
-msgstr "Ū�J PC �ɮ׿��~ 1\n"
+#: ../jpilot-dump.c:99
+#, fuzzy, c-format
+msgid " -NYYYY/MM/DD dump appts on YYYY/MM/DD in DateBook\n"
+msgstr " -NYYYY/MM/DD �N�|�� YYYY/MM/DD �榡�ɦL��ƾ䪺���.\n"
 
-#: ../libplugin.c:730
-msgid "Error reading PC file 2\n"
-msgstr "Ū�J PC �ɮ׿��~ 2\n"
+#: ../jpilot-dump.c:100
+#, fuzzy, c-format
+msgid " -A dump Address book\n"
+msgstr " -A �ɦL�a�}ï.\n"
 
-#: ../libplugin.c:903
-#, c-format
-msgid "Error reading %s 5\n"
-msgstr "Ū�J�ɮ׿��~ %s 5\n"
+#: ../jpilot-dump.c:101
+#, fuzzy, c-format
+msgid " -T dump ToDo list as CSV\n"
+msgstr " -T �N�N��ƶ���CSV�榡�ɦL�X��.\n"
 
-#: ../log.c:95
-#, c-format
-msgid "Unable to open log file, giving up.\n"
-msgstr "�L�k�}�Ҥ�x��, ���ާ@.\n"
+#: ../jpilot-dump.c:102
+#, fuzzy, c-format
+msgid " -M dump Memos\n"
+msgstr " -M �ɦL�Ƨѿ�.\n"
 
-#: ../log.c:102
+#: ../jpilot-dump.c:163
 #, c-format
-msgid "Unable to open log file\n"
-msgstr "�L�k�}�Ҥ�x��\n"
+msgid ""
+"Warning: Host character encoding is not UTF-8 based.\n"
+"Exported ical file may not be standards-compliant\n"
+msgstr ""
 
-#: ../memo_gui.c:300
-msgid "Memo text > 65535, truncating\n"
-msgstr "�Ƨѿ���r�j�� 65535 �r��, �I�_��\n"
+#: ../jpilot-merge.c:161 ../jpilot-merge.c:167
+#, fuzzy, c-format
+msgid "%s: Unable to open file:%s\n"
+msgstr "�L�k�}���ɮ�: %s\n"
 
-#: ../memo_gui.c:330
+#: ../jpilot-merge.c:269
 #, c-format
-msgid "Imported Memo %s\n"
-msgstr "�w�פJ�Ƨѿ� %s\n"
-
-#: ../memo_gui.c:400
-msgid "File doesn't appear to be memopad.dat format\n"
-msgstr "�ɮצ��G���O memopad.dat �榡\n"
+msgid "Records read from pdb = %d\n"
+msgstr ""
 
-#: ../memo_gui.c:547 ../memo_gui.c:562
+#: ../jpilot-merge.c:270
 #, c-format
-msgid "Can't export memo %d\n"
-msgstr "�L�k�ץX�Ƨѿ� %d\n"
-
-#: ../monthview_gui.c:500
-msgid "Monthly View"
-msgstr "����˵�"
-
-#: ../password.c:302
-msgid "Palm Password"
-msgstr "Palm �K�X"
-
-#: ../password.c:333
-msgid "Incorrect, Reenter PalmOS Password"
-msgstr "�����T, ���s��J PalmOS �K�X"
+msgid "Records added         = %d\n"
+msgstr ""
 
-#: ../password.c:335
-msgid "Enter PalmOS Password"
-msgstr "�п�J PalmOS �K�X"
+#: ../jpilot-merge.c:271
+#, c-format
+msgid "Records deleted       = %d\n"
+msgstr ""
 
-#: ../plugins.c:88 ../plugins.c:200 ../restore_gui.c:133
-msgid "infinite loop"
-msgstr "�L���j��"
+#: ../jpilot-merge.c:272
+#, c-format
+msgid "Records modified      = %d\n"
+msgstr ""
 
-#: ../plugins.c:213
+#: ../jpilot-merge.c:273
 #, c-format
-msgid "While reading %s%s line 1:[%s]\n"
-msgstr "��Ū�� %s%s �Ĥ@���:[%s]\n"
+msgid "Records written       = %d\n"
+msgstr ""
 
-#: ../plugins.c:214
-msgid "Wrong Version\n"
-msgstr "���~����\n"
+#: ../jpilot-merge.c:291
+#, c-format
+msgid "Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"
+msgstr ""
 
-#: ../plugins.c:215
-msgid "Check preferences->conduits\n"
-msgstr "�ˬd ���n�]�w->�P�B�q�D\n"
+#: ../jpilot-merge.c:292
+#, c-format
+msgid "  This program will merge an unsynced records file (pc3)\n"
+msgstr ""
 
-#: ../plugins.c:271
+#: ../jpilot-merge.c:293
 #, c-format
 msgid ""
-"Open failed on plugin [%s]\n"
-" error [%s]\n"
+"  into the corresponding palm database (pdb) file.\n"
+"\n"
 msgstr ""
-"�}�ҥ~���{�� [%s] ��\n"
-"�o�Ϳ��~ [%s]\n"
 
-#: ../plugins.c:288 ../plugins.c:314
+#: ../jpilot-merge.c:294
 #, c-format
-msgid " plugin is invalid: [%s]\n"
-msgstr " ���~���{���L��: [%s]\n"
+msgid "  WARNING: Only run this utility if you understand the consequences!\n"
+msgstr ""
 
-#: ../plugins.c:296
+#: ../jpilot-merge.c:295
 #, c-format
-msgid "Plugin:[%s]\n"
-msgstr "�~���{��:[%s]\n"
+msgid "  The merge will leave your databases in an unsync-able state.\n"
+msgstr ""
 
-#: ../plugins.c:297
+#: ../jpilot-merge.c:296
 #, c-format
-msgid "This plugin is version (%d.%d).\n"
-msgstr "���~���{�������� (%d.%d).\n"
-
-#: ../plugins.c:299
-msgid "It is too old to work with this version of J-Pilot.\n"
-msgstr "�����o�Ӫ����� J-Pilot �ӻ���b�Ӧ��¤F.\n"
+msgid ""
+"  It is intended for cases where J-pilot is being used as a standalone PIM\n"
+msgstr ""
 
-#: ../prefs.c:393
-msgid "%B %d, %Y"
+#: ../jpilot-merge.c:297
+#, c-format
+msgid "  and where no syncing occurs to physical hardware.\n"
 msgstr ""
 
-#: ../prefs.c:394
-msgid "%d %B %Y"
+#: ../jpilot-merge.c:298
+#, c-format
+msgid "  WARNING: Make a backup copy of your databases before proceeding.\n"
 msgstr ""
 
-#: ../prefs.c:395
-msgid "%d. %B %Y"
+#: ../jpilot-merge.c:299
+#, c-format
+msgid ""
+"  It is quite simple to destroy your databases by accidentally merging\n"
 msgstr ""
 
-#: ../prefs.c:396
-msgid "%d %B, %Y"
+#: ../jpilot-merge.c:300
+#, c-format
+msgid "  address records into datebook databases, etc.\n"
 msgstr ""
 
-#: ../prefs.c:397
+#: ../jpilot-sync.c:64
+#, fuzzy, c-format
+msgid ""
+" J-Pilot preferences are read to get sync info such as port, rate, number of "
+"backups, etc.\n"
+msgstr ""
+" J-Pilot �����n�]�w�N�|Ū���s���Ψ��Ӱ�, �s���t�v�άO�n�O�d�X���ƥ�����.\n"
+
+#: ../jpilot-sync.c:65 ../utils.c:1871
+#, fuzzy, c-format
+msgid " -v display version and compile options\n"
+msgstr " -v ��ܪ����H�νsĶ�ﶵ����X.\n"
+
+#: ../jpilot-sync.c:67 ../utils.c:1873
+#, fuzzy, c-format
+msgid " -d display debug info to stdout\n"
+msgstr " -d �N������T�ɦܼзǿ�X.\n"
+
+#: ../jpilot-sync.c:68
+#, fuzzy, c-format
+msgid " -P skip loading plugins\n"
+msgstr "�����J�~���{��.\n"
+
+#: ../jpilot-sync.c:69
+#, c-format
+msgid " -b sync, and then do a backup\n"
+msgstr ""
+
+#: ../jpilot-sync.c:70
+#, fuzzy, c-format
+msgid " -l loop, otherwise sync once and exit\n"
+msgstr " -l = ��������, �_�h�N�u�P�B�@���åB���}.\n"
+
+#: ../jpilot-sync.c:71
+#, fuzzy, c-format
+msgid " -p {port} use this port to sync on instead of default\n"
+msgstr " -p {port} = �ϥγo�ӳs����P�B�Ӥ��ϥΰ��n�]�w���ҫ��w���s����.\n"
+
+#: ../jpilot-sync.c:219
+#, fuzzy, c-format
+msgid "Error: connecting to port %s\n"
+msgstr "�}���ɮ׮ɵo�Ϳ��~: %s\n"
+
+#: ../jpilot-sync.c:223
+#, c-format
+msgid "Error: pi_listen\n"
+msgstr ""
+
+#: ../jpilot-sync.c:227
+#, fuzzy, c-format
+msgid "Error: opening conduit to handheld\n"
+msgstr "�}���ɮ׮ɵo�Ϳ��~: next_id\n"
+
+#: ../jpilot-sync.c:231
+#, c-format
+msgid "Error: pi_accept\n"
+msgstr ""
+
+#: ../jpilot-sync.c:235 ../jpilot-sync.c:263
+#, fuzzy, c-format
+msgid "Error: "
+msgstr "���~"
+
+#: ../jpilot-sync.c:236
+#, c-format
+msgid "This handheld does not have the same user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:237 ../jpilot-sync.c:251
+#, c-format
+msgid "as the one that was synced the last time.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:239
+#, c-format
+msgid ""
+"Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:241 ../jpilot-sync.c:254
+#, c-format
+msgid " COPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:243 ../jpilot-sync.c:256
+#, c-format
+msgid " JPILOT_HOME"
+msgstr ""
+
+#: ../jpilot-sync.c:245 ../jpilot-sync.c:258
+#, fuzzy, c-format
+msgid " environment variable can be used to sync different handhelds,\n"
+msgstr "�z�� HOME �����ܼƹ� J-Pilot �ӻ��Ӫ�\n"
+
+#: ../jpilot-sync.c:246 ../jpilot-sync.c:259
+#, c-format
+msgid " to different directories for the same UNIX user name.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:250
+#, c-format
+msgid "This handheld does not have the same user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:252
+#, c-format
+msgid ""
+" Syncing with different handhelds to the same directory can destroy data.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:264
+#, c-format
+msgid "This handheld has a NULL user ID.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:265
+#, c-format
+msgid "Every handheld must have a unique user ID in order to sync properly.\n"
+msgstr ""
+
+#: ../jpilot-sync.c:266
+#, c-format
+msgid "If the handheld has been hard reset, \n"
+msgstr ""
+
+#: ../jpilot-sync.c:267
+#, c-format
+msgid "   use restore from within "
+msgstr ""
+
+#: ../jpilot-sync.c:268
+#, c-format
+msgid "Otherwise, to add a new user name and ID\n"
+msgstr ""
+
+#: ../jpilot-sync.c:269
+#, c-format
+msgid "   use \"install-user %s name numeric_id\"\n"
+msgstr ""
+
+#: ../jpilot-sync.c:273
+#, c-format
+msgid "Error: sync returned error %d\n"
+msgstr ""
+
+#: ../libplugin.c:62 ../utils.c:1052
+msgid ""
+"This record is already deleted.\n"
+"It is scheduled to be deleted from the Palm on the next sync.\n"
+msgstr ""
+"�o�Ӭ����w�g�Q�R��.\n"
+"�����e�Q�]�w�Ƶ{�N�b�U�@���P�B�ɱqPalm�R��.\n"
+
+#: ../libplugin.c:71 ../libplugin.c:108 ../utils.c:1062 ../utils.c:1104
+msgid "Unable to open PC records file\n"
+msgstr "�L�k�}�� PC �W�������ɮ�\n"
+
+#: ../libplugin.c:77 ../utils.c:1069
+msgid "Couldn't find record to delete\n"
+msgstr "�䤣��n�R��������\n"
+
+#: ../libplugin.c:95 ../utils.c:1089
+#, c-format
+msgid "Unknown header version %d\n"
+msgstr "�������Y���� %d\n"
+
+#: ../libplugin.c:180
+#, c-format
+msgid "%s:%d Error opening file: %s\n"
+msgstr "%s:%d �}���ɮ׮ɵo�Ϳ��~: %s\n"
+
+#: ../libplugin.c:186 ../libplugin.c:215 ../sync.c:1731 ../todo.c:100
+#, c-format
+msgid "%s:%d Error reading file: %s\n"
+msgstr "%s:%d Ū�J�ɮ׿��~: %s\n"
+
+#: ../libplugin.c:338 ../libplugin.c:396 ../utils.c:2121 ../utils.c:2134
+#, c-format
+msgid "Error opening file: %s\n"
+msgstr "�}���ɮ׮ɵo�Ϳ��~: %s\n"
+
+#: ../libplugin.c:524
+#, c-format
+msgid "Error reading %s 5\n"
+msgstr "Ū�J�ɮ׿��~ %s 5\n"
+
+#: ../libplugin.c:799
+msgid "Error reading PC file 1\n"
+msgstr "Ū�J PC �ɮ׿��~ 1\n"
+
+#: ../libplugin.c:815
+msgid "Error reading PC file 2\n"
+msgstr "Ū�J PC �ɮ׿��~ 2\n"
+
+#: ../libplugin.c:921
+#, c-format
+msgid "Unknown PC header version = %d\n"
+msgstr "���� PC ���Y���� = %d\n"
+
+#: ../log.c:98
+#, c-format
+msgid "Unable to open log file, giving up.\n"
+msgstr "�L�k�}�Ҥ�x��, ���ާ@.\n"
+
+#: ../log.c:108
+#, c-format
+msgid "Unable to open log file\n"
+msgstr "�L�k�}�Ҥ�x��\n"
+
+#: ../memo_gui.c:302
+msgid "Memo text > 65535, truncating\n"
+msgstr "�Ƨѿ���r�j�� 65535 �r��, �I�_��\n"
+
+#: ../memo_gui.c:330
+#, c-format
+msgid "Imported Memo %s\n"
+msgstr "�w�פJ�Ƨѿ� %s\n"
+
+#: ../memo_gui.c:402
+msgid "File doesn't appear to be memopad.dat format\n"
+msgstr "�ɮצ��G���O memopad.dat �榡\n"
+
+#: ../memo_gui.c:473
+msgid "DAT/MPA (Palm Archive Formats)"
+msgstr ""
+
+#: ../memo_gui.c:558
+#, c-format
+msgid ""
+"Memo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:561
+#, c-format
+msgid ""
+"Memos exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:597 ../memo_gui.c:679
+#, c-format
+msgid "Can't export memo %d\n"
+msgstr "�L�k�ץX�Ƨѿ� %d\n"
+
+#: ../memo_gui.c:641
+#, fuzzy, c-format
+msgid "Memo: %ld\n"
+msgstr "�Ƨѿ�"
+
+#: ../memo_gui.c:647
+#, c-format
+msgid "----- Start of Memo -----\n"
+msgstr ""
+
+#: ../memo_gui.c:649
+#, c-format
+msgid ""
+"\n"
+"----- End of Memo -----\n"
+"\n"
+msgstr ""
+
+#: ../memo_gui.c:748 ../KeyRing/keyring.c:2296
+msgid "KeePassX XML"
+msgstr ""
+
+#: ../monthview_gui.c:436
+msgid "Monthly View"
+msgstr "����˵�"
+
+#: ../monthview_gui.c:478
+msgid "Last month   Alt+LeftArrow"
+msgstr ""
+
+#: ../monthview_gui.c:506
+msgid "Next month   Alt+RightArrow"
+msgstr ""
+
+#: ../otherconv.c:74
+#, c-format
+msgid "%s: error exit from g_iconv_close(%s)\n"
+msgstr ""
+
+#: ../otherconv.c:199
+#, c-format
+msgid "%s:%s g_convert_with_iconv error: %s, buff: %s\n"
+msgstr ""
+
+#: ../otherconv.c:201
+msgid "last char truncated"
+msgstr ""
+
+#: ../otherconv.c:278
+#, c-format
+msgid "UTF_to_other: %s\n"
+msgstr ""
+
+#: ../otherconv.c:292
+#, c-format
+msgid "iconv: unconvertible sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:296
+#, c-format
+msgid "iconv: incomplete UTF-8 sequence at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:299
+#, c-format
+msgid "iconv: buffer filled. stopped at place %d in '%s'\n"
+msgstr ""
+
+#: ../otherconv.c:302
+#, c-format
+msgid "iconv: unexpected error at place %d in '%s'\n"
+msgstr ""
+
+#: ../password.c:281
+msgid "Palm Password"
+msgstr "Palm �K�X"
+
+#: ../password.c:306
+msgid "Incorrect, Reenter PalmOS Password"
+msgstr "�����T, ���s��J PalmOS �K�X"
+
+#: ../password.c:308
+msgid "Enter PalmOS Password"
+msgstr "�п�J PalmOS �K�X"
+
+#: ../pidfile.c:69
+msgid "removing stale pidfile\n"
+msgstr ""
+
+#: ../pidfile.c:95
+#, fuzzy, c-format
+msgid "create pidfile failed: %s\n"
+msgstr "Ū���ɮ׿��~: %s\n"
+
+#: ../pidfile.c:96
+msgid "Warning: hotplug syncing disabled.\n"
+msgstr ""
+
+#: ../plugins.c:88 ../plugins.c:201 ../restore_gui.c:131
+msgid "infinite loop"
+msgstr "�L���j��"
+
+#: ../plugins.c:214
+#, c-format
+msgid "While reading %s%s line 1:[%s]\n"
+msgstr "��Ū�� %s%s �Ĥ@���:[%s]\n"
+
+#: ../plugins.c:215
+msgid "Wrong Version\n"
+msgstr "���~����\n"
+
+#: ../plugins.c:216
+msgid "Check preferences->conduits\n"
+msgstr "�ˬd ���n�]�w->�P�B�q�D\n"
+
+#: ../plugins.c:272
+#, c-format
+msgid ""
+"Open failed on plugin [%s]\n"
+" error [%s]\n"
+msgstr ""
+"�}�ҥ~���{�� [%s] ��\n"
+"�o�Ϳ��~ [%s]\n"
+
+#: ../plugins.c:289 ../plugins.c:314
+#, c-format
+msgid " plugin is invalid: [%s]\n"
+msgstr " ���~���{���L��: [%s]\n"
+
+#: ../plugins.c:297
+#, c-format
+msgid "Plugin:[%s]\n"
+msgstr "�~���{��:[%s]\n"
+
+#: ../plugins.c:298
+#, c-format
+msgid "This plugin is version (%d.%d).\n"
+msgstr "���~���{�������� (%d.%d).\n"
+
+#: ../plugins.c:300
+msgid "It is too old to work with this version of J-Pilot.\n"
+msgstr "�����o�Ӫ����� J-Pilot �ӻ���b�Ӧ��¤F.\n"
+
+#: ../prefs.c:418
+msgid "%B %d, %Y"
+msgstr ""
+
+#: ../prefs.c:419
+msgid "%d %B %Y"
+msgstr ""
+
+#: ../prefs.c:420
+msgid "%d. %B %Y"
+msgstr ""
+
+#: ../prefs.c:421
+msgid "%d %B, %Y"
+msgstr ""
+
+#: ../prefs.c:422
 msgid "%Y. %B. %d"
 msgstr ""
 
-#: ../prefs.c:398
+#: ../prefs.c:423
 msgid "%Y %B %d"
 msgstr ""
 
-#: ../prefs_gui.c:334
+#: ../prefs_gui.c:452
 msgid "Preferences"
 msgstr "���n�]�w"
 
-#: ../prefs_gui.c:364
+#: ../prefs_gui.c:483
 msgid "Locale"
 msgstr "�y�t�]�w"
 
-#: ../prefs_gui.c:366
+#: ../prefs_gui.c:485
 msgid "Settings"
 msgstr "�]�w"
 
-#: ../prefs_gui.c:368
+#: ../prefs_gui.c:487
 msgid "Datebook"
 msgstr "��ƾ�"
 
-#: ../prefs_gui.c:372
+#: ../prefs_gui.c:491
 msgid "ToDo"
 msgstr "�ݿ�ƶ�"
 
-#: ../prefs_gui.c:374
+#: ../prefs_gui.c:493
 msgid "Memo"
 msgstr "�Ƨѿ�"
 
-#: ../prefs_gui.c:376
+#: ../prefs_gui.c:495
 msgid "Alarms"
 msgstr "ĵ�i"
 
-#: ../prefs_gui.c:378
+#: ../prefs_gui.c:497
 msgid "Conduits"
 msgstr "�P�B�q�D"
 
 #. Shortdate
-#: ../prefs_gui.c:403
-msgid "Short date format "
+#: ../prefs_gui.c:522
+#, fuzzy
+msgid "Short date format"
 msgstr "�u����榡 "
 
 #. Longdate
-#: ../prefs_gui.c:416
-msgid "Long date format "
+#: ../prefs_gui.c:535
+#, fuzzy
+msgid "Long date format"
 msgstr "������榡 "
 
 #. Time
-#: ../prefs_gui.c:429
-msgid "Time format "
+#: ../prefs_gui.c:548
+#, fuzzy
+msgid "Time format"
 msgstr "�ɶ��榡 "
 
-#: ../prefs_gui.c:443
-msgid "The first day of the week is "
-msgstr "�@�g���Ĥ@�ѬO "
-
 #. GTK colors file
-#: ../prefs_gui.c:464
-msgid "My GTK colors file is "
+#: ../prefs_gui.c:568
+#, fuzzy
+msgid "GTK color theme file"
 msgstr "�ڪ� GTK �C���ɬO "
 
 #. Port
-#: ../prefs_gui.c:477
-msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
-msgstr "�ǦC�� (/dev/ttyS0, /dev/pilot)"
+#: ../prefs_gui.c:581
+#, fuzzy
+msgid "Sync Port"
+msgstr "�P�B���D"
 
-#. Rate
-#: ../prefs_gui.c:494
-msgid "Serial Rate (Does not affect USB)"
-msgstr "�ǦC��t�v (���v�T USB ����)"
+#. Serial Rate
+#: ../prefs_gui.c:605
+msgid "Serial Rate"
+msgstr ""
 
 #. Number of backups
-#: ../prefs_gui.c:507
+#: ../prefs_gui.c:625
 msgid "Number of backups to be archived"
 msgstr "�O�d�X���ƥ�"
 
 #. Show deleted files check box
-#: ../prefs_gui.c:524
+#: ../prefs_gui.c:643
 msgid "Show deleted records (default NO)"
 msgstr "��ܤw�R�������� (�w�] �_)"
 
 #. Show modified files check box
-#: ../prefs_gui.c:528
+#: ../prefs_gui.c:647
 msgid "Show modified deleted records (default NO)"
 msgstr "��ܤw�R������ (�w�] �_)"
 
-#: ../prefs_gui.c:533
+#: ../prefs_gui.c:652
 msgid "Ask confirmation for file installation (J-Pilot -> PDA) (default YES)"
 msgstr "�b�w�˵{���ɽT�{ (J-Pilot -> PDA) (�w�] �O)"
 
 #. Show tooltips check box
-#: ../prefs_gui.c:537
-msgid "Show popup tooltips (default YES)"
+#: ../prefs_gui.c:656
+#, fuzzy
+msgid "Show popup tooltips (default YES) (requires restart)"
 msgstr "��ܼu�X���K�޴��� (�w�] �O)"
 
-#. ********************************************************************
-#. Datebook preference tab
+#: ../prefs_gui.c:666
+msgid "Use Datebook database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:669
+msgid "Use Calendar database (Palm OS > 5.2)"
+msgstr ""
+
 #. Show highlight days check box
-#: ../prefs_gui.c:545
+#: ../prefs_gui.c:695
 msgid "Highlight calendar days with appointments"
 msgstr "�b��ƾ�W���G����ܦ����|����l"
 
+#. Highlight today on month and week view
+#: ../prefs_gui.c:700
+msgid "Annotate today in day, week, and month views"
+msgstr ""
+
+#. Show number of years on anniversaries in month and week view
+#: ../prefs_gui.c:704
+msgid "Append years on anniversaries in day, week, and month views"
+msgstr ""
+
 #. Show use DateBk check box
-#: ../prefs_gui.c:551
+#: ../prefs_gui.c:710
 msgid "Use DateBk note tags"
 msgstr "�ϥ� DateBk �����аO"
 
-#: ../prefs_gui.c:554
+#: ../prefs_gui.c:713
 msgid "DateBk support disabled in this build"
 msgstr "�������S���ҥ� DateBk �䴩"
 
-#. Highlight today on month and week view
-#: ../prefs_gui.c:561
-msgid "Annotate today in day, week, and month views"
+#: ../prefs_gui.c:725
+msgid "Use Address database (Palm OS < 5.2.1)"
 msgstr ""
 
-#: ../prefs_gui.c:566
-msgid "Append years on anniversaries in day, week, and month views"
+#: ../prefs_gui.c:728
+msgid "Use Contacts database (Palm OS > 5.2)"
 msgstr ""
 
-#: ../prefs_gui.c:578
+#: ../prefs_gui.c:757
 msgid "Mail Command"
 msgstr "�o�H�R�O"
 
-#: ../prefs_gui.c:592
+#: ../prefs_gui.c:771
 #, c-format
 msgid "%s is replaced by the e-mail address"
 msgstr "%s �w�g�Q�q�l�l���}���N"
 
-#. ********************************************************************
-#. ToDo preference tab
-#. The hide completed check box
-#: ../prefs_gui.c:600
+#: ../prefs_gui.c:783
+msgid "Use ToDo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:786
+msgid "Use Task database (Palm OS > 5.2)"
+msgstr ""
+
+#. hide completed check box
+#: ../prefs_gui.c:813
 msgid "Hide Completed ToDos"
 msgstr "���äw�������ݿ�ƶ�"
 
-#. The hide todos not yet due check box
-#: ../prefs_gui.c:604
+#. hide todos not yet due check box
+#: ../prefs_gui.c:817
 msgid "Hide ToDos not yet due"
 msgstr "���å�������ݿ�ƶ�"
 
-#. The record todo completion date check box
-#: ../prefs_gui.c:608
+#. record todo completion date check box
+#: ../prefs_gui.c:821
 msgid "Record Completion Date"
 msgstr "�����������"
 
 #. Use Manana check box
-#: ../prefs_gui.c:613
+#: ../prefs_gui.c:826
 msgid "Use Manana database"
 msgstr "�ϥ� Manana ��Ʈw"
 
-#: ../prefs_gui.c:621
+#: ../prefs_gui.c:834
 msgid "Use default number of days due"
 msgstr "�w�]������鬰"
 
-#. ********************************************************************
-#. Memo preference tab
-#. Memo32 check box
-#: ../prefs_gui.c:641
-msgid "Use Memo32 (pedit32)"
+#: ../prefs_gui.c:856
+msgid "Use Memo database (Palm OS < 5.2.1)"
+msgstr ""
+
+#: ../prefs_gui.c:859
+msgid "Use Memos database (Palm OS > 5.2)"
+msgstr ""
+
+#: ../prefs_gui.c:862
+#, fuzzy
+msgid "Use Memo32 database (pedit32)"
 msgstr "�ϥ� Memo32 (pedit32)"
 
+#: ../prefs_gui.c:902
+msgid "External Editor"
+msgstr ""
+
+#: ../prefs_gui.c:915
+msgid "Use Ctrl-E inside a memo to launch external editor for memo text"
+msgstr ""
+
 #. ********************************************************************
 #. Alarms preference tab
-#. Show open alarm windows check box
-#: ../prefs_gui.c:648
+#. Open alarm windows check box
+#: ../prefs_gui.c:923
 msgid "Open alarm windows for appointment reminders"
 msgstr "���|�����ɶ}�Ҿx�a����"
 
-#. Show open alarm windows check box
-#: ../prefs_gui.c:652
+#. Execute alarm command check box
+#: ../prefs_gui.c:927
 msgid "Execute this command"
 msgstr "���榹�R�O"
 
-#. Shell warning
-#: ../prefs_gui.c:656
+#. Shell warning label
+#: ../prefs_gui.c:931
 msgid "WARNING: executing arbitrary shell commands can be dangerous!!!"
 msgstr "ĵ�i: ���N����t�δߩR�O���۷����M�I��!!!"
 
-#: ../prefs_gui.c:664
+#: ../prefs_gui.c:939
 msgid "Alarm Command"
 msgstr "�x�a�R�O"
 
-#: ../prefs_gui.c:677
+#: ../prefs_gui.c:952
 msgid "%t is replaced with the alarm time"
 msgstr "%t �w�g�Q�x�a�ɶ����N"
 
-#: ../prefs_gui.c:681
+#: ../prefs_gui.c:956
 #, c-format
 msgid "%d is replaced with the alarm date"
 msgstr "%d �w�g�Q�x�a������N"
 
-#: ../prefs_gui.c:686
+#: ../prefs_gui.c:961
 msgid "%D is replaced with the alarm description"
 msgstr "%D �w�g�Q�x�a�y�z���N"
 
-#: ../prefs_gui.c:690
+#: ../prefs_gui.c:965
 msgid "%N is replaced with the alarm note"
 msgstr "%N �w�g�Q�x�a�������N"
 
-#: ../prefs_gui.c:694
+#: ../prefs_gui.c:969
 msgid "%D (description substitution) is disabled in this build"
 msgstr "�������S���ҥ� %D (�y�z���N��) �\��"
 
-#: ../prefs_gui.c:698
+#: ../prefs_gui.c:974
 msgid "%N (note substitution) is disabled in this build"
 msgstr "�������S���ҥ� %N (�������N��) �\��"
 
 #. ********************************************************************
 #. Conduits preference tab
-#. Show sync datebook check box
-#: ../prefs_gui.c:707
+#. Sync datebook check box
+#: ../prefs_gui.c:984
 msgid "Sync datebook"
 msgstr "�P�B��ƾ�"
 
-#. Show sync address check box
-#: ../prefs_gui.c:711
+#. Sync address check box
+#: ../prefs_gui.c:988
 msgid "Sync address"
 msgstr "�P�B�a�}"
 
-#. Show sync todo check box
-#: ../prefs_gui.c:715
+#. Sync todo check box
+#: ../prefs_gui.c:992
 msgid "Sync todo"
 msgstr "�P�B�ݿ�ƶ�"
 
-#. Show sync memo check box
-#: ../prefs_gui.c:719
+#. Sync memo check box
+#: ../prefs_gui.c:996
 msgid "Sync memo"
 msgstr "�P�B�Ƨѿ�"
 
-#. Show sync Memo32 check box
-#: ../prefs_gui.c:723
-msgid "Sync memo32 (pedit32)"
-msgstr "�P�B memo32 (pedit32)"
-
-#. Show sync Ma~nana check box
-#: ../prefs_gui.c:728
+#. Show sync Manana check box
+#: ../prefs_gui.c:1001
 msgid "Sync Manana"
 msgstr "�P�B Manana"
 
 #. Show use Japanese Kana extention check box
-#: ../prefs_gui.c:734
+#: ../prefs_gui.c:1007
 msgid "Use J-OS (Not Japanese PalmOS:WorkPad/CLIE)"
 msgstr "�ϥ� J-OS (�D��� PalmOS: WorkPad/CLIE)"
 
-#. Make a checkbox for each plugin
-#: ../prefs_gui.c:747
+#. Make a Sync checkbox for each plugin
+#: ../prefs_gui.c:1020
 #, c-format
 msgid "Sync %s (%s)"
 msgstr "�P�B %s (%s)"
 
-#: ../print_gui.c:178
+#: ../print_gui.c:183
 msgid "Print Options"
 msgstr "�C�L�ﶵ"
 
-#: ../print_gui.c:192
+#: ../print_gui.c:196
 msgid "Paper Size"
 msgstr "�ȱi�j�p"
 
-#: ../print_gui.c:209
+#: ../print_gui.c:212
 msgid "Daily Printout"
 msgstr "�C�����"
 
-#: ../print_gui.c:215
+#: ../print_gui.c:218
 msgid "Weekly Printout"
 msgstr "�C�g����"
 
-#: ../print_gui.c:221
+#: ../print_gui.c:224
 msgid "Monthly Printout"
 msgstr "�C�����"
 
-#: ../print_gui.c:261
-msgid "One record"
-msgstr "�@������"
+#: ../print_gui.c:264
+#, fuzzy
+msgid "Selected record"
+msgstr "�R���F�@�� %s ����."
 
-#: ../print_gui.c:265
+#: ../print_gui.c:268
 msgid "All records in this category"
 msgstr "�����O����������"
 
-#: ../print_gui.c:269
+#: ../print_gui.c:272
 msgid "Print all records"
 msgstr "�C�L��������"
 
-#: ../print_gui.c:292
+#: ../print_gui.c:294
 msgid "One record per page"
 msgstr "�C���C�L�@������"
 
-#: ../print_gui.c:308
-msgid " Blank lines between each record"
+#: ../print_gui.c:310
+#, fuzzy
+msgid "Blank lines between each record"
 msgstr " �C�����������[�Ŧ�"
 
 #. Print Command
-#: ../print_gui.c:318
+#: ../print_gui.c:319
 msgid "Print Command (e.g. lpr, or cat > file.ps)"
 msgstr "�C�L�R�O (�Ҧp lpr, �� cat > file.ps)"
 
-#: ../restore_gui.c:68 ../restore_gui.c:229
+#: ../restore_gui.c:69 ../restore_gui.c:227
 msgid "Restore Handheld"
 msgstr "�_��PDA"
 
+#: ../restore_gui.c:174 ../restore_gui.c:176
+msgid "Unable to convert filename for GTK display\n"
+msgstr ""
+
+#: ../restore_gui.c:175
+msgid "See console log to find which file will not be restored\n"
+msgstr ""
+
+#: ../restore_gui.c:177
+#, fuzzy, c-format
+msgid "File %s will not be restored\n"
+msgstr "�N�w�˪��ɮ�"
+
 #. Label for instructions
-#: ../restore_gui.c:249
+#: ../restore_gui.c:244
 msgid "To restore your handheld:"
 msgstr "�p��_��z��PDA:"
 
-#: ../restore_gui.c:252
-msgid ""
-"1. Choose all the applications you wish to restore.  The default is all."
+#: ../restore_gui.c:247
+#, fuzzy
+msgid "1. Choose the applications you wish to restore.  The default is all."
 msgstr "1. ��ܩҦ��z�n�_�쪺���ε{��.  �w�]�O����."
 
-#: ../restore_gui.c:255
+#: ../restore_gui.c:250
 msgid "2. Enter the User Name and User ID."
 msgstr "2. ��J�ϥΪ̦W�٩M�ϥΪ� ID."
 
-#: ../restore_gui.c:258
+#: ../restore_gui.c:253
 msgid "3. Press the OK button."
 msgstr "3. �I�����T�w�����s."
 
-#: ../restore_gui.c:261
+#: ../restore_gui.c:256
 msgid "This will overwrite data that is currently on the handheld."
 msgstr "�����ާ@�|�мg�ثe�bPDA�W���Ҧ����."
 
-#: ../restore_gui.c:282
-msgid "User Name"
-msgstr "�ϥΪ̦W��"
-
-#: ../search_gui.c:120
+#: ../search_gui.c:142
 msgid "datebook"
 msgstr "��ƾ�"
 
-#: ../search_gui.c:201
+#: ../search_gui.c:144
+msgid "calendar"
+msgstr ""
+
+#: ../search_gui.c:231
 msgid "address"
 msgstr "�a�}ï"
 
-#: ../search_gui.c:267
+#: ../search_gui.c:233
+msgid "contact"
+msgstr ""
+
+#: ../search_gui.c:302
 msgid "todo"
 msgstr "�ݿ�ƶ�"
 
-#: ../search_gui.c:321
+#: ../search_gui.c:359
 msgid "memo"
 msgstr "�Ƨѿ�"
 
-#: ../search_gui.c:377
+#: ../search_gui.c:361
+#, fuzzy
+msgid "memos"
+msgstr "�Ƨѿ�"
+
+#: ../search_gui.c:419
 msgid "plugin ?"
 msgstr "�~���{�� ?"
 
-#: ../search_gui.c:449
+#: ../search_gui.c:499
 msgid "No records found"
 msgstr "�䤣�����"
 
-#: ../search_gui.c:547 ../search_gui.c:610
+#: ../search_gui.c:598
 msgid "Search"
 msgstr "�j�M"
 
-#: ../search_gui.c:563
+#. Search label
+#: ../search_gui.c:615
 msgid "Search for: "
 msgstr "�j�M: "
 
-#: ../search_gui.c:570
+#. Case Sensitive checkbox
+#: ../search_gui.c:624
 msgid "Case Sensitive"
 msgstr "�Ϥ��j�p�g"
 
-#: ../sync.c:139
+#: ../sync.c:118
 msgid "open lock file failed\n"
 msgstr "��w�ɮץ���.\n"
 
-#: ../sync.c:152
+#: ../sync.c:131
 msgid "lock failed\n"
 msgstr "����.\n"
 
-#: ../sync.c:155
+#: ../sync.c:136
 #, c-format
 msgid "sync file is locked by pid %d\n"
 msgstr "�P�B�ɮפw�g�� pid %d ��w\n"
 
-#: ../sync.c:189
+#: ../sync.c:175
 msgid "unlock failed\n"
 msgstr "�Ѱ���w����\n"
 
-#: ../sync.c:192
+#: ../sync.c:180
 #, c-format
 msgid "sync is locked by pid %d\n"
 msgstr "�P�B�w�g�� pid %d ��w\n"
 
-#: ../sync.c:244
-#, c-format
-msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
-msgstr "%s: ���U�P�B�y�W�� Hotsync ���s�άO����R�O \"kill %d\"\n"
-
-#: ../sync.c:297
-#, c-format
-msgid "Exiting with status %s\n"
-msgstr "���}��, ���A %s\n"
-
-#: ../sync.c:298
-msgid "Finished\n"
-msgstr "����\n"
-
-#: ../sync.c:432
-msgid "Finished installing user information.\n"
-msgstr ""
-
-#: ../sync.c:457 ../sync.c:575
-msgid "Check your serial port and settings\n"
+#: ../sync.c:418
+#, fuzzy
+msgid "Check your sync port and settings\n"
 msgstr "�ˬd�z���ǦC��M�]�w\n"
 
-#: ../sync.c:674
-#, c-format
-msgid " Syncing on device %s\n"
-msgstr " ���b�P�˸m %s �P�B\n"
-
-#: ../sync.c:675
-msgid " Press the HotSync button now\n"
-msgstr " �{�b�� HotSync ��\n"
+#: ../sync.c:677
+msgid "Unable to read home dir\n"
+msgstr "�L�kŪ���a�ؿ�\n"
 
-#: ../sync.c:727 ../sync.c:749 ../sync.c:771
+#: ../sync.c:1085 ../sync.c:1423
 #, c-format
-msgid "Last Synced Username-->\"%s\"\n"
-msgstr "�W���P�B���ϥΪ̦W��-->\"%s\"\n"
+msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
+msgstr "%s (�إߪ� ID '%s') �w�g�O�̷s���F, ���L�^��.\n"
 
-#: ../sync.c:728 ../sync.c:750 ../sync.c:772
+#: ../sync.c:1089 ../sync.c:1427
 #, c-format
-msgid "Last Synced UserID-->\"%d\"\n"
-msgstr "�W���P�B���ϥΪ� ID->\"%d\"\n"
+msgid "Fetching '%s' (Creator ID '%s')... "
+msgstr "���b�^�� '%s' (�إߪ� ID '%s')... "
 
-#: ../sync.c:729 ../sync.c:751 ../sync.c:773
+#: ../sync.c:1096 ../sync.c:1433
 #, c-format
-msgid " This Username-->\"%s\"\n"
-msgstr " ���ϥΪ̦W��-->\"%s\"\n"
+msgid "Failed, unable to create file %s\n"
+msgstr "�@�~����, �L�k�إ��ɮ� %s\n"
 
-#: ../sync.c:730 ../sync.c:752 ../sync.c:774
+#: ../sync.c:1100 ../sync.c:1438
 #, c-format
-msgid " This User ID-->%d\n"
-msgstr " ���ϥΪ� ID-->%d\n"
+msgid "Failed, unable to back up database %s\n"
+msgstr "�@�~����, �L�k�ƥ���Ʈw %s\n"
 
-#: ../sync.c:795
-#, c-format
-msgid "Username is \"%s\"\n"
-msgstr "�ϥΪ̦W�٬O \"%s\"\n"
+#: ../sync.c:1104 ../sync.c:1442 ../sync.c:1629
+msgid "OK\n"
+msgstr "�T�w\n"
 
-#: ../sync.c:796
+#: ../sync.c:1304
 #, c-format
-msgid "User ID is %d\n"
-msgstr "�ϥΪ� ID �O %d\n"
+msgid "Skipping %s (Creator ID '%s')\n"
+msgstr "���L %s (�إߪ� ID '%s')\n"
 
-#: ../sync.c:798 ../sync.c:804
+#: ../sync.c:1498
 #, c-format
-msgid "lastSyncPC = %d\n"
-msgstr "�W���P�B��PC = %d\n"
+msgid "Installing %s "
+msgstr "���b�w�� %s "
 
-#: ../sync.c:799
+#: ../sync.c:1504 ../sync.c:1540
 #, c-format
-msgid "This PC = %lu\n"
-msgstr "�o�� PC = %lu\n"
+msgid ""
+"\n"
+"Unable to open file: '%s': %s!\n"
+msgstr ""
+"\n"
+"�L�k�}�� '%s': %s!\n"
 
-#: ../sync.c:800
+#: ../sync.c:1508
 #, c-format
-msgid "Last Username = [%s]\n"
-msgstr "�W�@�ӨϥΪ̦W�� = [%s]\n"
+msgid ""
+"\n"
+"Unable to sync file: '%s': file corrupted?\n"
+msgstr ""
+"\n"
+"�L�k�P�B�ɮ�: '%s': �ɮ׷��l?\n"
+
+#: ../sync.c:1524
+#, fuzzy, c-format
+msgid "(Creator ID '%s')... "
+msgstr "(�إߪ� ID �O '%s')..."
+
+#: ../sync.c:1528
+#, fuzzy, c-format
+msgid "(Creator ID '%s') "
+msgstr "(�إߪ� ID �O '%s')..."
 
-#: ../sync.c:801
+#: ../sync.c:1530
 #, c-format
-msgid "Last UserID = %d\n"
-msgstr "�W�@�ӨϥΪ� ID = %d\n"
+msgid "(SDcard dir %s)... "
+msgstr ""
 
-#: ../sync.c:802
+#: ../sync.c:1562 ../sync.c:1575 ../sync.c:1590 ../sync.c:1603
 #, c-format
-msgid "Username = [%s]\n"
-msgstr "�ϥΪ̦W�� = [%s]\n"
+msgid ""
+"\n"
+"Unable to open file: %s\n"
+msgstr ""
+"\n"
+"�L�k�}���ɮ�: %s\n"
 
-#: ../sync.c:803
+#: ../sync.c:1615
 #, c-format
-msgid "userID = %d\n"
-msgstr "�ϥΪ� ID = %d\n"
+msgid "Install %s failed"
+msgstr "�w�� %s ����"
 
-#: ../sync.c:821
-msgid "Sync canceled\n"
-msgstr "�P�B�w����\n"
+#: ../sync.c:1619
+msgid "Failed.\n"
+msgstr "����.\n"
 
-#: ../sync.c:843
-msgid "Finished restoring handheld.\n"
-msgstr "�_��PDA����.\n"
+#: ../sync.c:1625
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "�w�w�� %s "
+
+#: ../sync.c:1736
+#, c-format
+msgid "%s:%d Error getting app info %s\n"
+msgstr "%s:%d ���o���ε{����� %s ���~\n"
 
-#: ../sync.c:844
-msgid "You may need to sync to update J-Pilot.\n"
-msgstr "�z�i��ݭn\"�P�B\"�H��s J-Pilot.\n"
+#: ../sync.c:1742 ../sync.c:1772
+#, c-format
+msgid "%s:%d Error unpacking app info %s\n"
+msgstr "%s:%d �����Y���ε{����� %s ���~\n"
 
-#: ../sync.c:874
-msgid "Doing a fast sync.\n"
-msgstr "���b�i��ֳt�P�B.\n"
+#: ../sync.c:1763
+#, c-format
+msgid "Error reading appinfo block for %s\n"
+msgstr "Ū�����ε{����ư϶� %s ���~\n"
 
-#: ../sync.c:913
-msgid "Doing a slow sync.\n"
-msgstr "���b�i��C�t�P�B.\n"
+#. Fix - need a func for this logging
+#: ../sync.c:2001 ../sync.c:2005
+#, c-format
+msgid "Could not add category %s to remote.\n"
+msgstr "�L�k�[�J���O %s �컷��.\n"
 
-#: ../sync.c:1014
-msgid "Thank you for using J-Pilot."
-msgstr "�P�±z�ϥ� J-Pilot."
+#: ../sync.c:2002 ../sync.c:2008
+#, c-format
+msgid "Too many categories on remote.\n"
+msgstr "���ݦ��Ӧh���O.\n"
 
-#: ../sync.c:1056
-msgid "Finished.\n"
-msgstr "����.\n"
+#: ../sync.c:2003 ../sync.c:2011
+#, c-format
+msgid "All records on desktop in %s will be moved to %s.\n"
+msgstr "�����bJ-Pilot %s ���������N���� %s.\n"
 
-#: ../sync.c:1092 ../sync.c:2611
+#: ../sync.c:2106 ../sync.c:2824
 #, c-format
 msgid "Syncing %s\n"
 msgstr "���b�P�B %s\n"
 
-#: ../sync.c:1098 ../sync.c:2275 ../sync.c:2617
+#: ../sync.c:2114 ../sync.c:2467 ../sync.c:2832
 #, c-format
 msgid "Wrote an %s record."
 msgstr "�g�F�@�� %s ����."
 
-#: ../sync.c:1100 ../sync.c:2277 ../sync.c:2619
+#: ../sync.c:2116 ../sync.c:2469 ../sync.c:2834
 #, c-format
 msgid "Writing an %s record failed."
 msgstr "�g�J�@�� %s ��������."
 
-#: ../sync.c:1102 ../sync.c:2279 ../sync.c:2621
+#: ../sync.c:2118 ../sync.c:2471 ../sync.c:2836
 #, c-format
 msgid "Deleting an %s record failed."
 msgstr "�R���@�� %s ��������."
 
-#: ../sync.c:1104 ../sync.c:2281 ../sync.c:2623
+#: ../sync.c:2120 ../sync.c:2473 ../sync.c:2838
 #, c-format
 msgid "Deleted an %s record."
 msgstr "�R���F�@�� %s ����."
 
-#: ../sync.c:1107 ../sync.c:2284 ../sync.c:2626
+#: ../sync.c:2122 ../sync.c:2475
+#, fuzzy, c-format
+msgid "Sync Conflict: duplicated an %s record."
+msgstr "�R���F�@�� %s ����."
+
+#: ../sync.c:2125 ../sync.c:2478 ../sync.c:2841
 #, c-format
 msgid "Wrote a %s record."
 msgstr "�g�F�@�� %s ����."
 
-#: ../sync.c:1109 ../sync.c:2286 ../sync.c:2628
+#: ../sync.c:2127 ../sync.c:2480 ../sync.c:2843
 #, c-format
 msgid "Writing a %s record failed."
 msgstr "�g�J�@�� %s ��������."
 
-#: ../sync.c:1111 ../sync.c:2288 ../sync.c:2630
+#: ../sync.c:2129 ../sync.c:2482 ../sync.c:2845
 #, c-format
 msgid "Deleting a %s record failed."
 msgstr "�R���@�� %s ��������."
 
-#: ../sync.c:1113 ../sync.c:2290 ../sync.c:2632
+#: ../sync.c:2131 ../sync.c:2484 ../sync.c:2847
 #, c-format
 msgid "Deleted a %s record."
 msgstr "�R���F�@�� %s ����."
 
-#: ../sync.c:1133
+#: ../sync.c:2133 ../sync.c:2486
 #, c-format
-msgid "number of records = %d\n"
-msgstr "�����ƥ� = %d\n"
+msgid "Sync Conflict: duplicated a %s record."
+msgstr ""
+
+#: ../sync.c:2237 ../sync.c:2567
+#, c-format
+msgid "Sync Conflict: a %s record must be manually merged\n"
+msgstr ""
 
-#: ../sync.c:1260 ../sync.c:2435
+#: ../sync.c:2368 ../sync.c:2708
 msgid ""
 "dlp_DeleteRecord failed\n"
 "This could be because the record was already deleted on the Palm\n"
@@ -2226,785 +2846,836 @@ msgstr ""
 "dlp_DeleteRecord ����\n"
 "�i��O�]���o�������w�g�b Palm �W�R���F\n"
 
-#: ../sync.c:1358 ../sync.c:1770
-#, c-format
-msgid "%s (Creator ID '%s') is up to date, fetch skipped.\n"
-msgstr "%s (�إߪ� ID '%s') �w�g�O�̷s���F, ���L�^��.\n"
+#: ../sync.c:2937
+msgid "Finished installing user information.\n"
+msgstr ""
 
-#: ../sync.c:1362 ../sync.c:1774
+#: ../sync.c:3094
 #, c-format
-msgid "Fetching '%s' (Creator ID '%s')... "
-msgstr "���b�^�� '%s' (�إߪ� ID '%s')... "
+msgid " Syncing on device %s\n"
+msgstr " ���b�P�˸m %s �P�B\n"
 
-#: ../sync.c:1369 ../sync.c:1780
-#, c-format
-msgid "Failed, unable to create file %s\n"
-msgstr "�@�~����, �L�k�إ��ɮ� %s\n"
+#: ../sync.c:3095
+msgid " Press the HotSync button now\n"
+msgstr " �{�b�� HotSync ��\n"
 
-#: ../sync.c:1380 ../sync.c:1789
+#: ../sync.c:3137 ../sync.c:3159 ../sync.c:3180
 #, c-format
-msgid "Failed, unable to back up database %s\n"
-msgstr "�@�~����, �L�k�ƥ���Ʈw %s\n"
-
-#: ../sync.c:1384 ../sync.c:1793 ../sync.c:1975
-msgid "OK\n"
-msgstr "�T�w\n"
+msgid "Last Synced Username-->\"%s\"\n"
+msgstr "�W���P�B���ϥΪ̦W��-->\"%s\"\n"
 
-#: ../sync.c:1687
+#: ../sync.c:3138 ../sync.c:3160 ../sync.c:3181
 #, c-format
-msgid "Skipping %s (Creator ID '%s')\n"
-msgstr "���L %s (�إߪ� ID '%s')\n"
+msgid "Last Synced UserID-->\"%d\"\n"
+msgstr "�W���P�B���ϥΪ� ID->\"%d\"\n"
 
-#: ../sync.c:1861
+#: ../sync.c:3139 ../sync.c:3161 ../sync.c:3182
 #, c-format
-msgid "Installing %s "
-msgstr "���b�w�� %s "
+msgid " This Username-->\"%s\"\n"
+msgstr " ���ϥΪ̦W��-->\"%s\"\n"
 
-#: ../sync.c:1867
+#: ../sync.c:3140 ../sync.c:3162 ../sync.c:3183
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: '%s': %s!\n"
-msgstr ""
-"\n"
-"�L�k�}�� '%s': %s!\n"
+msgid " This User ID-->%d\n"
+msgstr " ���ϥΪ� ID-->%d\n"
 
-#: ../sync.c:1871
+#: ../sync.c:3204
 #, c-format
-msgid ""
-"\n"
-"Unable to sync file: '%s': file corrupted?\n"
-msgstr ""
-"\n"
-"�L�k�P�B�ɮ�: '%s': �ɮ׷��l?\n"
+msgid "Username is \"%s\"\n"
+msgstr "�ϥΪ̦W�٬O \"%s\"\n"
 
-#: ../sync.c:1883
+#: ../sync.c:3205
 #, c-format
-msgid "(Creator ID is '%s')..."
-msgstr "(�إߪ� ID �O '%s')..."
+msgid "User ID is %d\n"
+msgstr "�ϥΪ� ID �O %d\n"
 
-#: ../sync.c:1903 ../sync.c:1916 ../sync.c:1931 ../sync.c:1944
+#: ../sync.c:3207
 #, c-format
-msgid ""
-"\n"
-"Unable to open file: %s\n"
-msgstr ""
-"\n"
-"�L�k�}���ɮ�: %s\n"
+msgid "lastSyncPC = %d\n"
+msgstr "�W���P�B��PC = %d\n"
 
-#: ../sync.c:1960
+#: ../sync.c:3208
 #, c-format
-msgid "Install %s failed"
-msgstr "�w�� %s ����"
-
-#: ../sync.c:1964
-msgid "Failed.\n"
-msgstr "����.\n"
+msgid "This PC = %lu\n"
+msgstr "�o�� PC = %lu\n"
 
-#. the space after the %s is a hack, the last char gets cut off
-#: ../sync.c:1971
-#, c-format
-msgid "Installed %s "
-msgstr "�w�w�� %s "
+#: ../sync.c:3232
+msgid "Sync canceled\n"
+msgstr "�P�B�w����\n"
 
-#: ../sync.c:1995 ../sync.c:2001
-#, c-format
-msgid "Unable to open file: %s%s\n"
-msgstr "�L�k�}���ɮ� %s%s\n"
+#: ../sync.c:3255
+msgid "Finished restoring handheld.\n"
+msgstr "�_��PDA����.\n"
 
-#: ../sync.c:2180
-msgid "Unable to read home dir\n"
-msgstr "�L�kŪ���a�ؿ�\n"
+#: ../sync.c:3256
+msgid "You may need to sync to update J-Pilot.\n"
+msgstr "�z�i��ݭn\"�P�B\"�H��s J-Pilot.\n"
 
-#: ../sync.c:2709
-#, c-format
-msgid "palm: number of records = %d\n"
-msgstr "Palm: �����ƥ� = %d\n"
+#: ../sync.c:3278
+msgid "Doing a fast sync.\n"
+msgstr "���b�i��ֳt�P�B.\n"
 
-#: ../sync.c:2710
-#, c-format
-msgid "disk: number of records = %d\n"
-msgstr "�w��: �����ƥ� = %d\n"
+#: ../sync.c:3291
+msgid "Doing a slow sync.\n"
+msgstr "���b�i��C�t�P�B.\n"
 
-#: ../sync.c:2888
-#, c-format
-msgid "%s:%d Error getting app info %s\n"
-msgstr "%s:%d ���o���ε{����� %s ���~\n"
+#: ../sync.c:3366
+msgid "Thank you for using J-Pilot."
+msgstr "�P�±z�ϥ� J-Pilot."
 
-#: ../sync.c:2894 ../sync.c:2936
-#, c-format
-msgid "%s:%d Error unpacking app info %s\n"
-msgstr "%s:%d �����Y���ε{����� %s ���~\n"
+#: ../sync.c:3411 ../sync.c:3479
+msgid "Finished.\n"
+msgstr "����.\n"
 
-#: ../sync.c:2916 ../sync.c:2928
+#: ../sync.c:3446
 #, c-format
-msgid "Error reading appinfo block for %s\n"
-msgstr "Ū�����ε{����ư϶� %s ���~\n"
+msgid "%s: sync process already in progress (process ID = %d)\n"
+msgstr ""
 
-#. Fix - need a func for this logging
-#: ../sync.c:3072 ../sync.c:3076
+#: ../sync.c:3447
 #, c-format
-msgid "Could not add category %s to remote.\n"
-msgstr "�L�k�[�J���O %s �컷��.\n"
-
-#: ../sync.c:3073 ../sync.c:3079
-msgid "Too many categories on remote.\n"
-msgstr "���ݦ��Ӧh���O.\n"
+msgid ""
+"%s: press the HotSync button on the cradle\n"
+"         or stop the sync by using the cancel sync button\n"
+"         or stop the sync by typing \"kill %d\" at the command line\n"
+msgstr ""
 
-#: ../sync.c:3074 ../sync.c:3082
+#: ../sync.c:3478
 #, c-format
-msgid "All records on desktop in %s will be moved to %s.\n"
-msgstr "�����bJ-Pilot %s ���������N���� %s.\n"
+msgid "Exiting with status %s\n"
+msgstr "���}��, ���A %s\n"
 
-#: ../todo.c:248
+#: ../todo.c:264
 #, c-format
 msgid "ToDo description text > %d, truncating to %d\n"
 msgstr "�ݿ�ƶ����y�z�j�� %d, �I�_�� %d\n"
 
-#: ../todo.c:255
+#: ../todo.c:270
 #, c-format
 msgid "ToDo note text > %d, truncating to %d\n"
 msgstr "�ݿ�ƶ��������j�� %d, �I�_�� %d\n"
 
-#: ../todo.c:380
-#, c-format
-msgid "%s:%d Error reading category info %s\n"
-msgstr "%s: %d Ū�J���O��T %s ���~\n"
-
-#: ../todo_gui.c:149
+#: ../todo_gui.c:159
 msgid "Due Date"
 msgstr "�����"
 
-#: ../todo_gui.c:535
+#: ../todo_gui.c:532
 msgid "File doesn't appear to be todo.dat format\n"
 msgstr "�ɮצ��G���O todo.dat �榡\n"
 
-#: ../todo_gui.c:691 ../todo_gui.c:706
+#: ../todo_gui.c:596
+msgid "DAT/TDA (Palm Archive Formats)"
+msgstr ""
+
+#: ../todo_gui.c:688
+#, c-format
+msgid ""
+"ToDo exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:726
 #, c-format
 msgid "Can't export todo %d\n"
 msgstr "�L�k�ץX�ݿ�ƶ� %d\n"
 
-#: ../todo_gui.c:1547
+#: ../todo_gui.c:766
+#, fuzzy, c-format
+msgid "Due Date: None\n"
+msgstr "�����"
+
+#: ../todo_gui.c:769
+#, fuzzy, c-format
+msgid "Due Date: %s\n"
+msgstr "�����"
+
+#: ../todo_gui.c:771
+#, fuzzy, c-format
+msgid "Priority: %d\n"
+msgstr "�u����: "
+
+#: ../todo_gui.c:772
+#, fuzzy, c-format
+msgid "Completed: %s\n"
+msgstr "�w����"
+
+#: ../todo_gui.c:774
+#, c-format
+msgid "Description: %s\n"
+msgstr ""
+
+#: ../todo_gui.c:777
+#, c-format
+msgid ""
+"Note: %s\n"
+"\n"
+msgstr ""
+
+#: ../todo_gui.c:1610
 msgid "Priority out of range\n"
 msgstr "�u���ȶW�L�e�\�d��\n"
 
-#: ../todo_gui.c:1774 ../KeyRing/keyring.c:1077
+#: ../todo_gui.c:1929 ../KeyRing/keyring.c:1308
 #, c-format
 msgid "No date"
 msgstr "�L����"
 
-#. The completed check box
-#: ../todo_gui.c:2206
+#. Completed checkbox
+#: ../todo_gui.c:2411
 msgid "Completed"
 msgstr "�w����"
 
-#: ../todo_gui.c:2214
-msgid "Priority: "
+#: ../todo_gui.c:2418
+#, fuzzy
+msgid "Priority:"
 msgstr "�u����: "
 
-#: ../todo_gui.c:2234
+#: ../todo_gui.c:2420
+msgid "Set priority   Alt+#"
+msgstr ""
+
+#: ../todo_gui.c:2441
 msgid "Date Due:"
 msgstr "�����:"
 
-#. Note textbox
-#: ../todo_gui.c:2296 ../Expense/expense.c:1853 ../KeyRing/keyring.c:2237
-msgid "Note"
-msgstr "����"
+#: ../utils.c:330
+msgid "Today"
+msgstr "����"
 
-#: ../utils.c:72
-msgid " -v displays version and compile options and exits.\n"
-msgstr " -v ��ܪ����H�νsĶ�ﶵ����X.\n"
+#: ../utils.c:575
+#, c-format
+msgid "Couldn't find empty DB file %s: %s\n"
+msgstr "�䤣��Ū� DB �ɮ�%s: %s\n"
 
-#: ../utils.c:74
-msgid " -d displays debug info to stdout.\n"
-msgstr " -d �N������T�ɦܼзǿ�X.\n"
+#: ../utils.c:578
+msgid " may not be installed.\n"
+msgstr " �i�ॼ�w�˥��T.\n"
 
-#: ../utils.c:75
-#, fuzzy
-msgid " -p skips loading plugins.\n"
+#. Can't create directory
+#: ../utils.c:613 ../utils.c:617
+#, c-format
+msgid "Can't create directory %s\n"
+msgstr "�L�k�s�W�ؿ� %s\n"
+
+#: ../utils.c:623
+#, fuzzy, c-format
+msgid "%s is not a directory\n"
+msgstr "%s �O�ؿ�"
+
+#: ../utils.c:628
+#, fuzzy, c-format
+msgid "Unable to get write permission for directory %s\n"
+msgstr "�ڵL�k�g�J�ɮצܥؿ� %s\n"
+
+#: ../utils.c:1328 ../utils.c:1352
+msgid "Save Changed Record?"
+msgstr "�x�s�����ק�?"
+
+#: ../utils.c:1329 ../utils.c:1353
+msgid "Do you want to save the changes to this record?"
+msgstr "�z�n�x�s��󦹵��������ק��?"
+
+#: ../utils.c:1334 ../utils.c:1358
+msgid "Save New Record?"
+msgstr "�x�s�s����?"
+
+#: ../utils.c:1335 ../utils.c:1359
+msgid "Do you want to save this new record?"
+msgstr "�z�n�x�s�����s�W��������?"
+
+#: ../utils.c:1650
+msgid "infinite loop, breaking\n"
+msgstr "�L���j��, �Ȱ�\n"
+
+#: ../utils.c:1874
+#, fuzzy, c-format
+msgid " -p skip loading plugins\n"
 msgstr "�����J�~���{��.\n"
 
-#: ../utils.c:76
-#, fuzzy
-msgid " -a ignores missed alarms since the last time program was run.\n"
+#: ../utils.c:1875
+#, fuzzy, c-format
+msgid " -a ignore missed alarms since the last time program was run\n"
 msgstr " -a �����W��J-Pilot�����{�b���w���L�x�a.\n"
 
-#: ../utils.c:77
-#, fuzzy
-msgid " -A ignores all alarms past and future.\n"
+#: ../utils.c:1876
+#, fuzzy, c-format
+msgid " -A ignore all alarms past and future\n"
 msgstr " -A �����Ҧ��x�a�]�w)); �]�A�L�h�H�Υ���.\n"
 
-#: ../utils.c:78
-#, fuzzy
-msgid " -i makes program iconify itself upon launch.\n"
-msgstr " -i J-Pilot�Ұʮɳ̤p��\n"
+#: ../utils.c:1877
+#, c-format
+msgid " -s start sync using existing instance of GUI\n"
+msgstr ""
+
+#: ../utils.c:1878
+#, c-format
+msgid " -i iconify program immediately after launch\n"
+msgstr ""
+
+#: ../utils.c:1879
+#, c-format
+msgid ""
+" -geometry {X geometry} use specified geometry for main window\n"
+"\n"
+msgstr ""
 
-#: ../utils.c:79
-msgid " The PILOTPORT, and PILOTRATE env variables are used to specify\n"
+#: ../utils.c:1880
+#, fuzzy, c-format
+msgid " The PILOTPORT and PILOTRATE environment variables specify\n"
 msgstr " PILOTPORT, �H�� PILOTRATE �����ܼƤw�g�]�w\n"
 
-#: ../utils.c:80
+#: ../utils.c:1881
+#, c-format
 msgid " which port to sync on, and at what speed.\n"
 msgstr " �ϥΨ��Ӱ�P�B, �H�ΨϥΦh�֪��t�v.\n"
 
-#: ../utils.c:81
+#: ../utils.c:1882
+#, c-format
 msgid " If PILOTPORT is not set then it defaults to /dev/pilot.\n"
 msgstr " �p�G PILOTPORT ���]�w, �h�ϥιw�]�� /dev/pilot.\n"
 
-#: ../utils.c:107
+#: ../utils.c:1921
+msgid "Error reading file"
+msgstr "Ū�J�ɮ׿��~"
+
+#: ../utils.c:1973
 msgid "Date compiled"
 msgstr "�sĶ���"
 
-#: ../utils.c:108
+#: ../utils.c:1974
 msgid "Compiled with these options:"
 msgstr "�ϥΥH�U�ﶵ�sĶ:"
 
-#: ../utils.c:110
+#: ../utils.c:1976
 msgid "Installed Path"
 msgstr "�w�˸��|"
 
-#: ../utils.c:112
+#: ../utils.c:1978
 msgid "pilot-link version"
 msgstr "pilot-link ����"
 
-#: ../utils.c:116
+#: ../utils.c:1982
 msgid "USB support"
 msgstr "USB �䴩"
 
-#: ../utils.c:118 ../utils.c:124 ../utils.c:130 ../utils.c:136 ../utils.c:142
-#: ../utils.c:148 ../utils.c:154
+#: ../utils.c:1983 ../utils.c:1986 ../utils.c:1992 ../utils.c:1998
+#: ../utils.c:2004 ../utils.c:2010 ../utils.c:2015
 msgid "yes"
 msgstr "�O"
 
-#: ../utils.c:120 ../utils.c:126 ../utils.c:132 ../utils.c:138 ../utils.c:144
-#: ../utils.c:150 ../utils.c:156
-msgid "no"
-msgstr "�_"
-
-#: ../utils.c:122
+#: ../utils.c:1984
 msgid "Private record support"
 msgstr "�p�H�����䴩"
 
-#: ../utils.c:128
+#: ../utils.c:1988 ../utils.c:1994 ../utils.c:2000 ../utils.c:2006
+#: ../utils.c:2012
+msgid "no"
+msgstr "�_"
+
+#: ../utils.c:1990
 msgid "Datebk support"
 msgstr "Datebk �䴩"
 
-#: ../utils.c:134
+#: ../utils.c:1996
 msgid "Plugin support"
 msgstr "�~���{���䴩"
 
-#: ../utils.c:140
-msgid "Manana support"
-msgstr "Manana �䴩"
-
-#: ../utils.c:146
-msgid "NLS support (foreign languages)"
-msgstr "NLS �䴩 (���a�y���䴩)"
-
-#: ../utils.c:152
-msgid "GTK2 support"
-msgstr "GTK2 �䴩"
-
-#: ../utils.c:207
-#, c-format
-msgid "Today is %A, %x %X"
-msgstr "���ѬO %A, %x %X"
-
-#: ../utils.c:209
-#, c-format
-msgid "Today is %%A, %s %s"
-msgstr "���ѬO %%A, %s %s"
-
-#: ../utils.c:1114
-msgid "Today"
-msgstr "����"
-
-#: ../utils.c:1330
-msgid "Save Changed Record?"
-msgstr "�x�s�����ק�?"
-
-#: ../utils.c:1331
-msgid "Do you want to save the changes to this record?"
-msgstr "�z�n�x�s��󦹵��������ק��?"
+#: ../utils.c:2002
+msgid "Manana support"
+msgstr "Manana �䴩"
 
-#: ../utils.c:1336
-msgid "Save New Record?"
-msgstr "�x�s�s����?"
+#: ../utils.c:2008
+msgid "NLS support (foreign languages)"
+msgstr "NLS �䴩 (���a�y���䴩)"
 
-#: ../utils.c:1337
-msgid "Do you want to save this new record?"
-msgstr "�z�n�x�s�����s�W��������?"
+#: ../utils.c:2014
+msgid "GTK2 support"
+msgstr "GTK2 �䴩"
 
-#. Not home;
-#: ../utils.c:1357 ../KeyRing/keyring.c:1631
+#. No HOME var
+#: ../utils.c:2057
+#, c-format
 msgid "Can't get HOME environment variable\n"
 msgstr "�L�k���o HOME �����ܼ�\n"
 
-#: ../utils.c:1364
-msgid "Your HOME environment variable is too long for me\n"
+#: ../utils.c:2064
+#, fuzzy, c-format
+msgid "HOME environment variable is too long to process\n"
 msgstr "�z�� HOME �����ܼƹ� J-Pilot �ӻ��Ӫ�\n"
 
-#. Can't create directory
-#: ../utils.c:1389 ../utils.c:1393
-#, c-format
-msgid "Can't create directory %s\n"
-msgstr "�L�k�s�W�ؿ� %s\n"
-
-#: ../utils.c:1399
-#, c-format
-msgid ""
-"%s doesn't appear to be a directory.\n"
-"I need it to be.\n"
-msgstr ""
-"%s ���G���O�ؿ�.\n"
-"�ڭn�D���O�ӥؿ�.\n"
-
-#: ../utils.c:1405
-#, c-format
-msgid "I can't write files in directory %s\n"
-msgstr "�ڵL�k�g�J�ɮצܥؿ� %s\n"
+#: ../utils.c:2567
+#, fuzzy
+msgid "Edit Categories..."
+msgstr "�s�����O"
 
-#: ../utils.c:1461 ../utils.c:1470
-msgid "Error writing PC header to file: next_id\n"
-msgstr "�g�J PC ���Y���ɮ�: next_id\n"
+#: ../utils.c:3233
+msgid "PC ID is 0.\n"
+msgstr "PC ID �O 0.\n"
 
-#: ../utils.c:1466
-msgid "Error writing next id to file: next_id\n"
-msgstr "�g�J�U�@�� id ���ɮ׿��~: next_id\n"
+#: ../utils.c:3234
+#, fuzzy, c-format
+msgid "Generated a new PC ID.  It is %lu\n"
+msgstr "�ڲ��ͤF�@�ӷs�� PC ID, ���O %lu\n"
 
-#: ../utils.c:1483
-msgid "Error opening file: next_id\n"
-msgstr "�}���ɮ׮ɵo�Ϳ��~: next_id\n"
+#: ../utils.c:3376
+msgid "Invalid UTF-8 encoding in export string\n"
+msgstr ""
 
-#: ../utils.c:1657
+#: ../utils.c:3537
 #, c-format
-msgid "Couldn't find empty DB file %s: %s\n"
-msgstr "�䤣��Ū� DB �ɮ�%s: %s\n"
+msgid "Today is %A, %x %X"
+msgstr "���ѬO %A, %x %X"
 
-#. EPN is jpilot, or copilot depending on configure
-#: ../utils.c:1660
-msgid " may not be installed.\n"
-msgstr " �i�ॼ�w�˥��T.\n"
+#: ../utils.c:3539
+#, c-format
+msgid "Today is %%A, %s %s"
+msgstr "���ѬO %%A, %s %s"
 
-#: ../utils.c:1839
-msgid "Error reading file"
-msgstr "Ū�J�ɮ׿��~"
+#: ../utils.c:3768
+#, c-format
+msgid ""
+"Incorrect header format for CSV import\n"
+"Check line 1 of file %s\n"
+"Aborting import\n"
+msgstr ""
 
-#: ../utils.c:2516
-msgid "PC ID is 0.\n"
-msgstr "PC ID �O 0.\n"
+#: ../utils.c:3805
+#, fuzzy, c-format
+msgid "Error writing version header to file: %s%s\n"
+msgstr "�g�J PC ���Y���ɮ�: next_id\n"
 
-#: ../utils.c:2517
-#, c-format
-msgid "I generated a new PC ID.  It is %lu\n"
-msgstr "�ڲ��ͤF�@�ӷs�� PC ID, ���O %lu\n"
+#: ../utils.c:3810
+#, fuzzy, c-format
+msgid "Error writing next id to file: %s%s"
+msgstr "�g�J�U�@�� id ���ɮ׿��~: next_id\n"
 
-#: ../weekview_gui.c:326
+#: ../weekview_gui.c:295
 msgid "Weekly View"
 msgstr "�C�g�˵�"
 
-#: ../Expense/expense.c:99
+#: ../weekview_gui.c:335
+msgid "Last week   Alt+LeftArrow"
+msgstr ""
+
+#: ../weekview_gui.c:364
+msgid "Next week   Alt+RightArrow"
+msgstr ""
+
+#: ../Expense/expense.c:95
 msgid "Australia"
 msgstr "�D�w"
 
-#: ../Expense/expense.c:100
+#: ../Expense/expense.c:96
 msgid "Austria"
 msgstr "���a�Q"
 
-#: ../Expense/expense.c:101
+#: ../Expense/expense.c:97
 msgid "Belgium"
 msgstr "��Q��"
 
-#: ../Expense/expense.c:102
+#: ../Expense/expense.c:98
 msgid "Brazil"
 msgstr "�ڦ�"
 
-#: ../Expense/expense.c:103
+#: ../Expense/expense.c:99
 msgid "Canada"
 msgstr "�[���j"
 
-#: ../Expense/expense.c:104
+#: ../Expense/expense.c:100
 msgid "Denmark"
 msgstr "����"
 
-#: ../Expense/expense.c:105
+#: ../Expense/expense.c:101
 msgid "EU (Euro)"
 msgstr "�ڷ� (Euro)"
 
-#: ../Expense/expense.c:106
+#: ../Expense/expense.c:102
 msgid "Finland"
 msgstr "����"
 
-#: ../Expense/expense.c:107
+#: ../Expense/expense.c:103
 msgid "France"
 msgstr "�k��"
 
-#: ../Expense/expense.c:108
+#: ../Expense/expense.c:104
 msgid "Germany"
 msgstr "�w��"
 
-#: ../Expense/expense.c:109
+#: ../Expense/expense.c:105
 msgid "Hong Kong"
 msgstr "����"
 
-#: ../Expense/expense.c:110
+#: ../Expense/expense.c:106
 msgid "Iceland"
 msgstr "�B�q"
 
-#: ../Expense/expense.c:111
+#: ../Expense/expense.c:107
 msgid "India"
 msgstr "�L��"
 
-#: ../Expense/expense.c:112
+#: ../Expense/expense.c:108
 msgid "Indonesia"
 msgstr "�L��"
 
-#: ../Expense/expense.c:113
+#: ../Expense/expense.c:109
 msgid "Ireland"
 msgstr "�R����"
 
-#: ../Expense/expense.c:114
+#: ../Expense/expense.c:110
 msgid "Italy"
 msgstr "�q�j�Q"
 
-#: ../Expense/expense.c:115
+#: ../Expense/expense.c:111
 msgid "Japan"
 msgstr "�饻"
 
-#: ../Expense/expense.c:116
+#: ../Expense/expense.c:112
 msgid "Korea"
 msgstr "����"
 
-#: ../Expense/expense.c:117
+#: ../Expense/expense.c:113
 msgid "Luxembourg"
 msgstr "�c�˳�"
 
-#: ../Expense/expense.c:118
+#: ../Expense/expense.c:114
 msgid "Malaysia"
 msgstr "���Ӧ��"
 
-#: ../Expense/expense.c:119
+#: ../Expense/expense.c:115
 msgid "Mexico"
 msgstr "�����"
 
-#: ../Expense/expense.c:120
+#: ../Expense/expense.c:116
 msgid "Netherlands"
 msgstr "���w�� (����)"
 
-#: ../Expense/expense.c:121
+#: ../Expense/expense.c:117
 msgid "New Zealand"
 msgstr "���"
 
-#: ../Expense/expense.c:122
+#: ../Expense/expense.c:118
 msgid "Norway"
 msgstr "����"
 
-#: ../Expense/expense.c:123
+#: ../Expense/expense.c:119
 msgid "P.R.C."
 msgstr "���ؤH���@�M��"
 
-#: ../Expense/expense.c:124
+#: ../Expense/expense.c:120
 msgid "Philippines"
 msgstr "��߻�"
 
-#: ../Expense/expense.c:125
+#: ../Expense/expense.c:121
 msgid "Singapore"
 msgstr "�s�[�Y"
 
-#: ../Expense/expense.c:126
+#: ../Expense/expense.c:122
 msgid "Spain"
 msgstr "��Z��"
 
-#: ../Expense/expense.c:127
+#: ../Expense/expense.c:123
 msgid "Sweden"
 msgstr "���"
 
-#: ../Expense/expense.c:128
+#: ../Expense/expense.c:124
 msgid "Switzerland"
 msgstr "��h"
 
-#: ../Expense/expense.c:129
+#: ../Expense/expense.c:125
 msgid "Taiwan"
 msgstr "�x�W"
 
-#: ../Expense/expense.c:130
+#: ../Expense/expense.c:126
 msgid "Thailand"
 msgstr "����"
 
-#: ../Expense/expense.c:131
+#: ../Expense/expense.c:127
 msgid "United Kingdom"
 msgstr "�^��"
 
-#: ../Expense/expense.c:132
+#: ../Expense/expense.c:128
 msgid "United States"
 msgstr "����"
 
-#: ../Expense/expense.c:489 ../Expense/expense.c:500
+#: ../Expense/expense.c:516 ../Expense/expense.c:527
 msgid "Expense"
 msgstr "�}��"
 
-#: ../Expense/expense.c:521 ../Expense/expense.c:1401
+#: ../Expense/expense.c:548 ../Expense/expense.c:1386
 msgid "Airfare"
 msgstr "������"
 
-#: ../Expense/expense.c:523 ../Expense/expense.c:1402
+#: ../Expense/expense.c:550 ../Expense/expense.c:1387
 msgid "Breakfast"
 msgstr "���\"
 
-#: ../Expense/expense.c:525 ../Expense/expense.c:1403
+#: ../Expense/expense.c:552 ../Expense/expense.c:1388
 msgid "Bus"
 msgstr "���@�T��"
 
-#: ../Expense/expense.c:527 ../Expense/expense.c:1404
+#: ../Expense/expense.c:554 ../Expense/expense.c:1389
 msgid "BusinessMeals"
 msgstr "�Ӱ��\�|"
 
-#: ../Expense/expense.c:529 ../Expense/expense.c:1405
+#: ../Expense/expense.c:556 ../Expense/expense.c:1390
 msgid "CarRental"
 msgstr "����"
 
-#: ../Expense/expense.c:531 ../Expense/expense.c:1406
+#: ../Expense/expense.c:558 ../Expense/expense.c:1391
 msgid "Dinner"
 msgstr "���\"
 
-#: ../Expense/expense.c:533 ../Expense/expense.c:1407
+#: ../Expense/expense.c:560 ../Expense/expense.c:1392
 msgid "Entertainment"
 msgstr "�T��"
 
-#: ../Expense/expense.c:535 ../Expense/expense.c:1408
+#: ../Expense/expense.c:562 ../Expense/expense.c:1393
 msgid "Fax"
 msgstr "�ǯu"
 
-#: ../Expense/expense.c:537 ../Expense/expense.c:1409
+#: ../Expense/expense.c:564 ../Expense/expense.c:1394
 msgid "Gas"
 msgstr "�T�o"
 
-#: ../Expense/expense.c:539 ../Expense/expense.c:1410
+#: ../Expense/expense.c:566 ../Expense/expense.c:1395
 msgid "Gifts"
 msgstr "§�~"
 
-#: ../Expense/expense.c:541 ../Expense/expense.c:1411
+#: ../Expense/expense.c:568 ../Expense/expense.c:1396
 msgid "Hotel"
 msgstr "����"
 
-#: ../Expense/expense.c:543 ../Expense/expense.c:1412
+#: ../Expense/expense.c:570 ../Expense/expense.c:1397
 msgid "Incidentals"
 msgstr "���O"
 
-#: ../Expense/expense.c:545 ../Expense/expense.c:1413
+#: ../Expense/expense.c:572 ../Expense/expense.c:1398
 msgid "Laundry"
 msgstr "�~��"
 
-#: ../Expense/expense.c:547 ../Expense/expense.c:1414
+#: ../Expense/expense.c:574 ../Expense/expense.c:1399
 msgid "Limo"
 msgstr "�����⨮"
 
-#: ../Expense/expense.c:549 ../Expense/expense.c:1415
+#: ../Expense/expense.c:576 ../Expense/expense.c:1400
 msgid "Lodging"
 msgstr "�H�J"
 
-#: ../Expense/expense.c:551 ../Expense/expense.c:1416
+#: ../Expense/expense.c:578 ../Expense/expense.c:1401
 msgid "Lunch"
 msgstr "���\"
 
-#: ../Expense/expense.c:553 ../Expense/expense.c:1417
+#: ../Expense/expense.c:580 ../Expense/expense.c:1402
 msgid "Mileage"
 msgstr "���{"
 
-#: ../Expense/expense.c:557 ../Expense/expense.c:1419
+#: ../Expense/expense.c:584 ../Expense/expense.c:1404
 msgid "Parking"
 msgstr "�����O"
 
-#: ../Expense/expense.c:559 ../Expense/expense.c:1420
+#: ../Expense/expense.c:586 ../Expense/expense.c:1405
 msgid "Postage"
 msgstr "�l�O"
 
-#: ../Expense/expense.c:561 ../Expense/expense.c:1421
+#: ../Expense/expense.c:588 ../Expense/expense.c:1406
 msgid "Snack"
 msgstr "�s�L"
 
-#: ../Expense/expense.c:563 ../Expense/expense.c:1422
+#: ../Expense/expense.c:590 ../Expense/expense.c:1407
 msgid "Subway"
 msgstr "�a�U�K"
 
-#: ../Expense/expense.c:565 ../Expense/expense.c:1423
+#: ../Expense/expense.c:592 ../Expense/expense.c:1408
 msgid "Supplies"
 msgstr "�ͬ��Ϋ~"
 
-#: ../Expense/expense.c:567 ../Expense/expense.c:1424
+#: ../Expense/expense.c:594 ../Expense/expense.c:1409
 msgid "Taxi"
 msgstr "�p�{��"
 
-#: ../Expense/expense.c:569 ../Expense/expense.c:1425
+#: ../Expense/expense.c:596 ../Expense/expense.c:1410
 msgid "Telephone"
 msgstr "�q�ܶO"
 
-#: ../Expense/expense.c:571 ../Expense/expense.c:1426
+#: ../Expense/expense.c:598 ../Expense/expense.c:1411
 msgid "Tips"
 msgstr "�p�O"
 
-#: ../Expense/expense.c:573 ../Expense/expense.c:1427
+#: ../Expense/expense.c:600 ../Expense/expense.c:1412
 msgid "Tolls"
 msgstr "�q��O"
 
-#: ../Expense/expense.c:575 ../Expense/expense.c:1428
+#: ../Expense/expense.c:602 ../Expense/expense.c:1413
 msgid "Train"
 msgstr "����"
 
-#: ../Expense/expense.c:589
-msgid "AmEx"
-msgstr "����B�q (AmEx)"
+#: ../Expense/expense.c:1237
+msgid "Expense: Unknown expense type\n"
+msgstr "�}��: �����}������\n"
+
+#: ../Expense/expense.c:1243
+msgid "Expense: Unknown payment type\n"
+msgstr "�}��: �����I�ڤ覡\n"
+
+#: ../Expense/expense.c:1375
+msgid "American Express"
+msgstr "����B�q (American Express)"
 
-#: ../Expense/expense.c:591 ../Expense/expense.c:1391
+#: ../Expense/expense.c:1376
 msgid "Cash"
 msgstr "�{��"
 
-#: ../Expense/expense.c:593 ../Expense/expense.c:1392
+#: ../Expense/expense.c:1377
 msgid "Check"
 msgstr "�䲼"
 
-#: ../Expense/expense.c:595
-msgid "CreditCard"
+#: ../Expense/expense.c:1378
+msgid "Credit Card"
 msgstr "�H�Υd"
 
-#: ../Expense/expense.c:597
-msgid "MasterCard"
+#: ../Expense/expense.c:1379
+msgid "Master Card"
 msgstr "�U�ƹF�d (MasterCard)"
 
-#: ../Expense/expense.c:599 ../Expense/expense.c:1395
+#: ../Expense/expense.c:1380
 msgid "Prepaid"
 msgstr "�w�I"
 
-#: ../Expense/expense.c:601 ../Expense/expense.c:1396
+#: ../Expense/expense.c:1381
 msgid "VISA"
 msgstr "VISA �d"
 
-#: ../Expense/expense.c:1201
-msgid "Expense: Unknown category\n"
-msgstr "�}��: �������O\n"
-
-#: ../Expense/expense.c:1207
-msgid "Expense: Unknown expense type\n"
-msgstr "�}��: �����}������\n"
-
-#: ../Expense/expense.c:1213
-msgid "Expense: Unknown payment type\n"
-msgstr "�}��: �����I�ڤ覡\n"
-
-#: ../Expense/expense.c:1390
-msgid "American Express"
-msgstr "����B�q (American Express)"
-
-#: ../Expense/expense.c:1393
-msgid "Credit Card"
-msgstr "�H�Υd"
+#: ../Expense/expense.c:1617
+#, fuzzy
+msgid "Type"
+msgstr "����:"
 
-#: ../Expense/expense.c:1394
-msgid "Master Card"
-msgstr "�U�ƹF�d (MasterCard)"
+#: ../Expense/expense.c:1618
+#, fuzzy
+msgid "Amount"
+msgstr "���B:"
 
 #. Category Menu
-#: ../Expense/expense.c:1678
+#: ../Expense/expense.c:1702
 msgid "Category:"
 msgstr "���O:"
 
 #. Type Menu
-#: ../Expense/expense.c:1691
+#: ../Expense/expense.c:1710
 msgid "Type:"
 msgstr "����:"
 
 #. Payment Menu
-#: ../Expense/expense.c:1704
+#: ../Expense/expense.c:1718
 msgid "Payment:"
 msgstr "�I�ڤ覡:"
 
 #. Currency Menu
-#: ../Expense/expense.c:1717
+#: ../Expense/expense.c:1726
 msgid "Currency:"
 msgstr "�ײv:"
 
-#. Date Spinners
-#: ../Expense/expense.c:1730
-msgid "Date:"
-msgstr "���:"
-
-#: ../Expense/expense.c:1747
+#: ../Expense/expense.c:1746
 msgid "Month:"
 msgstr "��:"
 
-#: ../Expense/expense.c:1761
+#: ../Expense/expense.c:1760
 msgid "Day:"
 msgstr "��:"
 
-#: ../Expense/expense.c:1775
+#: ../Expense/expense.c:1774
 msgid "Year:"
 msgstr "�~:"
 
 #. Amount Entry
-#: ../Expense/expense.c:1788
+#: ../Expense/expense.c:1787
 msgid "Amount:"
 msgstr "���B:"
 
 #. Vendor Entry
-#: ../Expense/expense.c:1802
+#: ../Expense/expense.c:1797
 msgid "Vendor:"
 msgstr "�t��:"
 
 #. City
-#: ../Expense/expense.c:1816
+#: ../Expense/expense.c:1807
 msgid "City:"
 msgstr "����:"
 
 #. Attendees
-#: ../Expense/expense.c:1830
+#: ../Expense/expense.c:1817
 msgid "Attendees"
 msgstr "�X�u��"
 
-#: ../KeyRing/keyring.c:206
+#. -------------------------------------------
+#: ../Expense/expense.c:2100
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expense plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org"
+msgstr ""
+
+#: ../KeyRing/keyring.c:289
 msgid "KeyRing: pack_KeyRing(): buf_size too small\n"
 msgstr "�_�Ͱ�: pack_�_�Ͱ�(): buf_size �Ӥp\n"
 
-#: ../KeyRing/keyring.c:1546
+#: ../KeyRing/keyring.c:1697
 msgid "Incorrect, Reenter KeyRing Password"
 msgstr "�����T, �Э��s��J�_�Ͱ�K�X"
 
-#: ../KeyRing/keyring.c:1548
+#: ../KeyRing/keyring.c:1699
 msgid "Enter a NEW KeyRing Password"
 msgstr "�п�J�s���_�Ͱ�K�X"
 
-#: ../KeyRing/keyring.c:1550
+#: ../KeyRing/keyring.c:1701
 msgid "Enter KeyRing Password"
 msgstr "��J�_�Ͱ�K�X"
 
-#: ../KeyRing/keyring.c:1636
-#, fuzzy
-msgid "Your HOME environment variable is too long(>1024)\n"
-msgstr "�z�� HOME �����ܼƹ� J-Pilot �ӻ��Ӫ�\n"
-
-#: ../KeyRing/keyring.c:1641
+#: ../KeyRing/keyring.c:1767
 #, c-format
 msgid "KeyRing: file %s not found.\n"
 msgstr "�_�Ͱ�: �ɮ� %s �䤣��.\n"
 
-#: ../KeyRing/keyring.c:1642
+#: ../KeyRing/keyring.c:1768
 msgid "KeyRing: Try Syncing.\n"
 msgstr "�_�Ͱ�: �|�զP�B.\n"
 
-#: ../KeyRing/keyring.c:1726 ../KeyRing/keyring.c:1737
+#: ../KeyRing/keyring.c:1859 ../KeyRing/keyring.c:1870
 msgid "KeyRing"
 msgstr "�_�Ͱ�"
 
-#: ../KeyRing/keyring.c:2009
-#, fuzzy
-msgid "Changed"
-msgstr "����"
+#. -------------------------------------------
+#: ../KeyRing/keyring.c:1898
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"KeyRing plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 2001.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"KeyRing is a free PalmOS program for storing\n"
+"passwords and other information in encrypted form\n"
+"http://gnukeyring.sourceforge.net"
+msgstr ""
 
-#: ../KeyRing/keyring.c:2009
-msgid "Account"
-msgstr "�b��"
+#: ../KeyRing/keyring.c:2136
+#, c-format
+msgid ""
+"Keys exported from %s %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../KeyRing/keyring.c:2170 ../KeyRing/keyring.c:2249
+#, fuzzy, c-format
+msgid "Can't export key %d\n"
+msgstr "�L�k�ץX�Ƨѿ� %d\n"
 
 #. Change Password button
-#: ../KeyRing/keyring.c:2024
+#: ../KeyRing/keyring.c:2451
 msgid ""
 "Change\n"
 "KeyRing\n"
@@ -3014,53 +3685,264 @@ msgstr ""
 "�_�Ͱ�\n"
 "�K�X"
 
+#. Clist
+#: ../KeyRing/keyring.c:2564
+#, fuzzy
+msgid "Changed"
+msgstr "����"
+
+#: ../KeyRing/keyring.c:2566
+msgid "Account"
+msgstr "�b��"
+
 #. Name entry
-#: ../KeyRing/keyring.c:2200
+#: ../KeyRing/keyring.c:2660
 msgid "name: "
 msgstr "�W�r: "
 
 #. Account entry
-#: ../KeyRing/keyring.c:2207
+#: ../KeyRing/keyring.c:2668
 msgid "account: "
 msgstr "�b��: "
 
 #. Password entry
-#: ../KeyRing/keyring.c:2214
+#: ../KeyRing/keyring.c:2676
 msgid "password: "
 msgstr "�K�X: "
 
 #. Last Changed entry
-#: ../KeyRing/keyring.c:2221
+#: ../KeyRing/keyring.c:2683
 msgid "last changed: "
 msgstr ""
 
 #. Generate Password button (creates random password)
-#: ../KeyRing/keyring.c:2231
+#: ../KeyRing/keyring.c:2693
 msgid "Generate Password"
 msgstr "�۰ʲ��ͱK�X"
 
-#: ../SyncTime/synctime.c:48
+#: ../SyncTime/synctime.c:59
 #, fuzzy
 msgid "SyncTime"
 msgstr "�P�B�Ƨѿ�"
 
-#: ../SyncTime/synctime.c:88
+#. -------------------------------------------
+#: ../SyncTime/synctime.c:70
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"SyncTime plugin for J-Pilot was written by\n"
+"Judd Montgomery (c) 1999.\n"
+"judd@jpilot.org, http://jpilot.org\n"
+"\n"
+"SyncTime WILL NOT work with PalmOS 3.3!"
+msgstr ""
+
+#: ../SyncTime/synctime.c:104
 msgid "synctime: Palm OS Version 3.25 and 3.30 do not support SyncTime\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:89
+#: ../SyncTime/synctime.c:105
 msgid "synctime: NOT setting the time on the pilot\n"
 msgstr ""
 
-#: ../SyncTime/synctime.c:94
+#: ../SyncTime/synctime.c:110
 msgid "synctime: Setting the time on the pilot... "
 msgstr ""
 
-#: ../SyncTime/synctime.c:99
+#: ../SyncTime/synctime.c:115
 #, fuzzy
 msgid "Done\n"
 msgstr "����"
 
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "�мg�ɮ�"
+
+#~ msgid "Field"
+#~ msgstr "����"
+
+#~ msgid "kana("
+#~ msgstr "���W("
+
+#~ msgid "Quick View"
+#~ msgstr "�ֳt�˵�"
+
+#~ msgid "Unable to open %s%s file\n"
+#~ msgstr "�L�k�}�� %s%s �ɮ�\n"
+
+#~ msgid "Unable to open %s.alarms file\n"
+#~ msgstr "�L�k�}�� %s �x�a�ɮ�\n"
+
+#~ msgid "You can't edit category %s.\n"
+#~ msgstr "�L�k�s�����O %s \n"
+
+#~ msgid "You can't delete category %s.\n"
+#~ msgstr "�L�k�R�����O %s \n"
+
+#~ msgid "category name"
+#~ msgstr "���O�W��"
+
+#~ msgid "debug"
+#~ msgstr "����"
+
+#~ msgid "Close"
+#~ msgstr "����"
+
+#~ msgid "none"
+#~ msgstr "�L"
+
+#~ msgid "Unknown repeatType found in DatebookDB\n"
+#~ msgstr "�bDatebookDB��������repeatType\n"
+
+#~ msgid "W"
+#~ msgstr "�P"
+
+#~ msgid "M"
+#~ msgstr "��"
+
+#~ msgid "This Event has no particular time"
+#~ msgstr "���ƥ�L�S�w�ɶ�"
+
+#~ msgid "Start Time"
+#~ msgstr "�}�l�ɶ�"
+
+#~ msgid "End Time"
+#~ msgstr "�����ɶ�"
+
+#~ msgid "Dismiss"
+#~ msgstr "����"
+
+#~ msgid "Done"
+#~ msgstr "����"
+
+#~ msgid "Add"
+#~ msgstr "�[�J"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "�ϥΪ̦W��"
+
+#~ msgid " -v = version\n"
+#~ msgstr " -v = ����\n"
+
+#~ msgid " -h = help\n"
+#~ msgstr " -h = �D�U\n"
+
+#~ msgid " -d = run in debug mode\n"
+#~ msgstr " -d = �H�����Ҧ�����\n"
+
+#~ msgid " -P = do not load plugins.\n"
+#~ msgstr " -P = �����J�~���{��.\n"
+
+#~ msgid " -b = Do a sync and then a backup, otherwise just do a sync.\n"
+#~ msgstr " -b = �P�B�åB�ƥ�, �_�h�N�u�P�B.\n"
+
+#~ msgid "Invalid geometry specification: \"%s\"\n"
+#~ msgstr "���X�z��������m����j�p�]�w: \"%s\"\n"
+
+#~ msgid "/Help/PayBack program"
+#~ msgstr "/����(H)/PayBack program"
+
+#~ msgid "Font Selection Dialog"
+#~ msgstr "�r����ܹ�ܮ�"
+
+#~ msgid "Clear"
+#~ msgstr "�M��"
+
+#, fuzzy
+#~ msgid "Show private records"
+#~ msgstr "��ܨp�H����   Ctrl-Z"
+
+#, fuzzy
+#~ msgid "Hide private records"
+#~ msgstr "���èp�H����   Ctrl-Z"
+
+#, fuzzy
+#~ msgid "Mask private records"
+#~ msgstr "�B�n�p�H����   Ctrl-Z"
+
+#~ msgid "Font"
+#~ msgstr "�r��"
+
+#~ msgid "Go to the menu \""
+#~ msgstr "�ܿ�� \""
+
+#~ msgid "\" and change the \""
+#~ msgstr "\" �åB���ܨ� \""
+
+#~ msgid "\"."
+#~ msgstr "\"."
+
+#~ msgid "Couldn't open PC records file\n"
+#~ msgstr "�L�k�}�� PC ��������\n"
+
+#~ msgid "The first day of the week is "
+#~ msgstr "�@�g���Ĥ@�ѬO "
+
+#~ msgid "Serial Port (/dev/ttyS0, /dev/pilot)"
+#~ msgstr "�ǦC�� (/dev/ttyS0, /dev/pilot)"
+
+#~ msgid "Serial Rate (Does not affect USB)"
+#~ msgstr "�ǦC��t�v (���v�T USB ����)"
+
+#~ msgid "Sync memo32 (pedit32)"
+#~ msgstr "�P�B memo32 (pedit32)"
+
+#~ msgid "One record"
+#~ msgstr "�@������"
+
+#~ msgid "%s: press the hotsync button on the cradle or \"kill %d\"\n"
+#~ msgstr "%s: ���U�P�B�y�W�� Hotsync ���s�άO����R�O \"kill %d\"\n"
+
+#~ msgid "Finished\n"
+#~ msgstr "����\n"
+
+#~ msgid "Last Username = [%s]\n"
+#~ msgstr "�W�@�ӨϥΪ̦W�� = [%s]\n"
+
+#~ msgid "Last UserID = %d\n"
+#~ msgstr "�W�@�ӨϥΪ� ID = %d\n"
+
+#~ msgid "Username = [%s]\n"
+#~ msgstr "�ϥΪ̦W�� = [%s]\n"
+
+#~ msgid "userID = %d\n"
+#~ msgstr "�ϥΪ� ID = %d\n"
+
+#~ msgid "palm: number of records = %d\n"
+#~ msgstr "Palm: �����ƥ� = %d\n"
+
+#~ msgid "disk: number of records = %d\n"
+#~ msgstr "�w��: �����ƥ� = %d\n"
+
+#, fuzzy
+#~ msgid " -i makes program iconify itself upon launch.\n"
+#~ msgstr " -i J-Pilot�Ұʮɳ̤p��\n"
+
+#~ msgid ""
+#~ "%s doesn't appear to be a directory.\n"
+#~ "I need it to be.\n"
+#~ msgstr ""
+#~ "%s ���G���O�ؿ�.\n"
+#~ "�ڭn�D���O�ӥؿ�.\n"
+
+#~ msgid "AmEx"
+#~ msgstr "����B�q (AmEx)"
+
+#~ msgid "CreditCard"
+#~ msgstr "�H�Υd"
+
+#~ msgid "MasterCard"
+#~ msgstr "�U�ƹF�d (MasterCard)"
+
+#~ msgid "Expense: Unknown category\n"
+#~ msgstr "�}��: �������O\n"
+
+#, fuzzy
+#~ msgid "Your HOME environment variable is too long(>1024)\n"
+#~ msgstr "�z�� HOME �����ܼƹ� J-Pilot �ӻ��Ӫ�\n"
+
 #~ msgid "Quit"
 #~ msgstr "���}"
 
@@ -3070,9 +3952,6 @@ msgstr "
 #~ msgid "Directory"
 #~ msgstr "�ؿ�"
 
-#~ msgid "Overwrite File"
-#~ msgstr "�мg�ɮ�"
-
 #~ msgid "Filename"
 #~ msgstr "�ɦW"
 
diff --git a/prefs.c b/prefs.c
index 73e9ee4b..ec02362f 100644
--- a/prefs.c
+++ b/prefs.c
@@ -2,7 +2,7 @@
  * prefs.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/prefs.h b/prefs.h
index d993cf61..a2867c96 100644
--- a/prefs.h
+++ b/prefs.h
@@ -2,7 +2,7 @@
  * prefs.h
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/prefs_gui.c b/prefs_gui.c
index 1733d604..d6cf79e5 100644
--- a/prefs_gui.c
+++ b/prefs_gui.c
@@ -2,7 +2,7 @@
  * prefs_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/prefs_gui.h b/prefs_gui.h
index 5c7363e8..bd0688ea 100644
--- a/prefs_gui.h
+++ b/prefs_gui.h
@@ -2,7 +2,7 @@
  * prefs_gui.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/print.c b/print.c
index 4ccc83fc..41994261 100644
--- a/print.c
+++ b/print.c
@@ -2,7 +2,7 @@
  * print.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2000-2002 by Judd Montgomery
+ * Copyright (C) 2000-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/print.h b/print.h
index 655ebda0..1dfd90d3 100644
--- a/print.h
+++ b/print.h
@@ -2,7 +2,7 @@
  * print.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 2000-2002 by Judd Montgomery
+ * Copyright (C) 2000-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/print_gui.c b/print_gui.c
index b88d772e..cd6f6405 100644
--- a/print_gui.c
+++ b/print_gui.c
@@ -2,7 +2,7 @@
  * print_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2000-2002 by Judd Montgomery
+ * Copyright (C) 2000-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/restore.h b/restore.h
index 7c222537..b07fc8d8 100644
--- a/restore.h
+++ b/restore.h
@@ -2,7 +2,7 @@
  * restore.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 2001-2002 by Judd Montgomery
+ * Copyright (C) 2001-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/restore_gui.c b/restore_gui.c
index 6ae456c3..d6a82fc9 100644
--- a/restore_gui.c
+++ b/restore_gui.c
@@ -2,7 +2,7 @@
  * restore_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 2001-2002 by Judd Montgomery
+ * Copyright (C) 2001-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/search_gui.c b/search_gui.c
index 84a211e7..4496a4c6 100644
--- a/search_gui.c
+++ b/search_gui.c
@@ -2,7 +2,7 @@
  * search_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/sync.c b/sync.c
index 70569809..dbed7a39 100644
--- a/sync.c
+++ b/sync.c
@@ -2,7 +2,7 @@
  * sync.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/sync.h b/sync.h
index d935bb81..081a14d4 100644
--- a/sync.h
+++ b/sync.h
@@ -2,7 +2,7 @@
  * sync.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/todo.c b/todo.c
index dd8d4b5d..762c1c8f 100644
--- a/todo.c
+++ b/todo.c
@@ -2,7 +2,7 @@
  * todo.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/todo.h b/todo.h
index 12676b4e..8da65bdc 100644
--- a/todo.h
+++ b/todo.h
@@ -2,7 +2,7 @@
  * todo.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/todo_gui.c b/todo_gui.c
index 897a0d12..97852e7a 100644
--- a/todo_gui.c
+++ b/todo_gui.c
@@ -2,7 +2,7 @@
  * todo_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/utils.c b/utils.c
index bb0b5102..3c261690 100644
--- a/utils.c
+++ b/utils.c
@@ -2,7 +2,7 @@
  * utils.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1951,7 +1951,7 @@ void get_compile_options(char *string, int len)
 {
    g_snprintf(string, len,
               PN" version "VERSION"\n"
-              "  Copyright (C) 1999-2010 by Judd Montgomery\n"
+              "  Copyright (C) 1999-2014 by Judd Montgomery\n"
               "  judd@jpilot.org, http://jpilot.org\n"
               "\n"
               PN" comes with ABSOLUTELY NO WARRANTY; for details see the file\n"
diff --git a/utils.h b/utils.h
index cbd4fa46..71f4b995 100644
--- a/utils.h
+++ b/utils.h
@@ -2,7 +2,7 @@
  * utils.h
  * A module of J-Pilot http://jpilot.org
  * 
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/weekview_gui.c b/weekview_gui.c
index 32dbf12b..97761c5f 100644
--- a/weekview_gui.c
+++ b/weekview_gui.c
@@ -2,7 +2,7 @@
  * weekview_gui.c
  * A module of J-Pilot http://jpilot.org
  *
- * Copyright (C) 1999-2002 by Judd Montgomery
+ * Copyright (C) 1999-2014 by Judd Montgomery
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by