[pkg-horde] [SCM] Debian Horde Packages repository: mnemo2 package branch, debian-sid, updated. c0720adfc22f007b515b0a537192f0d81560f90f

[Gregory Colpart]

The following commit has been merged in the debian-sid branch:
commit 1456ebb9ff3961e9e3f98e197b45b21e404283e1
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date:   Sun May 24 17:08:21 2009 +0200

    merge from upstream

diff --git a/config/prefs.php.dist b/config/prefs.php.dist
index 319535e..b83d5a4 100644
--- a/config/prefs.php.dist
+++ b/config/prefs.php.dist
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: mnemo/config/prefs.php.dist,v 1.24.2.3 2008/01/03 22:24:25 chuck Exp $
+ * $Horde: mnemo/config/prefs.php.dist,v 1.24.2.4 2008/06/13 14:44:04 jan Exp $
  *
  * See horde/config/prefs.php for documentation on the structure of this file.
  */
@@ -96,7 +96,7 @@ $_prefs['notepadselect'] = array('type' => 'special');
 $_prefs['default_notepad'] = array(
     'value' => Auth::getAuth() ? Auth::getAuth() : 0,
     'locked' => false,
-    'shared' => true,
+    'shared' => false,
     'type' => 'implicit'
 );
 
diff --git a/docs/CHANGES b/docs/CHANGES
index be84c75..0990248 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,7 +1,21 @@
+------
+v2.2.1
+------
+
+[jan] Log moving of memos in the history backend (Bug #3207).
+[jan] Add Basque translation (Euskal Herriko Unibertsitatea EHU/UPV
+      <xabier.arrieta at ehu.es>).
+[mjr] Remove user permissions on all shares when deleting a user.
+[mjr] Fix issue with removeUserData api that caused the deleted user's task list
+      to not be deleted (Bug #6969).
+
+
 ----
 v2.2
 ----
 
+[mjr] Fix issue with removeUserData api that caused the deleted user's task list
+      to not be deleted (Bug #6969).
 [cjh] Improve resource usage in datatree_to_sql share migration script
       (Bug #6740).
 [jan] Fix exporting and synchronization of encrypted notes.
@@ -184,7 +198,7 @@ v2.0-BETA
 [jan] Add Polish translation (Mateusz Kaminski <matipl at ds.pg.gda.pl>).
 [jan] Add special black-on-white styles for message printing.
 [jan] Add access keys.
-[cjh] Add Kolab drivers (Stuart Bingë <s.binge at codefusion.co.za>).
+[cjh] Add Kolab drivers (Stuart Bingë <s.binge at codefusion.co.za>).
 
 
 ----------
@@ -284,7 +298,7 @@ v1.0
 [jan] Add Finnish translation (Leena Heino <liinu at uta.fi>).
 [jan] Add Norwegian Nynorsk translation (Per-Stian Vatne <psv at orsta.org>).
 [jan] Add Traditional Chinese translation (Chih-Wei Yeh <cwyeh at ccca.nctu.edu.tw>).
-[jan] Add Swedish translation (Andreas Dahlén <andreas at dahlen.ws>).
+[jan] Add Swedish translation (Andreas Dahlén <andreas at dahlen.ws>).
 [jan] Add Spanish translation (Raul Alvarez Venegas <rav at tecoman.ucol.mx>).
 [jan] Add German translation.
 [jan] Add Portuguese translation (Nuno Loureiro <nuno at co.eth.pt>).
diff --git a/docs/CREDITS b/docs/CREDITS
index d2b8203..b3f0dd3 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -14,8 +14,11 @@ Localization
 ============
 
 =====================   ======================================================
+Basque                  Euskal Herriko Unibertsitatea <xabier.arrieta at ehu.es>
 Brazilian Portuguese    Antonio Dias <accdias-horde-i18n at sst.com.br>
                         Fabio Gomes <flgomes at fazenda.sp.gov.br>
+                        Luis Felipe Marzagao <duli at fedoraproject.org>
+                        Eduardo de Carli <carliedu at ig.com.br>
 Bulgarian               Miroslav Pendev <miro at cybershade.us>
 Chinese (Simplified)    Peter Wang <whw at oulink.net>
                         Anna Chen <annachen2008 at yahoo.com.cn>
diff --git a/docs/RELEASE_NOTES b/docs/RELEASE_NOTES
index 2fb6928..494e17d 100644
--- a/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES
@@ -12,33 +12,27 @@
  * 8 - Minor security fixes
  * 9 - Major security fixes
  */
-$this->notes['fm']['focus'] = 5;
+$this->notes['fm']['focus'] = 4;
 
 /* Mailing list release notes. */
 $this->notes['ml']['changes'] = <<<ML
 The Horde Team is pleased to announce the final release of the Mnemo Note
-Manager version H3 (2.2).
+Manager version H3 (2.2.1).
 
 The Mnemo Note Manager is the Horde notes/memos application.  It provides
 web-based notes and freeform text, similar to the PalmOS Note application and
 shared notepads.  It requires the Horde Application Framework and an SQL
 database or Kolab server for backend storage.
 
-Mnemo version H3 (2.2) is a major upgrade in the 2.x release series, including
-these enhancements:
-    * Support for saving notes as PDF files.
-    * Support for encrypted notes.
-    * Inline search of the note list
-    * WCAG 1.0 Priority 2/Section 508 accessibility guidelines compliance.
-    * Full Kolab webclient support
-    * All notepads are now shown in a collapsible panel with easy access to
-      managing your notepads and choosing which notes to view.
-    * and much more.
+Major changes compared to the Mnemo H3 (2.2) version are:
+    * Improved deleting user data.
+    * Added Basque and Estonian translations.
 ML;
 
 /* Freshmeat release notes. */
 $this->notes['fm']['changes'] = <<<FM
-New in this release: Support for saving notes as PDF files; support for encrypted notes; inline search of the note list; WCAG 1.0 Priority 2/Section 508 accessibility guidelines compliance; full Kolab webclient support; and many bug fixes and small enhancements.
+Deleting user data has been improved.
+Basque and Estonian translations have been added.
 FM;
 
 $this->notes['name'] = 'Mnemo';
diff --git a/docs/UPGRADING b/docs/UPGRADING
index 506abd7..362ece1 100644
--- a/docs/UPGRADING
+++ b/docs/UPGRADING
@@ -2,8 +2,8 @@
  Upgrading Mnemo
 ========================
 
-:Last update:   $Date: 2008/04/30 03:37:38 $
-:Revision:      $Revision: 1.1.8.5 $
+:Last update:   $Date: 2008/09/11 15:04:08 $
+:Revision:      $Revision: 1.1.8.11 $
 :Contact:       horde at lists.horde.org
 
 
@@ -11,6 +11,16 @@ These are instructions to upgrade from earlier Mnemo versions. Please
 backup your existing data before running any of the steps described below.
 
 
+Upgrading Mnemo from 2.2 to 2.2.1
+=================================
+
+The share_owner field in the SQL share driver table has been changed from a
+VARCHAR(32) to a VARCHAR(255). Execute the provided SQL script to update your
+database if you are using the native SQL share driver.
+
+   mysql --user=root --password=<MySQL-root-password>  <db name> < scripts/upgrades/2.2_to_2.2.1.sql
+
+
 Upgrading Mnemo from 2.x to 2.2
 ===============================
 
@@ -27,10 +37,10 @@ script::
 
    mysql --user=root --password=<MySQL-root-password> <db name> < scripts/upgrades/2.1_to_2.2.sql
 
- You must also execute the provided PHP script to migrate your existing share
- data to the new format::
+If you want to use the new SQL Share driver, you must also execute the
+provided PHP script to migrate your existing share data to the new format::
 
-   php scripts/upgrades/2.1_to_2.2.php
+   php scripts/upgrades/convert_datatree_shares_to_sql.php
 
 
 Upgrading Mnemo from 1.1.x to 2.0
diff --git a/lib/Driver.php b/lib/Driver.php
index d6c884a..89fa643 100644
--- a/lib/Driver.php
+++ b/lib/Driver.php
@@ -2,7 +2,7 @@
 /**
  * Mnemo_Driver:: defines an API for implementing storage backends for Mnemo.
  *
- * $Horde: mnemo/lib/Driver.php,v 1.25.2.12 2008/01/02 11:32:26 jan Exp $
+ * $Horde: mnemo/lib/Driver.php,v 1.25.2.13 2008/06/09 03:28:06 chuck Exp $
  *
  * Copyright 2001-2008 The Horde Project (http://www.horde.org/)
  *
@@ -260,7 +260,7 @@ class Mnemo_Driver {
      */
     function &singleton($notepad = '', $driver = null, $params = null)
     {
-        static $instances;
+        static $instances = array();
 
         if (is_null($driver)) {
             $driver = $GLOBALS['conf']['storage']['driver'];
@@ -270,10 +270,6 @@ class Mnemo_Driver {
             $params = Horde::getDriverConfig('storage', $driver);
         }
 
-        if (!isset($instances)) {
-            $instances = array();
-        }
-
         $signature = serialize(array($notepad, $driver, $params));
         if (!isset($instances[$signature])) {
             $instances[$signature] = &Mnemo_Driver::factory($notepad, $driver, $params);
diff --git a/lib/Driver/sql.php b/lib/Driver/sql.php
index af3037b..dbc32a3 100644
--- a/lib/Driver/sql.php
+++ b/lib/Driver/sql.php
@@ -23,7 +23,7 @@
  *
  * The table structure is defined in scripts/drivers/mnemo_memos.sql.
  *
- * $Horde: mnemo/lib/Driver/sql.php,v 1.28.2.16 2008/01/02 11:32:27 jan Exp $
+ * $Horde: mnemo/lib/Driver/sql.php,v 1.28.2.17 2008/08/20 17:14:56 jan Exp $
  *
  * Copyright 2001-2008 The Horde Project (http://www.horde.org/)
  *
@@ -319,6 +319,9 @@ class Mnemo_Driver_sql extends Mnemo_Driver {
      */
     function move($noteId, $newNotepad)
     {
+        /* Get the note's details for use later. */
+        $note = $this->get($noteId);
+
         $query = 'UPDATE ' . $this->_params['table'] .
                  ' SET memo_owner = ?' .
                  ' WHERE memo_owner = ? AND memo_id = ?';
@@ -335,6 +338,13 @@ class Mnemo_Driver_sql extends Mnemo_Driver {
             return $result;
         }
 
+        /* Log the moving of this item in the history log. */
+        if (!empty($note['uid'])) {
+            $history = &Horde_History::singleton();
+            $history->log('mnemo:' . $this->_notepad . ':' . $note['uid'], array('action' => 'delete'), true);
+            $history->log('mnemo:' . $newNotepad . ':' . $note['uid'], array('action' => 'add'), true);
+        }
+
         return true;
     }
 
diff --git a/lib/api.php b/lib/api.php
index 1e3ef32..05c28c6 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -5,7 +5,7 @@
  * This file defines Mnemo's external API interface.  Other applications can
  * interact with Mnemo through this API.
  *
- * $Horde: mnemo/lib/api.php,v 1.53.2.24 2008/05/12 12:22:38 jan Exp $
+ * $Horde: mnemo/lib/api.php,v 1.53.2.29 2008/08/13 20:32:44 chuck Exp $
  *
  * Copyright 2001-2008 The Horde Project (http://www.horde.org/)
  *
@@ -94,30 +94,81 @@ function _mnemo_perms()
  */
 function _mnemo_removeUserData($user)
 {
-    /* Retrieve all entries for user datasource ... */
-    $uids = _mnemo_list($user);
-    if (is_a($uids, 'PEAR_Error')) {
-        return $uids;
-    }
+    require_once dirname(__FILE__) . '/base.php';
 
-    /* ... and delete them. */
-    foreach ($uids as $uid) {
-        _mnemo_delete($uid);
+    if (!Auth::isAdmin() && $user != Auth::getAuth()) {
+        return PEAR::raiseError(_("You are not allowed to remove user data."));
     }
 
-    /* Now delete history as well. */
-    $history = &Horde_History::singleton();
-    if (method_exists($history, 'removeByParent')) {
-        $histories = $history->removeByParent('mnemo:' . $user);
-   } else {
-        /* Remove entries 100 at a time. */
-        $all = array_keys($history->getByTimestamp('>', 0, array(), 'mnemo:' . $user));
-        while (count($d = array_splice($all, 0, 100)) > 0) {
-            $history->removebyNames($d);
+    /* Error flag */
+    $hasError = false;
+
+    /* Get the share object for later deletion */
+    $share = $GLOBALS['mnemo_shares']->getShare($user);
+    if (is_a($share, 'PEAR_Error')) {
+        Horde::logMessage($share->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+        unset($share);
+    } else {
+        $GLOBALS['display_notepads'] = array($user);
+        $memos = Mnemo::listMemos();
+        if (is_a($memos, 'PEAR_Error')) {
+            $hasError = true;
+            Horde::logMessage($mnemos->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+        } else {
+            $uids = array();
+            foreach ($memos as $memo) {
+                $uids[] = $memo['uid'];
+            }
+
+            /* ... and delete them. */
+            foreach ($uids as $uid) {
+                _mnemo_delete($uid);
+            }
+        }
+
+        /* Now delete history as well. */
+        $history = &Horde_History::singleton();
+        if (method_exists($history, 'removeByParent')) {
+            $histories = $history->removeByParent('mnemo:' . $user);
+        } else {
+            /* Remove entries 100 at a time. */
+            $all = $history->getByTimestamp('>', 0, array(), 'mnemo:' . $user);
+            if (is_a($all, 'PEAR_Error')) {
+                Horde::logMessage($all, __FILE__, __LINE__, PEAR_LOG_ERR);
+            } else {
+                $all = array_keys($all);
+                while (count($d = array_splice($all, 0, 100)) > 0) {
+                    $history->removebyNames($d);
+                }
+            }
+        }
+
+        /* Remove the share itself */
+        if (!empty($share)) {
+            $result = $GLOBALS['mnemo_shares']->removeShare($share);
+            if (is_a($result, 'PEAR_Error')) {
+                $hasError = true;
+                Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+            }
+        }
+
+        /* Get a list of all shares this user has perms to and remove the perms */
+        $shares = $GLOBALS['mnemo_shares']->listShares($user);
+        if (is_a($shares, 'PEAR_Error')) {
+            $hasError = true;
+            Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR);
+        } else {
+            foreach ($shares as $share) {
+                $share->removeUser($user);
+            }
         }
     }
 
-    return true;
+    if ($hasError) {
+        return PEAR::raiseError(sprintf(_("There was an error removing notes for %s. Details have been logged."), $user));
+    } else {
+        return true;
+    }
 }
 
 /**
diff --git a/lib/version.php b/lib/version.php
index d474896..493a453 100644
--- a/lib/version.php
+++ b/lib/version.php
@@ -1 +1 @@
-<?php define('MNEMO_VERSION', 'H3 (2.2)') ?>
+<?php define('MNEMO_VERSION', 'H3 (2.2.1)') ?>
diff --git a/locale/de_DE/LC_MESSAGES/mnemo.mo b/locale/de_DE/LC_MESSAGES/mnemo.mo
index 64aa077..12e4568 100644
Binary files a/locale/de_DE/LC_MESSAGES/mnemo.mo and b/locale/de_DE/LC_MESSAGES/mnemo.mo differ
diff --git a/locale/eu_ES/LC_MESSAGES/mnemo.mo b/locale/eu_ES/LC_MESSAGES/mnemo.mo
new file mode 100644
index 0000000..6c52606
Binary files /dev/null and b/locale/eu_ES/LC_MESSAGES/mnemo.mo differ
diff --git a/locale/eu_ES/help.xml b/locale/eu_ES/help.xml
new file mode 100644
index 0000000..67749ba
--- /dev/null
+++ b/locale/eu_ES/help.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- $Horde: mnemo/locale/eu_ES/help.xml,v 1.1.2.1 2008/07/17 21:09:26 jan Exp $ -->
+<help>
+
+<entry id="Overview" md5="50ee76138fb08b04b029006053bbadbc" state="uptodate">
+    <title>Informazio orokorra</title>
+    <heading>Sarrera</heading> <para><i>Oharrak</i> aplikazioaren bidez, ordenagailuak ohar itsaskorren antzeko funtzioa izan dezake.  Oharrak sortu, aldatu, ezabatu eta inprima daitezke.  Bilaketak ere egin ditzakezu oharretan informazioa topatzeko.   Inporta eta esportatu ere egin daitezke.</para> <para>Benetako ohar itsaskorrak ez bezala, ordenagailuko oharrak beste pertsona batzuekin parteka daitezke kokaleku fisiko desberdinetan.  Oharrak ohar-bloketan antola daitezke eta kategoria eslei diezaiekezu.</para></entry>
+
+<entry id="list-actions" md5="6d592f153bfb5c296de5dfebb428e1ba" state="uptodate">
+    <title>Nire oharrak: Ekintzak</title>
+    <heading>Ekintzak</heading> <para><i>Ezabatu</i> aukerak oharra betiko ezabatuko du.</para> <para><i>Editatu</i> aukerarekin oharra alda daiteke.</para> <para><i>Itzuli ohar-blokera</i> aukerak ohar-ikuspegitik uneko oharra dagoen ohar-blokera eramango zaitu.</para></entry>
+
+<entry id="menu-actions" md5="715a853d93cd3330e4d730b9112c8a82" state="uptodate">
+    <title>Menu-elementuak</title>
+    <heading>Menu-elementuak</heading> <para><i>Zerrendatu oharrak</i> aukerak uneko ohar-blokeko ohar guztiak zerrendatzen ditu.</para> <para><i>Ohar berria</i> aukeraren bidez, uneko ohar-blokean ohar berri bat sor dezakezu.</para> <para><i>Bilatu</i> aukerarekin, zure oharretan testu zati bat bila dezakezu.  Oharretako lehen lerroan edo testu osoan bila dezakezu.</para> <para><i>Inportatu/Esportatu</i> aukeraren bidez, oharrak inporta edo esporta ditzakezu.  Egun CSV formatuko eta vNote formatuko fitxategiak onartzen dira.</para> <para><i>Inprimatu</i> aukeraren bidez ohar bat inprima dezakezu.  <i>Inprimatu</i> ikonoa ohar bat ikusten ari zarenean soilik agertzen da menu-barran.</para></entry>
+
+
+<entry id="sorting" md5="cca3b1d1c9ed0ec5ab385f82469ddc8f" state="uptodate">
+    <title>Ordenatu sarrerak</title>
+    <heading>Ordenatu sarrerak</heading> <para>Oharren zerrenda ikustean, oharrak edozein zutaberen arabera ordena ditzakezu zutabe egokian klik eginez gero.  Goranzko edo beheranzko ordenara aldatzeko, klik egin zutabeko "Oharra" izenburuaren ondoko geziaren ikonoan.</para></entry></help>
diff --git a/locale/fi_FI/LC_MESSAGES/mnemo.mo b/locale/fi_FI/LC_MESSAGES/mnemo.mo
index 9485ded..17612e4 100644
Binary files a/locale/fi_FI/LC_MESSAGES/mnemo.mo and b/locale/fi_FI/LC_MESSAGES/mnemo.mo differ
diff --git a/locale/nl_NL/LC_MESSAGES/mnemo.mo b/locale/nl_NL/LC_MESSAGES/mnemo.mo
index a1e9a26..8f2f39f 100644
Binary files a/locale/nl_NL/LC_MESSAGES/mnemo.mo and b/locale/nl_NL/LC_MESSAGES/mnemo.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/mnemo.mo b/locale/pt_BR/LC_MESSAGES/mnemo.mo
index 8dcb685..713c409 100644
Binary files a/locale/pt_BR/LC_MESSAGES/mnemo.mo and b/locale/pt_BR/LC_MESSAGES/mnemo.mo differ
diff --git a/memo.php b/memo.php
index c14effa..ff11fcc 100644
--- a/memo.php
+++ b/memo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: mnemo/memo.php,v 1.42.2.10 2008/02/12 18:17:05 jan Exp $
+ * $Horde: mnemo/memo.php,v 1.42.2.11 2008/08/20 17:14:55 jan Exp $
  *
  * Copyright 2001-2008 The Horde Project (http://www.horde.org/)
  *
@@ -129,15 +129,7 @@ case 'save_memo':
         if (!empty($memo_id) &&
             !is_a(Mnemo::getMemo($memolist_original, $memo_id), 'PEAR_Error')) {
             $storage = &Mnemo_Driver::singleton($memolist_original);
-            $memo_desc = $storage->getMemoDescription($memo_body);
-            if (empty($memo_passphrase) &&
-                Util::getFormData('memo_encrypt') == 'on') {
-                $memo_passphrase = Mnemo::getPassphrase($memo_id);
-            }
-            $result = $storage->modify($memo_id, $memo_desc, $memo_body, $memo_category, $memo_passphrase);
-
-            if (!is_a($result, 'PEAR_Error') &&
-                $memolist_original != $notepad_target) {
+            if ($memolist_original != $notepad_target) {
                 /* Moving the note to another notepad. */
                 $share = &$GLOBALS['mnemo_shares']->getShare($memolist_original);
                 if (!is_a($share, 'PEAR_Error') &&
@@ -146,6 +138,7 @@ case 'save_memo':
                     if (!is_a($share, 'PEAR_Error') &&
                         $share->hasPermission(Auth::getAuth(), PERMS_EDIT)) {
                         $result = $storage->move($memo_id, $notepad_target);
+                        $storage = &Mnemo_Driver::singleton($notepad_target);
                     } else {
                         $notification->push(_("Access denied moving the note."), 'horde.error');
                     }
@@ -153,6 +146,12 @@ case 'save_memo':
                     $notification->push(_("Access denied moving the note."), 'horde.error');
                 }
             }
+            $memo_desc = $storage->getMemoDescription($memo_body);
+            if (empty($memo_passphrase) &&
+                Util::getFormData('memo_encrypt') == 'on') {
+                $memo_passphrase = Mnemo::getPassphrase($memo_id);
+            }
+            $result = $storage->modify($memo_id, $memo_desc, $memo_body, $memo_category, $memo_passphrase);
         } else {
             /* Check permissions. */
             if (Mnemo::hasPermission('max_notes') !== true &&
diff --git a/po/de_DE.po b/po/de_DE.po
index a4bbb59..1a0ed35 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mnemo 2.2-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2008-05-21 00:16+0200\n"
-"PO-Revision-Date: 2008-05-12 12:33+0200\n"
+"POT-Creation-Date: 2008-09-06 11:11+0200\n"
+"PO-Revision-Date: 2008-07-12 18:49+0200\n"
 "Last-Translator: Jan Schneider <jan at horde.org>\n"
 "Language-Team: German <dev at horde.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,13 +28,13 @@ msgstr "Die %s-Datei wurde erfolgreich importiert"
 #: lib/Mnemo.php:451 lib/Forms/DeleteNotepad.php:86
 #, php-format
 msgid "%s's Notepad"
-msgstr "%ss Notizblock"
+msgstr "Notizblock von %s"
 
-#: memo.php:201
+#: memo.php:200
 msgid "Access denied deleting note."
 msgstr "Zugriff verweigert beim Löschen der Notiz."
 
-#: memo.php:150 memo.php:153
+#: memo.php:143 memo.php:146
 msgid "Access denied moving the note."
 msgstr "Zugriff verweigert beim Verschieben der Notiz."
 
@@ -64,7 +64,7 @@ msgstr "Abbrechen"
 msgid "Category"
 msgstr "Kategorie"
 
-#: templates/notepad_list.php:31 notepads/index.php:32
+#: templates/notepad_list.php:29 notepads/index.php:32
 msgid "Change Permissions"
 msgstr "Rechte Ändern"
 
@@ -88,7 +88,7 @@ msgstr "Erstellen"
 msgid "Create Notepad"
 msgstr "Notizblock erstellen"
 
-#: templates/notepad_list.php:8
+#: templates/notepad_list.php:9
 msgid "Create a new Notepad"
 msgstr "Neuen Notizblock erstellen"
 
@@ -112,7 +112,7 @@ msgstr "Sortierreihenfolge:"
 msgid "Default sorting direction:"
 msgstr "Sortierrichtung:"
 
-#: templates/notepad_list.php:33 templates/view/memo.inc:16
+#: templates/notepad_list.php:31 templates/view/memo.inc:16
 #: notepads/index.php:33 lib/Forms/DeleteNotepad.php:45
 msgid "Delete"
 msgstr "Löschen"
@@ -155,7 +155,7 @@ msgstr "Anzeige-Einstellungen"
 msgid "Do you want to confirm deleting entries?"
 msgstr "Möchten Sie das Löschen von Einträgen bestätigen?"
 
-#: templates/notepad_list.php:29 templates/view/memo.inc:13
+#: templates/notepad_list.php:27 templates/view/memo.inc:13
 #: notepads/index.php:31
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -265,7 +265,7 @@ msgstr "Neue Notiz"
 msgid "Next"
 msgstr "Weiter"
 
-#: lib/api.php:286
+#: lib/api.php:337
 msgid "No iCalendar data was found."
 msgstr "Es wurden keine iCalendar-Daten gefunden."
 
@@ -313,12 +313,12 @@ msgstr "Notiz nicht gefunden."
 msgid "Note_pad"
 msgstr "Notiz_block"
 
-#: templates/notepad_list.php:15 templates/list/memo_headers.inc:33
+#: templates/notepad_list.php:17 templates/list/memo_headers.inc:33
 #: config/prefs.php.dist:60
 msgid "Notepad"
 msgstr "Notizblock"
 
-#: templates/notepad_list.php:12
+#: templates/notepad_list.php:14
 msgid "Notepad List"
 msgstr "Notizblockübersicht"
 
@@ -330,8 +330,8 @@ msgstr "Notizbl
 msgid "Notes Summary"
 msgstr "Notizen-Zusammenfassung"
 
-#: lib/api.php:161 lib/api.php:201 lib/api.php:234 lib/api.php:264
-#: lib/api.php:351 lib/api.php:419 lib/api.php:448
+#: lib/api.php:212 lib/api.php:252 lib/api.php:285 lib/api.php:315
+#: lib/api.php:402 lib/api.php:470 lib/api.php:499
 msgid "Permission Denied"
 msgstr "Zugriff verweigert"
 
@@ -394,8 +394,8 @@ msgstr "Gemeinsame Notizbl
 #: config/prefs.php.dist:39
 msgid "Should the Notepad be shown in its own column in the List view?"
 msgstr ""
-"Soll die Aufgabenliste in einer eigenen Spalte in der Listenansicht "
-"angezeigt werden?"
+"Soll der Notizblock in einer eigenen Spalte in der Listenansicht angezeigt "
+"werden?"
 
 #: lib/Block/summary.php:35
 msgid "Show action buttons?"
@@ -425,7 +425,7 @@ msgstr "Sortieren nach Notiztext"
 msgid "Sort by Notepad"
 msgstr "Sortieren nach Notizblock"
 
-#: memo.php:175
+#: memo.php:174
 #, php-format
 msgid "Successfully saved \"%s\"."
 msgstr "\"%s\" wurde erfolgreich gespeichert."
@@ -444,7 +444,7 @@ msgstr "Der Notizenserver ist zur Zeit nicht verf
 msgid "The Notes backend is not currently available: %s"
 msgstr "Der Notizenserver ist zur Zeit nicht verfügbar: %s"
 
-#: memo.php:198
+#: memo.php:197
 msgid "The note was deleted."
 msgstr "Die Notiz wurde gelöscht."
 
@@ -473,20 +473,27 @@ msgstr "Der Notizblock \"%s\" wurde gespeichert."
 msgid "There was an error importing the data: %s"
 msgstr "Beim Importieren der Daten ist ein Fehler aufgetreten: %s"
 
-#: lib/api.php:280
+#: lib/api.php:331
 msgid "There was an error importing the iCalendar data."
 msgstr "Beim Importieren der iCalendar Daten ist ein Fehler aufgetreten."
 
-#: lib/api.php:467
+#: lib/api.php:518
 msgid "There was an error importing the vNote data."
 msgstr "Beim Importieren der vNote-Daten ist ein Fehler aufgetreten."
 
-#: memo.php:196
+#: lib/api.php:168
+#, php-format
+msgid "There was an error removing notes for %s. Details have been logged."
+msgstr ""
+"Beim Löschen der Notizen von %s ist ein Fehler aufgetreten. Details wurden "
+"protokolliert."
+
+#: memo.php:195
 #, php-format
 msgid "There was an error removing the note: %s"
 msgstr "Beim Löschen der Notiz ist ein Fehler aufgetreten: %s"
 
-#: memo.php:173
+#: memo.php:172
 #, php-format
 msgid "There was an error saving the note: %s"
 msgstr "Beim Speichern der Notiz ist ein Fehler aufgetreten: %s"
@@ -513,8 +520,8 @@ msgid "This note has been encrypted, please provide the password below."
 msgstr ""
 "Diese Notiz wurde verschlüsselt, bitte geben Sie unten das Passwort ein."
 
-#: view.php:100 view.php:108 memo.php:80 memo.php:88 lib/api.php:357
-#: lib/Driver/kolab.php:766 lib/Driver/sql.php:448
+#: view.php:100 view.php:108 memo.php:80 memo.php:88 lib/api.php:408
+#: lib/Driver/kolab.php:766 lib/Driver/sql.php:458
 msgid "This note has been encrypted."
 msgstr "Diese Notiz wurde verschlüsselt."
 
@@ -543,7 +550,7 @@ msgstr "Der Notizblock \"%s\" kann nicht gespeichert werden: %s"
 msgid "Unfiled"
 msgstr "Nicht zugeordnet"
 
-#: lib/api.php:316 lib/api.php:382 lib/api.php:475
+#: lib/api.php:367 lib/api.php:433 lib/api.php:526
 #, php-format
 msgid "Unsupported Content-Type: %s"
 msgstr "Nicht unterstützter Inhaltstyp: %s"
@@ -565,6 +572,10 @@ msgstr "Sie d
 msgid "You are not allowed to delete this notepad."
 msgstr "Sie dürfen diesen Notizblock nicht löschen."
 
+#: lib/api.php:100
+msgid "You are not allowed to remove user data."
+msgstr "Sie dürfen keine Benutzerdaten löschen."
+
 #: view.php:49 note/pdf.php:50
 #, php-format
 msgid "You do not have permission to view the notepad %s."
diff --git a/po/pt_PT.po b/po/eu_ES.po
similarity index 62%
copy from po/pt_PT.po
copy to po/eu_ES.po
index ffcc4a2..9ba613b 100644
--- a/po/pt_PT.po
+++ b/po/eu_ES.po
@@ -1,78 +1,79 @@
-# MNEMO Portugal Portuguese translation.
-# Manuel Menezes de Sequeira <Manuel.Sequeira>, 2005.
-# Based on a previous
-# MNEMO Portugal Portuguese translation.
-# Nuno Loureiro <nuno at eth.pt>, 2002.
+# Basque translations for Mnemo.
+# Copyright (C) 2008 Horde Project
+# This file is distributed under the same license as the Mnemo package.
+# Euskal Herriko Unibertsitatea EHU/UPV <xabier.arrieta at ehu.es>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Mnemo 1.0-cvs\n"
+"Project-Id-Version: Mnemo H3 (2.1)\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2006-12-26 23:59+0000\n"
-"PO-Revision-Date: 2006-12-28 07:07-0000\n"
-"Last-Translator: Manuel Menezes de Sequeira <Manuel.Sequeira at iscte.pt>\n"
-"Language-Team: Portuguese <dev at lists.horde.org>\n"
+"POT-Creation-Date: 2008-01-16 09:33+0100\n"
+"PO-Revision-Date: 2008-07-17 14:28+0200\n"
+"Last-Translator: Euskal Herriko Unibertsitatea EHU/UPV <xabier.arrieta at ehu."
+"es>\n"
+"Language-Team: Euskal Herriko Unibertsitatea EHU/UPV <xabier.arrieta at ehu."
+"es>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: templates/list/header.inc:3
 #, php-format
 msgid "%d notes"
-msgstr "%d notas"
+msgstr "%d ohar"
 
 #: templates/memo/memo.inc:26
 #, php-format
 msgid "%s characters"
-msgstr "%s caracteres"
+msgstr "%s karaktere"
 
 #: data.php:201
 #, php-format
 msgid "%s file successfully imported"
-msgstr "Ficheiro %s importado com sucesso"
+msgstr "%s fitxategi ondo inportatu dira"
 
 #: notepads.php:99 lib/base.php:106
 #, php-format
 msgid "%s's Notepad"
-msgstr "Livros de Notas de %s"
+msgstr "%s(r)en Ohar-bloka"
 
 #: templates/list/header.inc:3
 msgid "1 note"
-msgstr "1 nota"
+msgstr "ohar bat"
 
 #: memo.php:162
 msgid "Access denied deleting note."
-msgstr "Acesso negado ao remover a nota."
+msgstr "Oharra ezabatzeko sarbidea ukatu da."
 
 #: memo.php:112 memo.php:115
 msgid "Access denied moving the note."
-msgstr "Acesso negado ao mover a nota."
+msgstr "Oharra lekuz aldatzeko sarbidea ukatu da."
 
 #: memo.php:84
 #, php-format
 msgid "Access denied saving note to %s."
-msgstr "Acesso negado ao guardar a nota em %s."
+msgstr "Oharra hemen gordetzeko sarbidea ukatu da: %s."
 
 #: memo.php:82
 #, php-format
 msgid "Access denied saving note: %s"
-msgstr "Acesso negado ao guardar a nota: %s"
+msgstr "Oharra gordetzeko sarbidea ukatu da: %s."
 
 #: memo.php:52
 msgid "Adding A New Note"
-msgstr "Adicionando Uma Nova Nota"
+msgstr "Ohar berri bat gehitu"
 
 #: config/prefs.php.dist:51
 msgid "Ascending"
-msgstr "Crescente"
+msgstr "Gorantz"
 
 #: templates/view/memo.inc:18
 msgid "Back to Notepad"
-msgstr "Voltar ao Livro de Notas"
+msgstr "Itzuli ohar-blokera"
 
 #: templates/notepads/notepads.inc:97
 msgid "Back to Notepad Options"
-msgstr "Voltar às Opções de Livros de Notas"
+msgstr "Itzuli ohar-blokaren aukeretara"
 
 #: data.php:32 templates/data/import.inc:17
 msgid "CSV"
@@ -80,470 +81,467 @@ msgstr "CSV"
 
 #: data.php:54 templates/view/memo.inc:26
 msgid "Category"
-msgstr "Categoria"
+msgstr "Kategoria"
 
 #: templates/notepads/notepads.inc:22
 msgid "Change"
-msgstr "Alterar"
+msgstr "Aldatu"
 
 #: config/prefs.php.dist:15
 msgid "Change your note sorting and display options."
-msgstr "Alterar as opções de ordenação e visualização das notas."
+msgstr "Aldatu oharrak ordenatzeko eta bistaratzeko aukerak."
 
 #: config/prefs.php.dist:22
 msgid "Choose your default Notepad."
-msgstr "Escolha o seu Livro de Notas por omissão."
+msgstr "Aukeratu ohar-blok lehenetsia."
 
 #: templates/search/search.inc:32
 msgid "Clear Form"
-msgstr "Limpar Formulário"
+msgstr "Garbitu inprimakia"
 
 #: templates/notepads/notepads.inc:17 templates/notepads/notepads.inc:94
 #: templates/notepads/notepads.inc:96
 msgid "Create"
-msgstr "Criar"
+msgstr "Sortu"
 
 #: templates/view/memo.inc:32
 msgid "Created"
-msgstr "Criada"
+msgstr "Sortua"
 
 #: config/prefs.php.dist:21
 msgid "Default Notepad"
-msgstr "Livro de Notas por Omissão"
+msgstr "Ohar-blok lehenetsia"
 
 #: config/prefs.php.dist:42
 msgid "Default sorting criteria:"
-msgstr "Critério de ordenação por omissão:"
+msgstr "Ordenatze-irizpide lehenetsia:"
 
 #: config/prefs.php.dist:53
 msgid "Default sorting direction:"
-msgstr "Sentido da ordenação por omissão:"
+msgstr "Ordenatze-noranzko lehenetsia:"
 
 #: templates/notepads/notepads.inc:95 templates/view/memo.inc:15
 msgid "Delete"
-msgstr "Remover"
+msgstr "Ezabatu"
 
 #: config/prefs.php.dist:28
 msgid "Delete Confirmation"
-msgstr "Confirmação de Remoção"
+msgstr "Ezabatzeko berrespena"
 
 #: config/prefs.php.dist:29
 msgid "Delete button behaviour"
-msgstr "Comportamento do botão de remoção."
+msgstr "Ezabatu botoiaren portaera."
 
 #: templates/memo/memo.inc:67
 msgid "Delete this note"
-msgstr "Remover esta nota"
+msgstr "Ezabatu ohar hau"
 
 #: config/prefs.php.dist:52
 msgid "Descending"
-msgstr "Decrescente"
+msgstr "Beherantz"
 
 #: templates/notepads/notepads.inc:85
 msgid "Description:"
-msgstr "Descrição:"
+msgstr "Azalpena:"
 
 #: config/prefs.php.dist:14
 msgid "Display Options"
-msgstr "Opções de Visualização"
+msgstr "Bistaratzeko aukerak"
 
 #: config/prefs.php.dist:98
 msgid "Do you want to confirm deleting entries?"
-msgstr "Deseja confirmar a remoção de entradas?"
+msgstr "Sarrerak ezabatzea berretsi nahi duzu?"
 
 #: templates/view/memo.inc:11
 msgid "Edit"
-msgstr "Editar"
+msgstr "Editatu"
 
 #: templates/list/memo_summaries.inc:5
 #, php-format
 msgid "Edit \"%s\""
-msgstr "Editar \"%s\""
+msgstr "Editatu \"%s\""
 
-#: templates/list/memo_headers.inc:42 lib/Block/summary.php:77
+#: lib/Block/summary.php:77 templates/list/memo_headers.inc:42
 msgid "Edit Note"
-msgstr "Editar Nota"
+msgstr "Editatu oharra"
 
 #: templates/list/memo_headers.inc:52
 msgid "Edit categories and colors"
-msgstr "Editar categorias e cores"
+msgstr "Editatu kategoriak eta koloreak"
 
 #: templates/list/memo_summaries.inc:12
 msgid "Empty Note"
-msgstr "Nota Vazia"
+msgstr "Hustu oharra"
 
 #: templates/data/export.inc:19
 msgid "Export"
-msgstr "Exportar"
+msgstr "Esportatu"
 
 #: templates/data/export.inc:8
 msgid "Export Notes"
-msgstr "Exportar Notas"
+msgstr "Esportatu oharrak"
 
 #: templates/search/search.inc:21
 msgid "F_ull Text"
-msgstr "Te_xto Completo"
+msgstr "_Testu osoa"
 
 #: config/prefs.php.dist:13 config/prefs.php.dist:20 config/prefs.php.dist:27
 msgid "General Options"
-msgstr "Opções Gerais"
+msgstr "Aukera orokorrak"
 
 #: templates/data/import.inc:8
 #, php-format
 msgid "Import Notes, Step %d"
-msgstr "Importar Notas, Passo %d"
+msgstr "Inportatu oharrak, %d. urratsa"
 
 #: data.php:207
 msgid "Import/Export Notes"
-msgstr "Importar/Exportar Notas"
+msgstr "Inportatu/esportatu oharrak"
 
 #: templates/view/memo.inc:39
 msgid "Last Modified"
-msgstr "Última Modificação"
+msgstr "Aldatze-data"
 
 #: lib/api.php:73
 msgid "Maximum Number of Notes"
-msgstr "Número Máximo de Notas"
+msgstr "Oharren gehieneko kopurua"
 
 #: data.php:53
 msgid "Memo Text"
-msgstr "Texto do Memo"
+msgstr "Oharraren testua"
 
 #: memo.php:68
 #, php-format
 msgid "Modifying %s"
-msgstr "A modificar %s"
+msgstr "%s aldatzen"
 
 #: list.php:35
 msgid "My Notes"
-msgstr "As Minhas Notas"
+msgstr "Nire oharrak"
 
 #: lib/Block/summary.php:22
 msgid "New Note"
-msgstr "Nova Nota"
+msgstr "Ohar berria"
 
 #: templates/data/import.inc:40
 msgid "Next"
-msgstr "Próxima"
+msgstr "Hurrengoa"
 
 #: lib/api.php:227
 msgid "No iCalendar data was found."
-msgstr "Dados iCalendar não foram encontrados."
+msgstr "Ez da aurkitu iCalendar daturik."
 
 #: templates/menu.inc:7
 msgid "No notepads are available to guests."
-msgstr "Não há livros de notas disponíveis para visitas."
+msgstr "Ez dago ohar-blok erabilgarririk gonbidatuentzat."
 
 #: templates/list/header.inc:3
 msgid "No notes"
-msgstr "Sem notas"
+msgstr "Oharrik ez"
 
 #: templates/list/empty.inc:3
 msgid "No notes match the current criteria."
-msgstr "Nenhuma nota de acordo com o critério corrente."
+msgstr "Ez dago uneko irizpideekin bat datorren oharrik."
 
 #: lib/Block/summary.php:103
 msgid "No notes to display"
-msgstr "Sem notas para mostrar"
+msgstr "Ez dago oharrik bistaratzeko"
 
 #: templates/list/memo_headers.inc:44
 msgid "No_te"
-msgstr "No_ta"
+msgstr "O_harra"
 
 #: lib/Driver/sql.php:140
 msgid "Not found"
-msgstr "Não encontrado"
+msgstr "Ez da aurkitu"
 
 #: config/prefs.php.dist:41
 msgid "Note Category"
-msgstr "Categoria da Nota"
+msgstr "Oharraren kategoria"
 
 #: view.php:82 templates/view/memo.inc:21
 msgid "Note Details"
-msgstr "Detalhes da Nota"
+msgstr "Oharraren xehetasunak"
 
 #: notepads.php:110
 msgid "Note Lists"
-msgstr "Listas de Notas"
+msgstr "Ohar-zerrendak"
 
 #: templates/view/memo.inc:45 config/prefs.php.dist:40
 msgid "Note Text"
-msgstr "Texto da Nota"
+msgstr "Oharraren testua"
 
 #: templates/memo/memo.inc:26
 msgid "Note _Text"
-msgstr "_Texto da Nota"
+msgstr "Oha_rraren testua"
 
 #: view.php:57 memo.php:60
 msgid "Note not found."
-msgstr "Nota não encontrada."
+msgstr "Oharra ez da aurkitu."
 
 #: templates/memo/memo.inc:34
 msgid "Note_pad"
-msgstr "Li_vro de Notas"
+msgstr "Ohar-b_loka"
 
 #: templates/notepads/notepads.inc:79
 msgid "Notepad's name:"
-msgstr "Nome do Livro de Notas:"
+msgstr "Ohar-blokaren izena:"
 
 #: templates/notepads/notepads.inc:61
 msgid "Notepads"
-msgstr "Livros de Notas"
+msgstr "Ohar-blokak"
 
 #: notepads.php:33
 msgid "Notepads must have a name."
-msgstr "Livros de notas têm de ter um nome."
+msgstr "Ohar-blokek izen bat eduki behar dute."
 
 #: lib/Block/summary.php:3
 msgid "Notes Summary"
-msgstr "Sumário das Notas"
+msgstr "Oharren laburpena"
 
 #: lib/api.php:204 lib/api.php:292 lib/api.php:349 lib/api.php:378
 msgid "Permission Denied"
-msgstr "Permissão Negada"
+msgstr "Baimena ukatu da"
 
 #: templates/notepads/notepads.inc:82
 msgid "Permissions"
-msgstr "Permissões"
+msgstr "Baimenak"
 
 #: templates/view/memo.inc:15
 msgid "Really delete this note?"
-msgstr "Remover mesmo esta nota?"
+msgstr "Ziur zaude ohar hau ezabatu nahi duzula?"
 
 #: templates/list/header.inc:5 templates/list/header.inc:6
 msgid "Refresh List"
-msgstr "Actualizar Lista"
+msgstr "Freskatu zerrenda"
 
 #: templates/notepads/notepads.inc:96
 msgid "Reset"
-msgstr "Limpar"
+msgstr "Berrezarri"
 
 #: templates/memo/memo.inc:56
 msgid "Save"
-msgstr "Gravar"
+msgstr "Gorde"
 
 #: search.php:17 templates/search/search.inc:4 templates/search/search.inc:31
 msgid "Search"
-msgstr "Procurar"
+msgstr "Bilatu"
 
 #: list.php:57
 msgid "Search Results"
-msgstr "Resultados da Procurar"
+msgstr "Bilaketaren emaitza"
 
 #: templates/search/search.inc:17
 msgid "Search Scope"
-msgstr "Escopo de Procura"
+msgstr "Bilaketa-esparrua"
 
 #: templates/search/search.inc:9
 msgid "Search _Text"
-msgstr "Procurar _Texto"
+msgstr "Bilatzeko _testua"
 
 #: templates/notepads/notepads.inc:67
 msgid "Select a notepad"
-msgstr "Seleccione um livro de notas"
+msgstr "Hautatu ohar-blok bat"
 
 #: templates/menu.inc:16
 msgid "Select notepads to display:"
-msgstr "Seleccionar livros de notas a mostrar:"
+msgstr "Hautatu bistaratzeko ohar-blokak:"
 
 #: templates/data/export.inc:15
 msgid "Select the export format:"
-msgstr "Seleccione o formato de exportação:"
+msgstr "Hautatu esportazio-formatua:"
 
 #: templates/data/import.inc:37
 msgid "Select the file to import:"
-msgstr "Seleccione o ficheiro a importar:"
+msgstr "Hautatu inportatu beharreko fitxategia:"
 
 #: templates/data/import.inc:15
 msgid "Select the format of the source file:"
-msgstr "Seleccione o formato do ficheiro fonte:"
+msgstr "Hautatu iturburu-fitxategiaren formatua:"
 
 #: lib/Block/summary.php:37
 msgid "Show action buttons?"
-msgstr "Mostrar botões de acção?"
+msgstr "Hautatu ekintza-botoiak?"
 
 #: lib/Block/summary.php:40
 msgid "Show notepad name?"
-msgstr "Mostrar nome do livro de notas?"
+msgstr "Erakutsi ohar-blokaren izena?"
 
 #: lib/Block/summary.php:43
 msgid "Show notes from these categories"
-msgstr "Mostrar notas destas categorias"
+msgstr "Erakutsi kategoria hauetako oharrak"
 
 #: templates/list/memo_headers.inc:48
 msgid "Sort by Category"
-msgstr "Ordenar por Categoria"
+msgstr "Ordenatu kategoriaren arabera"
 
 #: templates/list/memo_headers.inc:44
 msgid "Sort by Note Text"
-msgstr "Ordenar por Texto da Nota"
+msgstr "Ordenatu ohar-testuaren arabera"
 
 #: memo.php:135
 #, php-format
 msgid "Successfully saved \"%s\"."
-msgstr "\"%s\" guardada com sucesso."
+msgstr "Behar bezala gorde da \"%s\"."
 
 #: data.php:195
 #, php-format
 msgid "The %s file didn't contain any notes."
-msgstr "O ficheiro %s não contém quaisquer notas."
+msgstr "%s fitxategiak ez dauka oharrik."
 
-# c-format
 #: memo.php:159
 msgid "The note was deleted."
-msgstr "A nota foi removida."
+msgstr "Oharra ezabatu egin da."
 
 #: notepads.php:46
 #, php-format
 msgid "The notepad \"%s\" couldn't be created: %s"
-msgstr "O livro de notas \"%s\" não pode ser criado: %s"
+msgstr "Ezin izan da sortu \"%s\" ohar-bloka: %s"
 
-# c-format
 #: notepads.php:48
 #, php-format
 msgid "The notepad \"%s\" has been created."
-msgstr "O livro de notas \"%s\" foi criado."
+msgstr "\"%s\" ohar-bloka sortu da."
 
-# c-format
 #: notepads.php:85
 #, php-format
 msgid "The notepad \"%s\" has been deleted."
-msgstr "O livro de notas \"%s\" foi removido."
+msgstr "\"%s\" ohar-bloka ezabatu da."
 
 #: notepads.php:56
 #, php-format
 msgid "The notepad \"%s\" has been saved."
-msgstr "O livro de notas \"%s\" foi guardado."
+msgstr "\"%s\" ohar-bloka gorde da."
 
 #: data.php:198
 #, php-format
 msgid "There was an error importing the data: %s"
-msgstr "Ocorreu um erro na importação dos dados: %s"
+msgstr "Errorea gertatu da datuak inportatzean: %s"
 
 #: lib/api.php:221
 msgid "There was an error importing the iCalendar data."
-msgstr "Ocorreu um erro na importação dos dados iCalendar."
+msgstr "Errorea gertatu da iCalendar datuak inportatzean."
 
 #: lib/api.php:397
 msgid "There was an error importing the vNote data."
-msgstr "Ocorreu um erro na importação dos dados vNote."
+msgstr "Errorea gertatu da vNote datuak inportatzean."
 
 #: memo.php:157
 #, php-format
 msgid "There was an error removing the note: %s"
-msgstr "Ocorreu um erro ao remover a nota: %s"
+msgstr "Errorea gertatu da oharra kentzean: %s"
 
 #: memo.php:133
 #, php-format
 msgid "There was an error saving the note: %s"
-msgstr "Ocorreu um erro ao gravar a nota: %s"
+msgstr "Errorea gertatu da oharra gordetzean: %s"
 
 #: view.php:46
 #, php-format
 msgid "There was an error viewing this notepad: %s"
-msgstr "Ocorreu um erro ao mostrar este livro de notas: %s"
+msgstr "Errorea gertatu da ohar-blok hau ikustean: %s"
 
 #: data.php:79
 msgid "There were no memos to export."
-msgstr "Não houve notas a exportar."
+msgstr "Ez dago zirkularrik esportatzeko."
 
 #: data.php:105
 msgid "This file format is not supported."
-msgstr "Este formato de ficheiro não é suportado."
+msgstr "Fitxategi-formatu hau ez da onartzen."
 
 #: notepads.php:80
 #, php-format
 msgid "Unable to delete \"%s\": %s"
-msgstr "Não consigo remover \"%s\": %s"
+msgstr "Ezin da \"%s\" ezabatu: %s"
 
 #: templates/memo/memo.inc:58
 msgid "Undo changes"
-msgstr "Desfazer alterações"
+msgstr "Desegin aldaketak"
 
-#: templates/view/memo.inc:27 templates/list/memo_summaries.inc:14
 #: lib/Mnemo.php:206 lib/Mnemo.php:207 lib/Mnemo.php:221 lib/Mnemo.php:222
-#: lib/Block/summary.php:98
+#: lib/Block/summary.php:98 templates/list/memo_summaries.inc:14
+#: templates/view/memo.inc:27
 msgid "Unfiled"
-msgstr "Sem categoria"
+msgstr "Sailkatu gabe"
 
 #: lib/api.php:257 lib/api.php:314 lib/api.php:405
 #, php-format
 msgid "Unsupported Content-Type: %s"
-msgstr "Tipo de conteúdo (Contente-Type) não suportado: %s"
+msgstr "Eduki mota hau ez da onartzen: %s"
 
 #: templates/data/import.inc:22
 msgid "Which Notepad should the notes be added to?"
-msgstr "A que Livro de Notas se deve adicionar as notas?"
+msgstr "Zein ohar-bloketan gehituko dira oharrak?"
 
 #: data.php:42 data.php:130 memo.php:35
 #, php-format
 msgid "You are not allowed to create more than %d notes."
-msgstr "Não tem autorização para criar mais do que %d notas."
+msgstr "Ez duzu baimenik %d ohar baino gehiago sortzeko."
 
 #: view.php:50
 #, php-format
 msgid "You do not have permission to view the notepad %s."
-msgstr "Não tem permissão para ver o livro de notas %s."
+msgstr "Ez duzu baimenik %s ohar-bloka ikusteko."
 
 #: notepads.php:65
 msgid "You must select a notepad to be deleted."
-msgstr "Tem de seleccionar o livro de notas a remover."
+msgstr "Ohar-blok bat hautatu behar duzu ezabatzeko."
 
 #: templates/prefs/notepadselect.inc:10
 msgid "Your default notepad:"
-msgstr "O seu livro de notas por omissão:"
+msgstr "Ohar-blok lehenetsia:"
 
 #: templates/notepads/notepads.inc:65
 msgid "Your notepads:"
-msgstr "Os seus Livros de Notas:"
+msgstr "Zure ohar-blokak:"
 
 #: templates/view/memo.inc:18
 msgid "_Back to Notepad"
-msgstr "_Voltar ao Livro de Notas"
+msgstr "_Itzuli ohar-blokera"
 
 #: templates/memo/memo.inc:51 templates/list/memo_headers.inc:48
 msgid "_Category"
-msgstr "_Categoria"
+msgstr "_Kategoria"
 
 #: templates/view/memo.inc:15
 msgid "_Delete"
-msgstr "_Remover"
+msgstr "E_zabatu"
 
 #: templates/view/memo.inc:11
 msgid "_Edit"
-msgstr "_Editar"
+msgstr "E_ditatu"
 
 #: templates/search/search.inc:20
 msgid "_First Line"
-msgstr "Pri_meira Linha"
+msgstr "_Lehen lerroa"
 
 #: lib/Mnemo.php:281
 msgid "_Import/Export"
-msgstr "_Importar/Exportar"
+msgstr "_Inportatu/esportatu"
 
 #: lib/Mnemo.php:264
 msgid "_List Notes"
-msgstr "_Listar Notas"
+msgstr "_Zerrendatu oharrak"
 
 #: lib/Mnemo.php:276
 msgid "_My Notepads"
-msgstr "Os _Meus Livros de Notas"
+msgstr "_Nire ohar-blokak"
 
 #: lib/Mnemo.php:269
 msgid "_New Note"
-msgstr "_Nova Nota"
+msgstr "_Ohar berria"
 
 #: lib/Mnemo.php:286
 msgid "_Print"
-msgstr "Im_primir"
+msgstr "I_nprimatu"
 
 #: lib/Mnemo.php:272
 msgid "_Search"
-msgstr "_Procurar"
+msgstr "_Bilatu"
 
 #: data.php:91 templates/data/export.inc:1
 msgid "notes.csv"
-msgstr "notas.csv"
+msgstr "oharrak.csv"
 
 #: data.php:33 templates/data/import.inc:18
 msgid "vNote"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 9abfb47..eca9ced 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mnemo 3.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2008-05-17 16:38+0300\n"
-"PO-Revision-Date: 2008-05-20 12:59+0200\n"
+"POT-Creation-Date: 2008-08-20 17:49+0300\n"
+"PO-Revision-Date: 2008-08-20 12:59+0200\n"
 "Last-Translator: Leena Heino <liinu at uta.fi>\n"
 "Language-Team: Finnish <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr "%s merkki
 msgid "%s file successfully imported"
 msgstr "%s tiedoston tuonti onnistui"
 
-#: lib/Mnemo.php:451 lib/Forms/DeleteNotepad.php:86
+#: lib/Mnemo.php:453 lib/Forms/DeleteNotepad.php:86
 #, php-format
 msgid "%s's Notepad"
 msgstr "%s:n muistilista"
@@ -64,7 +64,7 @@ msgstr "Peru"
 msgid "Category"
 msgstr "Kategoria"
 
-#: templates/notepad_list.php:31 notepads/index.php:32
+#: templates/notepad_list.php:29 notepads/index.php:32
 msgid "Change Permissions"
 msgstr "Muuta oikeuksia"
 
@@ -88,7 +88,7 @@ msgstr "Luo"
 msgid "Create Notepad"
 msgstr "Luo muistilista"
 
-#: templates/notepad_list.php:8
+#: templates/notepad_list.php:9
 msgid "Create a new Notepad"
 msgstr "Luo uusi muistilista"
 
@@ -112,7 +112,7 @@ msgstr "Oletusj
 msgid "Default sorting direction:"
 msgstr "Oletusjärjestyksen suunta:"
 
-#: templates/notepad_list.php:33 templates/view/memo.inc:16
+#: templates/notepad_list.php:31 templates/view/memo.inc:16
 #: notepads/index.php:33 lib/Forms/DeleteNotepad.php:45
 msgid "Delete"
 msgstr "Poista"
@@ -155,7 +155,7 @@ msgstr "N
 msgid "Do you want to confirm deleting entries?"
 msgstr "Haluatko varmistuksen poistettavista merkinnöistä?"
 
-#: templates/notepad_list.php:29 templates/view/memo.inc:13
+#: templates/notepad_list.php:27 templates/view/memo.inc:13
 #: notepads/index.php:31
 msgid "Edit"
 msgstr "Muokkaa"
@@ -170,7 +170,8 @@ msgstr "Muokkaa \"%s\""
 msgid "Edit %s"
 msgstr "Muokkaa %s"
 
-#: templates/list/memo_headers.inc:30 lib/Block/summary.php:74
+#: templates/list/memo_headers.inc:30 lib/Block/summary.php:79
+#: lib/Block/summary.php:80
 msgid "Edit Note"
 msgstr "Muokkaa muistiinpanoa"
 
@@ -183,7 +184,7 @@ msgstr "Muokkaa kategorioita ja v
 msgid "Edit: %s"
 msgstr "Muokkaa %s"
 
-#: templates/list/memo_summaries.inc:15 lib/Block/summary.php:93
+#: templates/list/memo_summaries.inc:15 lib/Block/summary.php:104
 msgid "Empty Note"
 msgstr "Tyhjä muistiinpano"
 
@@ -262,7 +263,7 @@ msgstr "Uusi muistiinpano"
 msgid "Next"
 msgstr "Seuraava"
 
-#: lib/api.php:286
+#: lib/api.php:337
 msgid "No iCalendar data was found."
 msgstr "iCalendar tietoja ei löytynyt."
 
@@ -274,7 +275,7 @@ msgstr "Ei t
 msgid "No notes match the current criteria."
 msgstr "Yksikään muistiinpano ei vastannut kriteereitä."
 
-#: lib/Block/summary.php:101
+#: lib/Block/summary.php:112
 msgid "No notes to display"
 msgstr "Ei muistiinpanoja näytettäväksi"
 
@@ -310,12 +311,12 @@ msgstr "Muistiinpanoa ei l
 msgid "Note_pad"
 msgstr "Muisti_lista"
 
-#: templates/notepad_list.php:15 templates/list/memo_headers.inc:33
+#: templates/notepad_list.php:17 templates/list/memo_headers.inc:33
 #: config/prefs.php.dist:60
 msgid "Notepad"
 msgstr "Muistilista"
 
-#: templates/notepad_list.php:12
+#: templates/notepad_list.php:14
 msgid "Notepad List"
 msgstr "Muistilistalistaus"
 
@@ -327,8 +328,8 @@ msgstr "Muistilistat"
 msgid "Notes Summary"
 msgstr "Muistiinpanojen yhteenveto"
 
-#: lib/api.php:161 lib/api.php:201 lib/api.php:234 lib/api.php:264
-#: lib/api.php:351 lib/api.php:419 lib/api.php:448
+#: lib/api.php:212 lib/api.php:252 lib/api.php:285 lib/api.php:315
+#: lib/api.php:402 lib/api.php:470 lib/api.php:499
 msgid "Permission Denied"
 msgstr "Käyttö kielletty"
 
@@ -391,11 +392,11 @@ msgstr "Jaetut muistilistat"
 msgid "Should the Notepad be shown in its own column in the List view?"
 msgstr "Näytetäänkö muistalistat omissa sarakkeissaan listanäkymässä?"
 
-#: lib/Block/summary.php:34
+#: lib/Block/summary.php:35
 msgid "Show action buttons?"
 msgstr "Näytä toimintopainikkeet."
 
-#: lib/Block/summary.php:37
+#: lib/Block/summary.php:39
 msgid "Show notepad name?"
 msgstr "Näytä muistilistannimi."
 
@@ -403,7 +404,7 @@ msgstr "N
 msgid "Show notepad options panel?"
 msgstr "Näytä muistilista asetuspaneelissa."
 
-#: lib/Block/summary.php:40
+#: lib/Block/summary.php:43
 msgid "Show notes from these categories"
 msgstr "Näytä muistiinpanot näistä kategorioista"
 
@@ -467,14 +468,21 @@ msgstr "Muistilista \"%s\" on talletettu."
 msgid "There was an error importing the data: %s"
 msgstr "Tapahtui virhe tuotaessa tietoa: %s"
 
-#: lib/api.php:280
+#: lib/api.php:331
 msgid "There was an error importing the iCalendar data."
 msgstr "Tapahtui virhe tuotaessa iCalendar tietoja."
 
-#: lib/api.php:467
+#: lib/api.php:518
 msgid "There was an error importing the vNote data."
 msgstr "Tapahtui virhe tuotaessa vNote tietoja."
 
+#: lib/api.php:168
+#, php-format
+msgid "There was an error removing notes for %s. Details have been logged."
+msgstr ""
+"Tapahtui virhe poistettaessa muistiinpanoa %s. Tarkemmat tiedot on "
+"talletettu lokitietoihin."
+
 #: memo.php:196
 #, php-format
 msgid "There was an error removing the note: %s"
@@ -506,7 +514,7 @@ msgstr "Muistiinpanon salausta ei voi purkaa:"
 msgid "This note has been encrypted, please provide the password below."
 msgstr "Tämä muistiinpano on salattu, anna salasana alla olevaan tilaan."
 
-#: memo.php:80 memo.php:88 view.php:100 view.php:108 lib/api.php:357
+#: memo.php:80 memo.php:88 view.php:100 view.php:108 lib/api.php:408
 #: lib/Driver/kolab.php:766 lib/Driver/sql.php:448
 msgid "This note has been encrypted."
 msgstr "Tämä muistiinpano on salattu."
@@ -532,11 +540,11 @@ msgstr "Ei voi tallentaa muistilistaa \"%s\": %s"
 
 #: templates/view/memo.inc:27 templates/list/memo_summaries.inc:17
 #: lib/Mnemo.php:267 lib/Mnemo.php:268 lib/Mnemo.php:282 lib/Mnemo.php:283
-#: lib/Block/summary.php:96
+#: lib/Block/summary.php:107
 msgid "Unfiled"
 msgstr "Luokittelematon"
 
-#: lib/api.php:316 lib/api.php:382 lib/api.php:475
+#: lib/api.php:367 lib/api.php:433 lib/api.php:526
 #, php-format
 msgid "Unsupported Content-Type: %s"
 msgstr "Ei tuettu Content-Type: %s"
@@ -558,6 +566,10 @@ msgstr "Sinulla ei saa olla kuin enint
 msgid "You are not allowed to delete this notepad."
 msgstr "Sinulla ei ole lupaa poistaa tätä muistilistaa."
 
+#: lib/api.php:100
+msgid "You are not allowed to remove user data."
+msgstr "Sinulla ei ole oikeuksia poistaa käyttäjätietoja."
+
 #: view.php:49 note/pdf.php:50
 #, php-format
 msgid "You do not have permission to view the notepad %s."
@@ -595,15 +607,15 @@ msgstr "_Salaa?"
 msgid "_For: "
 msgstr "_Syy:"
 
-#: lib/Mnemo.php:488
+#: lib/Mnemo.php:490
 msgid "_Import/Export"
 msgstr "_Tuo/Vie"
 
-#: lib/Mnemo.php:475
+#: lib/Mnemo.php:477
 msgid "_List Notes"
 msgstr "_Listaa muistiinpanot"
 
-#: lib/Mnemo.php:480
+#: lib/Mnemo.php:482
 msgid "_New Note"
 msgstr "_Uusi muistiinpano"
 
@@ -612,11 +624,11 @@ msgstr "_Uusi muistiinpano"
 msgid "_Password"
 msgstr "S_alasana"
 
-#: lib/Mnemo.php:493
+#: lib/Mnemo.php:495
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: lib/Mnemo.php:484
+#: lib/Mnemo.php:486
 msgid "_Search"
 msgstr "_Haku"
 
diff --git a/po/mnemo.pot b/po/mnemo.pot
index 7180523..a5a64f8 100644
--- a/po/mnemo.pot
+++ b/po/mnemo.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2008-05-21 00:16+0200\n"
+"POT-Creation-Date: 2008-09-06 11:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -31,11 +31,11 @@ msgstr ""
 msgid "%s's Notepad"
 msgstr ""
 
-#: memo.php:201
+#: memo.php:200
 msgid "Access denied deleting note."
 msgstr ""
 
-#: memo.php:150 memo.php:153
+#: memo.php:143 memo.php:146
 msgid "Access denied moving the note."
 msgstr ""
 
@@ -65,7 +65,7 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#: templates/notepad_list.php:31 notepads/index.php:32
+#: templates/notepad_list.php:29 notepads/index.php:32
 msgid "Change Permissions"
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Create Notepad"
 msgstr ""
 
-#: templates/notepad_list.php:8
+#: templates/notepad_list.php:9
 msgid "Create a new Notepad"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Default sorting direction:"
 msgstr ""
 
-#: templates/notepad_list.php:33 templates/view/memo.inc:16
+#: templates/notepad_list.php:31 templates/view/memo.inc:16
 #: notepads/index.php:33 lib/Forms/DeleteNotepad.php:45
 msgid "Delete"
 msgstr ""
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Do you want to confirm deleting entries?"
 msgstr ""
 
-#: templates/notepad_list.php:29 templates/view/memo.inc:13
+#: templates/notepad_list.php:27 templates/view/memo.inc:13
 #: notepads/index.php:31
 msgid "Edit"
 msgstr ""
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: lib/api.php:286
+#: lib/api.php:337
 msgid "No iCalendar data was found."
 msgstr ""
 
@@ -312,12 +312,12 @@ msgstr ""
 msgid "Note_pad"
 msgstr ""
 
-#: templates/notepad_list.php:15 templates/list/memo_headers.inc:33
+#: templates/notepad_list.php:17 templates/list/memo_headers.inc:33
 #: config/prefs.php.dist:60
 msgid "Notepad"
 msgstr ""
 
-#: templates/notepad_list.php:12
+#: templates/notepad_list.php:14
 msgid "Notepad List"
 msgstr ""
 
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Notes Summary"
 msgstr ""
 
-#: lib/api.php:161 lib/api.php:201 lib/api.php:234 lib/api.php:264
-#: lib/api.php:351 lib/api.php:419 lib/api.php:448
+#: lib/api.php:212 lib/api.php:252 lib/api.php:285 lib/api.php:315
+#: lib/api.php:402 lib/api.php:470 lib/api.php:499
 msgid "Permission Denied"
 msgstr ""
 
@@ -419,7 +419,7 @@ msgstr ""
 msgid "Sort by Notepad"
 msgstr ""
 
-#: memo.php:175
+#: memo.php:174
 #, php-format
 msgid "Successfully saved \"%s\"."
 msgstr ""
@@ -438,7 +438,7 @@ msgstr ""
 msgid "The Notes backend is not currently available: %s"
 msgstr ""
 
-#: memo.php:198
+#: memo.php:197
 msgid "The note was deleted."
 msgstr ""
 
@@ -467,20 +467,25 @@ msgstr ""
 msgid "There was an error importing the data: %s"
 msgstr ""
 
-#: lib/api.php:280
+#: lib/api.php:331
 msgid "There was an error importing the iCalendar data."
 msgstr ""
 
-#: lib/api.php:467
+#: lib/api.php:518
 msgid "There was an error importing the vNote data."
 msgstr ""
 
-#: memo.php:196
+#: lib/api.php:168
+#, php-format
+msgid "There was an error removing notes for %s. Details have been logged."
+msgstr ""
+
+#: memo.php:195
 #, php-format
 msgid "There was an error removing the note: %s"
 msgstr ""
 
-#: memo.php:173
+#: memo.php:172
 #, php-format
 msgid "There was an error saving the note: %s"
 msgstr ""
@@ -506,8 +511,8 @@ msgstr ""
 msgid "This note has been encrypted, please provide the password below."
 msgstr ""
 
-#: view.php:100 view.php:108 memo.php:80 memo.php:88 lib/api.php:357
-#: lib/Driver/kolab.php:766 lib/Driver/sql.php:448
+#: view.php:100 view.php:108 memo.php:80 memo.php:88 lib/api.php:408
+#: lib/Driver/kolab.php:766 lib/Driver/sql.php:458
 msgid "This note has been encrypted."
 msgstr ""
 
@@ -536,7 +541,7 @@ msgstr ""
 msgid "Unfiled"
 msgstr ""
 
-#: lib/api.php:316 lib/api.php:382 lib/api.php:475
+#: lib/api.php:367 lib/api.php:433 lib/api.php:526
 #, php-format
 msgid "Unsupported Content-Type: %s"
 msgstr ""
@@ -558,6 +563,10 @@ msgstr ""
 msgid "You are not allowed to delete this notepad."
 msgstr ""
 
+#: lib/api.php:100
+msgid "You are not allowed to remove user data."
+msgstr ""
+
 #: view.php:49 note/pdf.php:50
 #, php-format
 msgid "You do not have permission to view the notepad %s."
diff --git a/po/nl_NL.po b/po/nl_NL.po
index f203745..c49efc6 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,13 +1,13 @@
 # Mnemo Dutch translation.
 # Copyright (C) 2002 Jan Kuipers.
-# Jan Kuipers <jrkuipers at lauwerscollege.nl>, 2002-2007.
+# Jan Kuipers <jrkuipers at lauwerscollege.nl>, 2002-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Mneno H3 (2.2-cvs)\n"
+"Project-Id-Version: Mneno H3 (2.2.1-cvs)\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2007-11-21 19:43+0100\n"
-"PO-Revision-Date: 2007-11-22 00:15+0100\n"
+"POT-Creation-Date: 2008-08-08 23:32+0200\n"
+"PO-Revision-Date: 2008-08-09 12:48+0200\n"
 "Last-Translator: Jan Kuipers <jrkuipers at lauwerscollege.nl>\n"
 "Language-Team: Dutch <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 msgid "%s characters"
 msgstr "%s tekens"
 
-#: data.php:201
+#: data.php:200
 #, php-format
 msgid "%s file successfully imported"
 msgstr "%s bestand met succes geimporteerd"
 
-#: notepads.php:102 lib/Mnemo.php:429
+#: lib/Mnemo.php:451 lib/Forms/DeleteNotepad.php:86
 #, php-format
 msgid "%s's Notepad"
 msgstr "%s's notitieboek"
@@ -34,7 +34,7 @@ msgstr "%s's notitieboek"
 msgid "Access denied deleting note."
 msgstr "Toegang geweigerd bij verwijderen van notitie."
 
-#: memo.php:152 memo.php:155
+#: memo.php:150 memo.php:153
 msgid "Access denied moving the note."
 msgstr "Toegang geweigerd bij verplaatsen van de notitie."
 
@@ -48,7 +48,7 @@ msgstr "Toegang geweigerd bij opslaan van notitie in %s."
 msgid "Access denied saving note: %s"
 msgstr "Toegang geweigerd bij opslaan van notitie: %s"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:70
 msgid "Ascending"
 msgstr "Toenemend"
 
@@ -56,19 +56,23 @@ msgstr "Toenemend"
 msgid "CSV"
 msgstr "CSV"
 
+#: lib/Forms/DeleteNotepad.php:45 lib/Forms/DeleteNotepad.php:51
+msgid "Cancel"
+msgstr "Afbreken"
+
 #: data.php:54 templates/view/memo.inc:26
 msgid "Category"
 msgstr "Categorie"
 
-#: templates/notepads/notepads.inc:22
-msgid "Change"
-msgstr "Wijzigen"
+#: notepads/index.php:32 templates/notepad_list.php:29
+msgid "Change Permissions"
+msgstr "Rechten wijzigen"
 
-#: config/prefs.php.dist:15
+#: config/prefs.php.dist:14
 msgid "Change your note sorting and display options."
 msgstr "Wijzig uw notitie sorteer- en weergaveopties."
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:21
 msgid "Choose your default Notepad."
 msgstr "Kies standaard notitieboek."
 
@@ -76,10 +80,18 @@ msgstr "Kies standaard notitieboek."
 msgid "Close Search"
 msgstr "Zoeken afsluiten"
 
-#: templates/notepads/notepads.inc:15 templates/notepads/notepads.inc:64
+#: lib/Forms/CreateNotepad.php:39
 msgid "Create"
 msgstr "Maken"
 
+#: lib/Forms/CreateNotepad.php:34
+msgid "Create Notepad"
+msgstr "Notitieboek maken"
+
+#: templates/notepad_list.php:9
+msgid "Create a new Notepad"
+msgstr "Een nieuw notitieboek maken"
+
 #: templates/view/memo.inc:32
 msgid "Created"
 msgstr "Gemaakt"
@@ -88,27 +100,33 @@ msgstr "Gemaakt"
 msgid "Decrypt"
 msgstr "Decoderen"
 
-#: config/prefs.php.dist:21
+#: config/prefs.php.dist:20
 msgid "Default Notepad"
 msgstr "Standaard notitieboek"
 
-#: config/prefs.php.dist:62
+#: config/prefs.php.dist:61
 msgid "Default sorting criteria:"
 msgstr "Standaard sorteercriteria:"
 
-#: config/prefs.php.dist:73
+#: config/prefs.php.dist:72
 msgid "Default sorting direction:"
 msgstr "Standaard sorteervolgorde:"
 
-#: templates/view/memo.inc:16 templates/notepads/notepads.inc:65
+#: notepads/index.php:33 lib/Forms/DeleteNotepad.php:45
+#: templates/notepad_list.php:31 templates/view/memo.inc:16
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: config/prefs.php.dist:28
+#: lib/Forms/DeleteNotepad.php:40
+#, php-format
+msgid "Delete %s"
+msgstr "Verwijder %s"
+
+#: config/prefs.php.dist:27
 msgid "Delete Confirmation"
 msgstr "Verwijderbevestiging"
 
-#: config/prefs.php.dist:29
+#: config/prefs.php.dist:28
 msgid "Delete button behaviour"
 msgstr "Verwijderknopgedrag"
 
@@ -116,27 +134,28 @@ msgstr "Verwijderknopgedrag"
 msgid "Delete this note"
 msgstr "Verwijder deze notitie"
 
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:71
 msgid "Descending"
 msgstr "Afnemend"
 
-#: templates/notepads/notepads.inc:60
-msgid "Description:"
-msgstr "Beschrijving:"
+#: lib/Forms/CreateNotepad.php:37 lib/Forms/EditNotepad.php:44
+msgid "Description"
+msgstr "Beschrijving"
 
 #: lib/Driver/kolab.php:556
 #, php-format
 msgid "Did not find note %s"
 msgstr "Notitie %s niet gevonden"
 
-#: config/prefs.php.dist:14
+#: config/prefs.php.dist:13
 msgid "Display Options"
 msgstr "Weergaveopties"
 
-#: config/prefs.php.dist:118
+#: config/prefs.php.dist:117
 msgid "Do you want to confirm deleting entries?"
 msgstr "Wilt u het verwijderen van invoer bevestigen?"
 
+#: notepads/index.php:31 templates/notepad_list.php:27
 #: templates/view/memo.inc:13
 msgid "Edit"
 msgstr "Bewerken"
@@ -146,7 +165,13 @@ msgstr "Bewerken"
 msgid "Edit \"%s\""
 msgstr "\"%s\" bewerken"
 
-#: lib/Block/summary.php:74 templates/list/memo_headers.inc:30
+#: lib/Forms/EditNotepad.php:40
+#, php-format
+msgid "Edit %s"
+msgstr "%s bewerken"
+
+#: lib/Block/summary.php:79 lib/Block/summary.php:80
+#: templates/list/memo_headers.inc:30
 msgid "Edit Note"
 msgstr "Notitie bewerken"
 
@@ -159,7 +184,7 @@ msgstr "Categorie
 msgid "Edit: %s"
 msgstr "Bewerken: %s"
 
-#: lib/Block/summary.php:93 templates/list/memo_summaries.inc:15
+#: lib/Block/summary.php:104 templates/list/memo_summaries.inc:15
 msgid "Empty Note"
 msgstr "Lege notitie"
 
@@ -179,7 +204,7 @@ msgstr "Exporteren"
 msgid "Export Notes"
 msgstr "Notities exporteren"
 
-#: config/prefs.php.dist:13 config/prefs.php.dist:20 config/prefs.php.dist:27
+#: config/prefs.php.dist:12 config/prefs.php.dist:19 config/prefs.php.dist:26
 msgid "General Options"
 msgstr "Algemene opties"
 
@@ -188,7 +213,7 @@ msgstr "Algemene opties"
 msgid "Import Notes, Step %d"
 msgstr "Notities importeren, stap %d"
 
-#: data.php:207
+#: data.php:206
 msgid "Import/Export Notes"
 msgstr "Notities importeren/exporteren"
 
@@ -200,7 +225,11 @@ msgstr "In: "
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
 
-#: lib/api.php:77
+#: notepads/index.php:37 templates/notepad_list.php:2
+msgid "Manage Notepads"
+msgstr "Notitieboeken beheren"
+
+#: lib/api.php:82
 msgid "Maximum Number of Notes"
 msgstr "Maximum aantal notities"
 
@@ -216,7 +245,7 @@ msgstr "Menulijst"
 msgid "More Options..."
 msgstr "Meer opties..."
 
-#: templates/panel.inc:40
+#: templates/panel.inc:50
 msgid "My Notepads:"
 msgstr "Mijn notitieboeken:"
 
@@ -224,11 +253,11 @@ msgstr "Mijn notitieboeken:"
 msgid "My Notes"
 msgstr "Mijn notities"
 
-#: templates/notepads/notepads.inc:53
-msgid "Name:"
-msgstr "Naam:"
+#: lib/Forms/CreateNotepad.php:36 lib/Forms/EditNotepad.php:43
+msgid "Name"
+msgstr "Naam"
 
-#: memo.php:57 lib/Block/tree_menu.php:24
+#: memo.php:57 lib/Block/tree_menu.php:23
 msgid "New Note"
 msgstr "Nieuwe notitie"
 
@@ -236,7 +265,7 @@ msgstr "Nieuwe notitie"
 msgid "Next"
 msgstr "Volgende"
 
-#: lib/api.php:258
+#: lib/api.php:332
 msgid "No iCalendar data was found."
 msgstr "Geen iCalendardata gevonden."
 
@@ -248,7 +277,7 @@ msgstr "Geen notities komen overeen"
 msgid "No notes match the current criteria."
 msgstr "Geen notities die overeen komen met de huidige criteria."
 
-#: lib/Block/summary.php:101
+#: lib/Block/summary.php:112
 msgid "No notes to display"
 msgstr "Geen notities weer te geven"
 
@@ -256,23 +285,19 @@ msgstr "Geen notities weer te geven"
 msgid "No_te"
 msgstr "No_titie"
 
-#: lib/Driver/sql.php:175
+#: lib/Driver/sql.php:195
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: config/prefs.php.dist:60
+#: config/prefs.php.dist:59
 msgid "Note Category"
 msgstr "Notitiecategorie"
 
-#: view.php:108
+#: view.php:121
 msgid "Note Details"
 msgstr "Notitiedetails"
 
-#: notepads.php:113
-msgid "Note Lists"
-msgstr "Notitielijsten"
-
-#: config/prefs.php.dist:59
+#: config/prefs.php.dist:58
 msgid "Note Text"
 msgstr "Notitietekst"
 
@@ -288,40 +313,47 @@ msgstr "Notitie niet gevonden."
 msgid "Note_pad"
 msgstr "Notitie_boek"
 
-#: templates/list/memo_headers.inc:33 config/prefs.php.dist:61
+#: templates/notepad_list.php:17 templates/list/memo_headers.inc:33
+#: config/prefs.php.dist:60
 msgid "Notepad"
 msgstr "Notitieboek"
 
+#: templates/notepad_list.php:14
+msgid "Notepad List"
+msgstr "Notitieboek lijst"
+
 #: templates/panel.inc:32 templates/panel.inc:33
-#: templates/notepads/notepads.inc:42
 msgid "Notepads"
 msgstr "Notitieboeken"
 
-#: notepads.php:32
-msgid "Notepads must have a name."
-msgstr "Notitieboeken moeten een naam hebben."
-
-#: templates/notepads/notepads.inc:45
-msgid "Notepads:"
-msgstr "Notitieboeken:"
-
 #: lib/Block/summary.php:3
 msgid "Notes Summary"
 msgstr "Notitiesamenvatting"
 
-#: lib/api.php:235 lib/api.php:323 lib/api.php:382 lib/api.php:411
+#: lib/api.php:207 lib/api.php:247 lib/api.php:280 lib/api.php:310
+#: lib/api.php:397 lib/api.php:465 lib/api.php:494
 msgid "Permission Denied"
 msgstr "Toegang geweigerd"
 
-#: templates/notepads/notepads.inc:56
-msgid "Permissions"
-msgstr "Rechten"
+#: lib/Forms/DeleteNotepad.php:56
+msgid "Permission denied"
+msgstr "Toegang geweigerd"
+
+#: lib/Forms/DeleteNotepad.php:43
+#, php-format
+msgid ""
+"Really delete the notepad \"%s\"? This cannot be undone and all data on this "
+"notepad will be permanently removed."
+msgstr ""
+"Notitieboek \"%s\" echt verwijderen? Dit kan niet ongedaan worden gemaakt en "
+"alle data in dit notitieboek zal definitief worden verwijderd."
 
 #: templates/view/memo.inc:16
 msgid "Really delete this note?"
 msgstr "Echt deze notitie verwijderen?"
 
-#: templates/panel.inc:59 templates/memo/memo.inc:57
+#: lib/Forms/EditNotepad.php:46 templates/panel.inc:68
+#: templates/memo/memo.inc:57
 msgid "Save"
 msgstr "Opslaan"
 
@@ -329,7 +361,7 @@ msgstr "Opslaan"
 msgid "Save as PDF"
 msgstr "Opslaan als PDF"
 
-#: search.php:17 lib/Block/tree_menu.php:45 templates/list/header.inc:4
+#: search.php:17 lib/Block/tree_menu.php:44 templates/list/header.inc:4
 #: templates/search/search.inc:4 templates/search/search.inc:27
 msgid "Search"
 msgstr "Zoeken"
@@ -338,9 +370,9 @@ msgstr "Zoeken"
 msgid "Search Results"
 msgstr "Zoekresultaten"
 
-#: templates/notepads/notepads.inc:47
-msgid "Select a notepad"
-msgstr "Selecteer een notitieboek"
+#: templates/panel.inc:38
+msgid "Search for Notepads:"
+msgstr "Zoek naar notitieboeken:"
 
 #: templates/data/export.inc:9
 msgid "Select the export format:"
@@ -354,29 +386,29 @@ msgstr "Selecteer het importbestand:"
 msgid "Select the format of the source file:"
 msgstr "Selecteer het formaat van het bronbestand:"
 
-#: templates/panel.inc:50
+#: templates/panel.inc:59
 msgid "Shared Notepads:"
 msgstr "Gedeelde notitieboeken:"
 
-#: config/prefs.php.dist:40
+#: config/prefs.php.dist:39
 msgid "Should the Notepad be shown in its own column in the List view?"
 msgstr ""
 "Dient het notitieboek in een eigen kolom in de lijstweergave weergegeven te "
 "worden?"
 
-#: lib/Block/summary.php:34
+#: lib/Block/summary.php:35
 msgid "Show action buttons?"
 msgstr "Bewerkingsknoppen weergeven?"
 
-#: lib/Block/summary.php:37
+#: lib/Block/summary.php:39
 msgid "Show notepad name?"
 msgstr "Notitieboeknamen weergeven?"
 
-#: config/prefs.php.dist:50
+#: config/prefs.php.dist:49
 msgid "Show notepad options panel?"
 msgstr "Notitieboekoptiespaneel weergeven?"
 
-#: lib/Block/summary.php:40
+#: lib/Block/summary.php:43
 msgid "Show notes from these categories"
 msgstr "Notities van deze categorieen weergeven"
 
@@ -397,7 +429,7 @@ msgstr "Sorteren op notitieboek"
 msgid "Successfully saved \"%s\"."
 msgstr "\"%s\" met succes opgeslagen."
 
-#: data.php:195
+#: data.php:194
 #, php-format
 msgid "The %s file didn't contain any notes."
 msgstr "Het %s bestand bevatte geen notities."
@@ -415,39 +447,45 @@ msgstr "Het notitie backend is momenteel niet beschikbaar: %s"
 msgid "The note was deleted."
 msgstr "De notitie is verwijderd."
 
-#: notepads.php:45 notepads.php:56
-#, php-format
-msgid "The notepad \"%s\" couldn't be created: %s"
-msgstr "Het notitieboek \"%s\" kon niet worden aangemaakt: %s"
-
-#: notepads.php:47
+#: notepads/create.php:31
 #, php-format
 msgid "The notepad \"%s\" has been created."
 msgstr "Het notitieboek \"%s\" is aangemaakt."
 
-#: notepads.php:88
+#: notepads/delete.php:48
 #, php-format
 msgid "The notepad \"%s\" has been deleted."
 msgstr "Het notitieboek \"%s\" is verwijderd."
 
-#: notepads.php:58
+#: notepads/edit.php:42
+#, php-format
+msgid "The notepad \"%s\" has been renamed to \"%s\"."
+msgstr "Het notitieboek \"%s\" is hernoemd naar \"%s\"."
+
+#: notepads/edit.php:44
 #, php-format
 msgid "The notepad \"%s\" has been saved."
 msgstr "Het notitieboek \"%s\" is opgeslagen."
 
-#: data.php:198
+#: data.php:197
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Een fout bij het importeren van de data: %s"
 
-#: lib/api.php:252
+#: lib/api.php:326
 msgid "There was an error importing the iCalendar data."
 msgstr "Een fout bij het importeren van de iCalendardata."
 
-#: lib/api.php:430
+#: lib/api.php:513
 msgid "There was an error importing the vNote data."
 msgstr "Een fout bij het importeren van de vNote data."
 
+#: lib/api.php:163
+#, php-format
+msgid "There was an error removing notes for %s. Details have been logged."
+msgstr ""
+"Een fout bij het verwijderen van notities voor %s. Details zijn gelogd."
+
 #: memo.php:196
 #, php-format
 msgid "There was an error removing the note: %s"
@@ -463,7 +501,7 @@ msgstr "Een probleem bij het opslaan van de notitie: %s"
 msgid "There was an error viewing this notepad: %s"
 msgstr "Een probleem bij het bekijken van dit notitieboek: %s"
 
-#: data.php:79
+#: data.php:78
 msgid "There were no memos to export."
 msgstr "Er waren geen notities om te exporteren."
 
@@ -471,20 +509,24 @@ msgstr "Er waren geen notities om te exporteren."
 msgid "This file format is not supported."
 msgstr "Dit bestandsformaat wordt niet ondersteund."
 
-#: memo.php:91 view.php:98
+#: memo.php:91 view.php:111
 msgid "This note cannot be decrypted:"
 msgstr "Deze notitie kan niet worden gedecodeerd:"
 
-#: memo.php:83 view.php:90
+#: memo.php:83 view.php:103
 msgid "This note has been encrypted, please provide the password below."
 msgstr "Deze notitie is gecodeerd, geef hieronder het wachtwoord, a.u.b."
 
-#: memo.php:80 memo.php:88 view.php:87 view.php:95 lib/Driver/kolab.php:752
-#: lib/Driver/sql.php:438
+#: memo.php:80 memo.php:88 view.php:100 view.php:108 lib/api.php:403
+#: lib/Driver/kolab.php:766 lib/Driver/sql.php:448
 msgid "This note has been encrypted."
 msgstr "Deze notitie is gecodeerd."
 
-#: notepads.php:83
+#: notepads/delete.php:24
+msgid "This notepad cannot be deleted"
+msgstr "Dit notitieboek kan niet worden verwijderd"
+
+#: lib/Forms/DeleteNotepad.php:63
 #, php-format
 msgid "Unable to delete \"%s\": %s"
 msgstr "Niet in staat om \"%s\": %s te verwijderen"
@@ -494,13 +536,18 @@ msgstr "Niet in staat om \"%s\": %s te verwijderen"
 msgid "Unable to load the definition of %s."
 msgstr "Niet in staat om de definitie van %s te laden."
 
-#: lib/Mnemo.php:245 lib/Mnemo.php:246 lib/Mnemo.php:260 lib/Mnemo.php:261
-#: lib/Block/summary.php:96 templates/list/memo_summaries.inc:17
+#: lib/Forms/EditNotepad.php:55
+#, php-format
+msgid "Unable to save notepad \"%s\": %s"
+msgstr "Niet in staat notitieboek \"%s\" op te slaan: %s"
+
+#: lib/Mnemo.php:267 lib/Mnemo.php:268 lib/Mnemo.php:282 lib/Mnemo.php:283
+#: lib/Block/summary.php:107 templates/list/memo_summaries.inc:17
 #: templates/view/memo.inc:27
 msgid "Unfiled"
 msgstr "Onbenoemd"
 
-#: lib/api.php:288 lib/api.php:345 lib/api.php:438
+#: lib/api.php:362 lib/api.php:428 lib/api.php:521
 #, php-format
 msgid "Unsupported Content-Type: %s"
 msgstr "Niet ondersteund Content-Type: %s"
@@ -509,27 +556,35 @@ msgstr "Niet ondersteund Content-Type: %s"
 msgid "Which Notepad should the notes be added to?"
 msgstr "Aan welk notitieboek dienen de notities toegevoegd te worden?"
 
-#: memo.php:37 data.php:42 data.php:130
+#: notepads/edit.php:28
+msgid "You are not allowed to change this notepad."
+msgstr "Het is u niet toegestaan dit notitieboek te wijzigen."
+
+#: memo.php:37 data.php:42 data.php:129
 #, php-format
 msgid "You are not allowed to create more than %d notes."
 msgstr "Het is u niet toegestaan om meer dan %d notities te maken."
 
+#: notepads/delete.php:35
+msgid "You are not allowed to delete this notepad."
+msgstr "Het is u niet toegestaan dit notitieboek te verwijderen."
+
+#: lib/api.php:100
+msgid "You are not allowed to remove user data."
+msgstr "Het is u niet toegestaan gebruikersdata te verwijderen."
+
 #: view.php:49 note/pdf.php:50
 #, php-format
 msgid "You do not have permission to view the notepad %s."
 msgstr "U heeft geen recht om het notitieboek %s te bekijken."
 
-#: notepads.php:68
-msgid "You must select a notepad to be deleted."
-msgstr "U dient een notitieboek te selecteren om te verwijderen."
-
 #: templates/prefs/notepadselect.inc:10
 msgid "Your default notepad:"
 msgstr "Uw standaard notitieboek:"
 
 #: templates/panel.inc:45
-msgid "[Manage My Notepads]"
-msgstr "[Beheer Mijn notitieboeken]"
+msgid "[Manage Notepads]"
+msgstr "[Notitieboeken beheren]"
 
 #: templates/search/search.inc:21
 msgid "_Body"
@@ -555,15 +610,15 @@ msgstr "_Coderen?"
 msgid "_For: "
 msgstr "_Voor: "
 
-#: lib/Mnemo.php:466
+#: lib/Mnemo.php:488
 msgid "_Import/Export"
 msgstr "_Import/Export"
 
-#: lib/Mnemo.php:453
+#: lib/Mnemo.php:475
 msgid "_List Notes"
 msgstr "Notities weer_geven"
 
-#: lib/Mnemo.php:458
+#: lib/Mnemo.php:480
 msgid "_New Note"
 msgstr "_Nieuwe notitie"
 
@@ -572,11 +627,11 @@ msgstr "_Nieuwe notitie"
 msgid "_Password"
 msgstr "_Wachtwoord"
 
-#: lib/Mnemo.php:471
+#: lib/Mnemo.php:493
 msgid "_Print"
 msgstr "A_fdrukken"
 
-#: lib/Mnemo.php:462
+#: lib/Mnemo.php:484
 msgid "_Search"
 msgstr "_Zoeken"
 
@@ -584,12 +639,21 @@ msgstr "_Zoeken"
 msgid "_Title"
 msgstr "_Titel"
 
-#: lib/Block/tree_menu.php:34
+#: view.php:74 view.php:83
+#, php-format
+msgid "by %s"
+msgstr "door %s"
+
+#: view.php:76 view.php:85
+msgid "by me"
+msgstr "door mij"
+
+#: lib/Block/tree_menu.php:33
 #, php-format
 msgid "in %s"
 msgstr "in %s"
 
-#: data.php:91 templates/data/export.inc:4
+#: data.php:90 templates/data/export.inc:4
 msgid "notes.csv"
 msgstr "notes.csv"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bfda023..5e4b128 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,531 +1,655 @@
-# translation of pt_BR.po to Brazilian Portuguese
+# translation of pt_BR.po to Português brasileiro
 # This file is distributed under the same license as the Mnemo package.
 # Copyright (C) YEAR Horde Project.
-# Fabio Gomes <flgomes at fazenda.sp.gov.br>, 2005.
 #
+# Fabio Gomes <flgomes at fazenda.sp.gov.br>, 2005.
+# Luis Felipe Marzagao <duli at fedoraproject.org>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-11 21:33+0100\n"
-"PO-Revision-Date: 2005-03-17 12:25-0300\n"
-"Last-Translator: Fabio Gomes <flgomes at fazenda.sp.gov.br>\n"
-"Language-Team: Brazilian Portuguese <i18n at lists.horde.org>\n"
+"POT-Creation-Date: 2008-08-31 21:29-0300\n"
+"PO-Revision-Date: 2008-07-06 23:36-0300\n"
+"Last-Translator: Luis Felipe Marzagao <duli at fedoraproject.org>\n"
+"Language-Team: Português brasileiro <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: templates/list/header.inc:9
+#: templates/memo/memo.inc:53
 #, php-format
-msgid "%d notes"
-msgstr "%d anotações"
+msgid "%s characters"
+msgstr "%s caracteres"
 
-#: data.php:161
+#: data.php:200
 #, php-format
 msgid "%s file successfully imported"
 msgstr "Arquivo %s importado com sucesso"
 
-#: notepads.php:90 lib/base.php:95
+#: lib/Mnemo.php:451 lib/Forms/DeleteNotepad.php:86
 #, php-format
 msgid "%s's Notepad"
 msgstr "Anotações de %s"
 
-#: templates/list/header.inc:9
-msgid "1 note"
-msgstr "1 anotação"
-
-#: memo.php:137
+#: memo.php:201
 msgid "Access denied deleting note."
 msgstr "Acesso negado ao excluir anotação."
 
-#: memo.php:94 memo.php:97
+#: memo.php:150 memo.php:153
 msgid "Access denied moving the note."
 msgstr "Acesso negado ao mover a anotação."
 
-#: memo.php:69
+#: memo.php:120
 #, php-format
 msgid "Access denied saving note to %s."
-msgstr "Acesso negado salvando a anotação em %s."
+msgstr "Acesso negado ao gravar a anotação em %s."
 
-#: memo.php:67
+#: memo.php:118
 #, php-format
 msgid "Access denied saving note: %s"
-msgstr "Acesso negado salvando anotação: %s"
-
-#: templates/prefs/showsummaryselect.inc:103
-msgid "Add category"
-msgstr "Adicionar categoria"
-
-#: memo.php:37
-msgid "Adding A New Note"
-msgstr "Adicionando Uma Nova Anotação"
+msgstr "Acesso negado ao gravar a anotação: %s"
 
-#: config/prefs.php.dist:44
+#: config/prefs.php.dist:70
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: templates/prefs/showsummaryselect.inc:99
-msgid "Available Categories:"
-msgstr "Categorias Disponíveis:"
-
-#: templates/view/memo.inc:28 templates/view/memo.inc:67
-msgid "Back to Notepad"
-msgstr "Voltar ao Bloco de Notas"
-
-#: templates/notepads/notepads.inc:97
-msgid "Back to Notepad Options"
-msgstr "Voltar às Opções do Bloco de Notas"
-
-#: data.php:28 templates/data/import.inc:17
+#: data.php:32 templates/data/import.inc:11
 msgid "CSV"
 msgstr "CSV"
 
-#: data.php:40 templates/view/memo.inc:15
+#: lib/Forms/DeleteNotepad.php:45 lib/Forms/DeleteNotepad.php:51
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: data.php:54 templates/view/memo.inc:26
 msgid "Category"
 msgstr "Categoria"
 
-#: templates/notepads/notepads.inc:22
-msgid "Change"
-msgstr "Alterar"
-
-#: templates/list/memo_headers.inc:6 templates/list/memo_headers.inc:10
-msgid "Change sort direction"
-msgstr "Alterar direção de ordenação"
+#: notepads/index.php:32 templates/notepad_list.php:31
+msgid "Change Permissions"
+msgstr "Alterar Permissões"
 
-#: config/prefs.php.dist:15
+#: config/prefs.php.dist:14
 msgid "Change your note sorting and display options."
 msgstr "Altera a ordenação de suas anotações e opções de visualização."
 
-#: templates/prefs/showsummaryselect.inc:93
-msgid "Choose the memo categories to list in the summary view."
-msgstr ""
-"Escolha as categorias de memorandos a serem listadas na visualização "
-"resumida."
-
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:21
 msgid "Choose your default Notepad."
-msgstr "Escolha seu Bloco de Notas padrão."
+msgstr "Escolha seu Bloco de Anotações padrão."
 
-#: templates/search/search.inc:32
-msgid "Clear Form"
-msgstr "Limpar Formulário"
+#: templates/list/header.inc:8
+msgid "Close Search"
+msgstr "Fechar Pesquisa"
 
-#: templates/notepads/notepads.inc:17 templates/notepads/notepads.inc:94
-#: templates/notepads/notepads.inc:96
+#: lib/Forms/CreateNotepad.php:39
 msgid "Create"
 msgstr "Criar"
 
-#: templates/view/memo.inc:35
+#: lib/Forms/CreateNotepad.php:34
+msgid "Create Notepad"
+msgstr "Criar Bloco de Anotações"
+
+#: templates/notepad_list.php:8
+msgid "Create a new Notepad"
+msgstr "Criar um novo Bloco de Anotações"
+
+#: templates/view/memo.inc:32
 msgid "Created"
 msgstr "Criado"
 
-#: config/prefs.php.dist:21
+#: templates/memo/memo.inc:23 templates/view/memo.inc:54
+msgid "Decrypt"
+msgstr "Descriptografar"
+
+#: config/prefs.php.dist:20
 msgid "Default Notepad"
-msgstr "Bloco de Notas Padrão"
+msgstr "Bloco de Anotações Padrão"
 
-#: config/prefs.php.dist:35
+#: config/prefs.php.dist:61
 msgid "Default sorting criteria:"
 msgstr "Critério padrão de ordenação:"
 
-#: config/prefs.php.dist:46
+#: config/prefs.php.dist:72
 msgid "Default sorting direction:"
 msgstr "Direção de ordenação padrão:"
 
-#: templates/notepads/notepads.inc:95 templates/view/memo.inc:25
-#: templates/view/memo.inc:64
+#: lib/Forms/DeleteNotepad.php:45 notepads/index.php:33
+#: templates/notepad_list.php:33 templates/view/memo.inc:16
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/memo/memo.inc:56
+#: lib/Forms/DeleteNotepad.php:40
+#, php-format
+msgid "Delete %s"
+msgstr "Excluir %s"
+
+#: config/prefs.php.dist:27
+msgid "Delete Confirmation"
+msgstr "Confirmação de Exclusão"
+
+#: config/prefs.php.dist:28
+msgid "Delete button behaviour"
+msgstr "Comportamento do botão de exclusão"
+
+#: templates/memo/memo.inc:11
 msgid "Delete this note"
 msgstr "Excluir esta anotação"
 
-#: config/prefs.php.dist:45
+#: config/prefs.php.dist:71
 msgid "Descending"
 msgstr "Descendente"
 
-#: templates/notepads/notepads.inc:85
-msgid "Description:"
-msgstr "Descrição:"
+#: lib/Forms/CreateNotepad.php:37 lib/Forms/EditNotepad.php:44
+msgid "Description"
+msgstr "Descrição"
 
-#: config/prefs.php.dist:14
+#: lib/Driver/kolab.php:556
+#, php-format
+msgid "Did not find note %s"
+msgstr "Não foi encontrada a anotação %s"
+
+#: config/prefs.php.dist:13
 msgid "Display Options"
 msgstr "Opções de Exibição"
 
-#: templates/view/memo.inc:21 templates/view/memo.inc:60
+#: config/prefs.php.dist:117
+msgid "Do you want to confirm deleting entries?"
+msgstr "Você deseja confirmar a exclusão de registros?"
+
+#: notepads/index.php:31 templates/notepad_list.php:29
+#: templates/view/memo.inc:13
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/list/memo_summaries.inc:4 templates/list/memo_summaries.inc:5
-#: templates/list/memo_headers.inc:4 lib/Block/summary.php:83
+#: templates/list/memo_summaries.inc:5
+#, php-format
+msgid "Edit \"%s\""
+msgstr "Editar \"%s\""
+
+#: lib/Forms/EditNotepad.php:40
+#, php-format
+msgid "Edit %s"
+msgstr "Editar %s"
+
+#: lib/Block/summary.php:79 lib/Block/summary.php:80
+#: templates/list/memo_headers.inc:30
 msgid "Edit Note"
 msgstr "Editar Anotação"
 
-#: templates/list/memo_headers.inc:16
+#: templates/list/memo_headers.inc:45
 msgid "Edit categories and colors"
 msgstr "Editar categorias e cores"
 
-#: templates/list/memo_summaries.inc:9
+#: memo.php:104
+#, php-format
+msgid "Edit: %s"
+msgstr "Editar: %s"
+
+#: lib/Block/summary.php:104 templates/list/memo_summaries.inc:15
 msgid "Empty Note"
 msgstr "Anotação em Branco"
 
-#: templates/data/export.inc:19
+#: lib/Driver.php:118
+msgid ""
+"Encryption support has not been configured, please contact your "
+"administrator."
+msgstr ""
+"Suporte para criptografia não foi configurado, por favor contate seu "
+"administrador."
+
+#: templates/data/export.inc:16
 msgid "Export"
 msgstr "Exportar"
 
-#: templates/data/export.inc:8
+#: templates/data/export.inc:2
 msgid "Export Notes"
 msgstr "Exportar Anotações"
 
-#: templates/search/search.inc:21
-msgid "F_ull Text"
-msgstr "Texto _Completo"
+#: config/prefs.php.dist:12 config/prefs.php.dist:19 config/prefs.php.dist:26
+msgid "General Options"
+msgstr "Opções Gerais"
 
-#: templates/data/import.inc:8
+#: templates/data/import.inc:1
 #, php-format
 msgid "Import Notes, Step %d"
 msgstr "Importar Anotações, Passo %d"
 
-#: data.php:167
+#: data.php:206
 msgid "Import/Export Notes"
 msgstr "Importar/Exportar Anotações"
 
-#: templates/view/memo.inc:43
+#: templates/search/search.inc:17
+msgid "In: "
+msgstr "Em: "
+
+#: templates/view/memo.inc:39
 msgid "Last Modified"
 msgstr "Última Modificação"
 
-#: data.php:39
+#: notepads/index.php:37 templates/notepad_list.php:2
+msgid "Manage Notepads"
+msgstr "Gerenciar Blocos de Anotações"
+
+#: lib/api.php:82
+msgid "Maximum Number of Notes"
+msgstr "Número Máximo de Anotações"
+
+#: data.php:53
 msgid "Memo Text"
 msgstr "Texto do Memorando"
 
-#: memo.php:53
-#, php-format
-msgid "Modifying %s"
-msgstr "Alterando %s"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Lista de Menu"
+
+#: templates/list/header.inc:9
+msgid "More Options..."
+msgstr "Mais Opções..."
+
+#: templates/panel.inc:50
+msgid "My Notepads:"
+msgstr "Meus Blocos de Anotações:"
 
 #: list.php:31
 msgid "My Notes"
 msgstr "Minhas Anotações"
 
-#: lib/Block/summary.php:22
+#: lib/Forms/CreateNotepad.php:36 lib/Forms/EditNotepad.php:43
+msgid "Name"
+msgstr "Nome"
+
+#: memo.php:57 lib/Block/tree_menu.php:23
 msgid "New Note"
 msgstr "Nova Anotação"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:34
 msgid "Next"
 msgstr "Próxima"
 
-#: templates/menu.inc:7
-msgid "No notepads are available to guests."
-msgstr "Nenhum bloco de notas está disponível para convidados."
+#: lib/api.php:286
+msgid "No iCalendar data was found."
+msgstr "Nenhum dado iCalendar foi encontrado."
 
-#: templates/list/header.inc:9
-msgid "No notes"
-msgstr "Nenhuma anotação"
+#: templates/list/memo_footers.inc:4
+msgid "No notes match"
+msgstr "Nenhuma anotação coincide"
 
-#: templates/list/empty.inc:3
+#: templates/list/empty.inc:1
 msgid "No notes match the current criteria."
 msgstr "Nenhuma anotação corresponde ao critério atual."
 
-#: lib/Block/summary.php:109
+#: lib/Block/summary.php:112
 msgid "No notes to display"
 msgstr "Nenhuma anotação para exibir"
 
-#: templates/list/memo_headers.inc:7
+#: templates/list/memo_headers.inc:37
 msgid "No_te"
 msgstr "Ano_tação"
 
-#: config/prefs.php.dist:34
+#: lib/Driver/sql.php:195
+msgid "Not found"
+msgstr "Não encontrado"
+
+#: config/prefs.php.dist:59
 msgid "Note Category"
 msgstr "Categoria da Anotação"
 
-#: view.php:61 templates/view/memo.inc:9
+#: view.php:121
 msgid "Note Details"
 msgstr "Detalhes da Nota"
 
-#: notepads.php:101
-msgid "Note Lists"
-msgstr "Listagem de Anotações"
-
-#: config/prefs.php.dist:33
+#: config/prefs.php.dist:58
 msgid "Note Text"
 msgstr "Texto da Anotação"
 
-#: templates/memo/memo.inc:15
+#: templates/memo/memo.inc:53
 msgid "Note _Text"
 msgstr "_Texto da Anotação"
 
-#: view.php:38 memo.php:45
+#: memo.php:67 view.php:56 note/pdf.php:57
 msgid "Note not found."
 msgstr "Anotação não encontrada."
 
-#: templates/memo/memo.inc:23
+#: templates/memo/memo.inc:59
 msgid "Note_pad"
 msgstr "Bloco de _Notas"
 
-#: templates/notepads/notepads.inc:79
-msgid "Notepad's name:"
-msgstr "Nome do bloco de notas:"
+#: templates/notepad_list.php:15 templates/list/memo_headers.inc:33
+#: config/prefs.php.dist:60
+msgid "Notepad"
+msgstr "Bloco de Anotações"
 
-#: templates/notepads/notepads.inc:61
-msgid "Notepads"
-msgstr "Blocos de notas"
+#: templates/notepad_list.php:12
+msgid "Notepad List"
+msgstr "Lista de Bloco de Anotações"
 
-#: notepads.php:28
-msgid "Notepads must have a name."
-msgstr "Blocos de notas devem possuir um nome."
+#: templates/panel.inc:32 templates/panel.inc:33
+msgid "Notepads"
+msgstr "Blocos de Anotações"
 
 #: lib/Block/summary.php:3
 msgid "Notes Summary"
 msgstr "Resumo das Anotações"
 
-#: config/prefs.php.dist:13 config/prefs.php.dist:20
-msgid "Other Options"
-msgstr "Outras Opções"
-
-#: lib/api.php:140 lib/api.php:211 lib/api.php:281 lib/api.php:310
+#: lib/api.php:161 lib/api.php:201 lib/api.php:234 lib/api.php:264
+#: lib/api.php:351 lib/api.php:419 lib/api.php:448
 msgid "Permission Denied"
 msgstr "Permissão Negada"
 
-#: templates/notepads/notepads.inc:82
-msgid "Permissions"
-msgstr "Permissões"
-
-#: templates/list/header.inc:4 templates/list/header.inc:5
-msgid "Refresh List"
-msgstr "Atualizar Lista"
+#: lib/Forms/DeleteNotepad.php:56
+msgid "Permission denied"
+msgstr "Permissão negada"
 
-#: templates/prefs/showsummaryselect.inc:105
-msgid "Remove category"
-msgstr "Remover categoria"
+#: lib/Forms/DeleteNotepad.php:43
+#, php-format
+msgid ""
+"Really delete the notepad \"%s\"? This cannot be undone and all data on this "
+"notepad will be permanently removed."
+msgstr ""
+"Realmente apagar o bloco de anotações \"%s\"? Isto não pode ser desfeito e "
+"todos os dados neste bloco de anotações será permanentemente removido."
 
-#: templates/notepads/notepads.inc:96
-msgid "Reset"
-msgstr "Limpar"
+#: templates/view/memo.inc:16
+msgid "Really delete this note?"
+msgstr "Realmente excluir esta anotação?"
 
-#: templates/memo/memo.inc:45
+#: lib/Forms/EditNotepad.php:46 templates/panel.inc:68
+#: templates/memo/memo.inc:57
 msgid "Save"
-msgstr "Salvar"
+msgstr "Gravar"
+
+#: templates/view/memo.inc:11
+msgid "Save as PDF"
+msgstr "Gravar como PDF"
 
-#: search.php:13 templates/search/search.inc:4 templates/search/search.inc:31
+#: search.php:17 lib/Block/tree_menu.php:44 templates/search/search.inc:4
+#: templates/search/search.inc:27 templates/list/header.inc:4
 msgid "Search"
 msgstr "Pesquisar"
 
-#: list.php:53
+#: list.php:54
 msgid "Search Results"
 msgstr "Resultados da Pesquisa"
 
-#: templates/search/search.inc:17
-msgid "Search Scope"
-msgstr "Escopo da Pesquisa"
+#: templates/panel.inc:38
+msgid "Search for Notepads:"
+msgstr "Pesquisar por Blocos de Anotações:"
 
-#: templates/search/search.inc:9
-msgid "Search _Text"
-msgstr "Pesquisar _Texto"
-
-#: templates/notepads/notepads.inc:67
-msgid "Select a notepad"
-msgstr "Selecione um bloco de notas"
-
-#: templates/data/export.inc:15
+#: templates/data/export.inc:9
 msgid "Select the export format:"
 msgstr "Selecione o formato para exportar:"
 
-#: templates/data/import.inc:37
+#: templates/data/import.inc:31
 msgid "Select the file to import:"
 msgstr "Selecione o arquivo para importar:"
 
-#: templates/data/import.inc:15
+#: templates/data/import.inc:9
 msgid "Select the format of the source file:"
 msgstr "Selecione o formato do arquivo de origem:"
 
-#: templates/prefs/showsummaryselect.inc:109
-msgid "Selected Categories:"
-msgstr "Categorias Selecionadas:"
+#: templates/panel.inc:59
+msgid "Shared Notepads:"
+msgstr "Blocos de Anotações Compartilhados:"
 
-#: templates/menu.inc:27
-msgid "Show"
-msgstr "Exibir"
-
-#: templates/menu.inc:16
-msgid "Show Notepads:"
-msgstr "Exibir Blocos de Notas:"
+#: config/prefs.php.dist:39
+msgid "Should the Notepad be shown in its own column in the List view?"
+msgstr ""
+"O Bloco de Anotações deve ser exibido na respectiva coluna na exibição de "
+"Lista?"
 
-#: lib/Block/summary.php:38
+#: lib/Block/summary.php:35
 msgid "Show action buttons?"
 msgstr "Exibir botões de ação?"
 
-#: lib/Block/summary.php:41
+#: lib/Block/summary.php:39
 msgid "Show notepad name?"
-msgstr "Exibir o nome do bloco de notas?"
+msgstr "Exibir o nome do bloco de anotações?"
+
+#: config/prefs.php.dist:49
+msgid "Show notepad options panel?"
+msgstr "Exibir o painel de opções de bloco de anotações?"
 
-#: lib/Block/summary.php:44
+#: lib/Block/summary.php:43
 msgid "Show notes from these categories"
 msgstr "Exibir anotações destas categorias"
 
-#: templates/list/memo_headers.inc:11
+#: templates/list/memo_headers.inc:41
 msgid "Sort by Category"
 msgstr "Ordenar por Categoria"
 
-#: templates/list/memo_headers.inc:7
+#: templates/list/memo_headers.inc:37
 msgid "Sort by Note Text"
 msgstr "Ordenar pelo texto da anotação"
 
-#: memo.php:111
+#: templates/list/memo_headers.inc:33
+msgid "Sort by Notepad"
+msgstr "Ordenar por Bloco de Anotações"
+
+#: memo.php:175
 #, php-format
 msgid "Successfully saved \"%s\"."
-msgstr "\"%s\" foi salvo com sucesso."
+msgstr "\"%s\" foi gravado com sucesso."
 
-#: memo.php:134
-msgid "The note was deleted."
-msgstr "A anotação foi excluída."
+#: data.php:194
+#, php-format
+msgid "The %s file didn't contain any notes."
+msgstr "O arquivo %s não continha nenhuma anotação."
 
-#: notepads.php:41
+#: lib/Driver.php:53
+msgid "The Notes backend is not currently available."
+msgstr "A estrutura de Anotações não está disponível."
+
+#: lib/Driver.php:227
 #, php-format
-msgid "The notepad \"%s\" couldn't be created: %s"
-msgstr "O bloco de notas \"%s\" não pôde ser criado: %s"
+msgid "The Notes backend is not currently available: %s"
+msgstr "A estrutura de Anotações não está disponível: %s"
 
-#: notepads.php:43
+#: memo.php:198
+msgid "The note was deleted."
+msgstr "A anotação foi excluída."
+
+#: notepads/create.php:31
 #, php-format
 msgid "The notepad \"%s\" has been created."
-msgstr "O bloco de notas \"%s\" foi criado."
+msgstr "O bloco de anotações \"%s\" foi criado."
 
-#: notepads.php:73
+#: notepads/delete.php:48
 #, php-format
 msgid "The notepad \"%s\" has been deleted."
-msgstr "O bloco de notas \"%s\" foi excluído."
+msgstr "O bloco de anotações \"%s\" foi excluído."
+
+#: notepads/edit.php:42
+#, php-format
+msgid "The notepad \"%s\" has been renamed to \"%s\"."
+msgstr "O bloco de anotações \"%s\" foi renomeado para \"%s\"."
 
-#: notepads.php:51
+#: notepads/edit.php:44
 #, php-format
 msgid "The notepad \"%s\" has been saved."
-msgstr "O bloco de notas \"%s\" foi salvo."
+msgstr "O bloco de anotações \"%s\" foi gravado."
 
-#: data.php:158
+#: data.php:197
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Houve um erro ao importar os dados: %s"
 
-#: lib/api.php:164 lib/api.php:329
+#: lib/api.php:280
+msgid "There was an error importing the iCalendar data."
+msgstr "Houve um erro ao importar os dados do iCalendar."
+
+#: lib/api.php:467
 msgid "There was an error importing the vNote data."
 msgstr "Houve um erro ao importar os dados vNote."
 
-#: memo.php:132
+#: memo.php:196
 #, php-format
 msgid "There was an error removing the note: %s"
 msgstr "Houve um erro ao remover a anotação: %s"
 
-#: memo.php:109
+#: memo.php:173
 #, php-format
 msgid "There was an error saving the note: %s"
-msgstr "Houve um erro ao salvar a anotação: %s"
+msgstr "Houve um erro ao gravar a anotação: %s"
 
-#: view.php:24
+#: view.php:45 note/pdf.php:46
 #, php-format
 msgid "There was an error viewing this notepad: %s"
-msgstr "Houve um erro ao visualizar este bloco de notas: %s"
+msgstr "Houve um erro ao exibir este bloco de anotações: %s"
 
-#: data.php:65
+#: data.php:78
 msgid "There were no memos to export."
 msgstr "Não haviam memorandos para exportar."
 
-#: data.php:91
+#: data.php:105
 msgid "This file format is not supported."
 msgstr "Este formato de arquivo não é suportado."
 
-#: notepads.php:69
+#: memo.php:91 view.php:111
+msgid "This note cannot be decrypted:"
+msgstr "Esta anotação não pode ser descriptografada:"
+
+#: memo.php:83 view.php:103
+msgid "This note has been encrypted, please provide the password below."
+msgstr "Esta anotação foi criptografada, por favor forneça a senha abaixo."
+
+#: memo.php:80 memo.php:88 view.php:100 view.php:108 lib/api.php:357
+#: lib/Driver/kolab.php:766 lib/Driver/sql.php:448
+msgid "This note has been encrypted."
+msgstr "Esta anotação foi criptografada."
+
+#: notepads/delete.php:24
+msgid "This notepad cannot be deleted"
+msgstr "Não foi possível apagar este bloco de anotações"
+
+#: lib/Forms/DeleteNotepad.php:63
 #, php-format
 msgid "Unable to delete \"%s\": %s"
 msgstr "Impossível excluir \"%s\": %s"
 
-#: templates/memo/memo.inc:47
-msgid "Undo changes"
-msgstr "Desfazer alterações"
+#: lib/Driver.php:230
+#, php-format
+msgid "Unable to load the definition of %s."
+msgstr "Impossível carregar a definição de %s."
 
-#: templates/view/memo.inc:16 templates/list/memo_summaries.inc:11
-#: scripts/upgrades/2004-05-19_convert_categories_to_strings.php:49
-#: lib/Block/summary.php:105
+#: lib/Forms/EditNotepad.php:55
+#, php-format
+msgid "Unable to save notepad \"%s\": %s"
+msgstr "Impossível gravar bloco de anotações \"%s\": %s"
+
+#: lib/Mnemo.php:267 lib/Mnemo.php:268 lib/Mnemo.php:282 lib/Mnemo.php:283
+#: lib/Block/summary.php:107 templates/view/memo.inc:27
+#: templates/list/memo_summaries.inc:17
 msgid "Unfiled"
 msgstr "Sem categoria"
 
-#: lib/api.php:173 lib/api.php:245 lib/api.php:337
-msgid "Unsupported Content-Type."
-msgstr "Content-Type não suportado."
-
-#: templates/list/memo_summaries.inc:9
-msgid "View Note Details"
-msgstr "Visualizar Detalhes da Anotação"
+#: lib/api.php:316 lib/api.php:382 lib/api.php:475
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Tipo de Conteúdo não suportado: %s"
 
-#: templates/data/import.inc:22
+#: templates/data/import.inc:16
 msgid "Which Notepad should the notes be added to?"
-msgstr "Em qual Bloco de Notas as anotações deverão ser adicionadas?"
+msgstr "Em qual Bloco de Anotações as anotações deverão ser adicionadas?"
 
-#: view.php:28
+#: notepads/edit.php:28
+msgid "You are not allowed to change this notepad."
+msgstr "Você não ter permissão para alterar este Bloco de Anotações."
+
+#: memo.php:37 data.php:42 data.php:129
 #, php-format
-msgid "You do not have permission to view the notepad %s."
-msgstr "Você não tem permissão para visualizar este bloco de notas %s."
+msgid "You are not allowed to create more than %d notes."
+msgstr "Você não pode criar mais do que %d anotações."
+
+#: notepads/delete.php:35
+msgid "You are not allowed to delete this notepad."
+msgstr "Voc? não tem permissão para apagar este bloco de anotações."
 
-#: notepads.php:76
-msgid "You must select a notepad to be deleted."
-msgstr "Você deve selecionar um bloco de notas para ser excluído."
+#: view.php:49 note/pdf.php:50
+#, php-format
+msgid "You do not have permission to view the notepad %s."
+msgstr "Você não tem permissão para ver este bloco de anotações %s."
 
 #: templates/prefs/notepadselect.inc:10
 msgid "Your default notepad:"
-msgstr "Seu bloco de notas padrão:"
+msgstr "Seu bloco de anotações padrão:"
 
-#: templates/notepads/notepads.inc:65
-msgid "Your notepads:"
-msgstr "Seus blocos de notas:"
+#: templates/panel.inc:45
+msgid "[Manage Notepads]"
+msgstr "[Gerenciar Blocos de Anotações]"
 
-#: templates/view/memo.inc:28 templates/view/memo.inc:67
-msgid "_Back to Notepad"
-msgstr "_Voltar ao Bloco de Notas"
+#: templates/search/search.inc:21
+msgid "_Body"
+msgstr "_Corpo"
 
-#: templates/memo/memo.inc:40 templates/list/memo_headers.inc:11
+#: templates/memo/memo.inc:70 templates/list/memo_headers.inc:41
 msgid "_Category"
 msgstr "_Categoria"
 
-#: templates/view/memo.inc:25 templates/view/memo.inc:64
+#: templates/view/memo.inc:16
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: templates/view/memo.inc:21 templates/view/memo.inc:60
+#: templates/view/memo.inc:13
 msgid "_Edit"
 msgstr "_Editar"
 
-#: templates/search/search.inc:20
-msgid "_First Line"
-msgstr "_Primeira Linha"
+#: templates/memo/memo.inc:74
+msgid "_Encrypt?"
+msgstr "_Criptografar?"
+
+#: templates/search/search.inc:9
+msgid "_For: "
+msgstr "_Para: "
 
-#: lib/Mnemo.php:198
+#: lib/Mnemo.php:488
 msgid "_Import/Export"
 msgstr "_Importar/Exportar"
 
-#: lib/Mnemo.php:184
+#: lib/Mnemo.php:475
 msgid "_List Notes"
 msgstr "_Listar Anotações"
 
-#: lib/Mnemo.php:193
-msgid "_My Notepads"
-msgstr "Minhas _Anotações"
-
-#: lib/Mnemo.php:186
+#: lib/Mnemo.php:480
 msgid "_New Note"
 msgstr "_Nova Anotação"
 
-#: lib/Mnemo.php:203
+#: templates/memo/memo.inc:21 templates/memo/memo.inc:79
+#: templates/view/memo.inc:52
+msgid "_Password"
+msgstr "_Senha"
+
+#: lib/Mnemo.php:493
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: lib/Mnemo.php:189
+#: lib/Mnemo.php:484
 msgid "_Search"
 msgstr "Pes_quisar"
 
-#: data.php:77 templates/data/export.inc:1
+#: templates/search/search.inc:20
+msgid "_Title"
+msgstr "_Título"
+
+#: view.php:74 view.php:83
+#, php-format
+msgid "by %s"
+msgstr "por %s"
+
+#: view.php:76 view.php:85
+msgid "by me"
+msgstr "por mim"
+
+#: lib/Block/tree_menu.php:33
+#, php-format
+msgid "in %s"
+msgstr "em %s"
+
+#: data.php:90 templates/data/export.inc:4
 msgid "notes.csv"
 msgstr "anotacoes.csv"
 
-#: data.php:29 templates/data/import.inc:18
+#: data.php:33 templates/data/import.inc:12
 msgid "vNote"
 msgstr "vNote"
diff --git a/scripts/import_vnotes.php b/scripts/import_text_note.php
similarity index 76%
copy from scripts/import_vnotes.php
copy to scripts/import_text_note.php
index de2ea9c..7e8b1b7 100755
--- a/scripts/import_vnotes.php
+++ b/scripts/import_text_note.php
@@ -5,7 +5,7 @@
  * The data is read from standard input, the notepad and user name passed as
  * parameters.
  *
- * $Horde: mnemo/scripts/import_vnotes.php,v 1.3.2.5 2008/01/02 11:32:28 jan Exp $
+ * $Horde: mnemo/scripts/import_text_note.php,v 1.1.2.1 2008/06/24 19:35:37 chuck Exp $
  *
  * Copyright 2005-2008 The Horde Project (http://www.horde.org/)
  *
@@ -33,19 +33,25 @@ $cli = &Horde_CLI::singleton();
 $cli->init();
 
 // Read command line parameters.
-if (count($argv) != 3) {
+if (count($argv) != 4) {
     $cli->message('Too many or too few parameters.', 'cli.error');
     usage();
 }
 $notepad = $argv[1];
 $user = $argv[2];
+$file = $argv[3];
 
 // Read standard input.
-$vnote = $cli->readStdin();
-if (empty($vnote)) {
+if (!file_exists($file)) {
+    $cli>message("$file does not exist", 'cli.error');
+    usage();
+}
+$data = file_get_contents($file);
+if (empty($data)) {
     $cli->message('No import data provided.', 'cli.error');
     usage();
 }
+$data = pathinfo($file, PATHINFO_FILENAME) . "\n\n" . $data;
 
 // Registry.
 $registry = &Registry::singleton();
@@ -56,7 +62,7 @@ $auth->setAuth($user, array());
 
 // Import data.
 $result = $registry->call('notes/import',
-                          array($vnote, 'text/x-vnote', $notepad));
+                          array($data, 'text/plain', $notepad));
 if (is_a($result, 'PEAR_Error')) {
     $cli->fatal($result->toString());
 }
@@ -65,7 +71,7 @@ $cli->message('Imported successfully ' . count($result) . ' notes', 'cli.success
 
 function usage()
 {
-    $GLOBALS['cli']->writeln('Usage: import_vnotes.php notepad user');
+    $GLOBALS['cli']->writeln('Usage: import_text_note.php notepad user file');
     exit;
 }
 
diff --git a/scripts/sql/mnemo.mssql.sql b/scripts/sql/mnemo.mssql.sql
index fed8db4..7528156 100644
--- a/scripts/sql/mnemo.mssql.sql
+++ b/scripts/sql/mnemo.mssql.sql
@@ -1,4 +1,4 @@
--- $Horde: mnemo/scripts/sql/mnemo.mssql.sql,v 1.1.2.4 2008/04/29 19:33:22 chuck Exp $
+-- $Horde: mnemo/scripts/sql/mnemo.mssql.sql,v 1.1.2.5 2008/06/18 00:42:10 mrubinsk Exp $
 
 CREATE TABLE mnemo_memos (
     memo_owner      VARCHAR(255) NOT NULL,
@@ -46,7 +46,7 @@ CREATE INDEX mnemo_shares_groups_perm_idx ON mnemo_shares_groups (perm);
 
 CREATE TABLE mnemo_shares_users (
     share_id INT NOT NULL,
-    user_uid VARCHAR(32) NOT NULL,
+    user_uid VARCHAR(255) NOT NULL,
     perm SMALLINT NOT NULL
 );
 
diff --git a/scripts/sql/mnemo.oci8.sql b/scripts/sql/mnemo.oci8.sql
index ce0ff28..91ff46b 100644
--- a/scripts/sql/mnemo.oci8.sql
+++ b/scripts/sql/mnemo.oci8.sql
@@ -1,4 +1,4 @@
--- $Horde: mnemo/scripts/sql/mnemo.oci8.sql,v 1.1.2.6 2008/04/29 19:33:22 chuck Exp $
+-- $Horde: mnemo/scripts/sql/mnemo.oci8.sql,v 1.1.2.7 2008/06/18 00:42:10 mrubinsk Exp $
 
 CREATE TABLE mnemo_memos (
     memo_owner      VARCHAR2(255) NOT NULL,
@@ -46,7 +46,7 @@ CREATE INDEX mnemo_shares_groups_perm_idx ON mnemo_shares_groups (perm);
 
 CREATE TABLE mnemo_shares_users (
     share_id INT NOT NULL,
-    user_uid VARCHAR2(32) NOT NULL,
+    user_uid VARCHAR2(255) NOT NULL,
     perm SMALLINT NOT NULL
 );
 
diff --git a/scripts/sql/mnemo.sql b/scripts/sql/mnemo.sql
index 7434a95..e07b1f3 100644
--- a/scripts/sql/mnemo.sql
+++ b/scripts/sql/mnemo.sql
@@ -1,4 +1,4 @@
--- $Horde: mnemo/scripts/sql/mnemo.sql,v 1.5.2.4 2008/04/29 19:33:22 chuck Exp $
+-- $Horde: mnemo/scripts/sql/mnemo.sql,v 1.5.2.5 2008/06/18 00:42:10 mrubinsk Exp $
 
 CREATE TABLE mnemo_memos (
     memo_owner      VARCHAR(255) NOT NULL,
@@ -46,7 +46,7 @@ CREATE INDEX mnemo_shares_groups_perm_idx ON mnemo_shares_groups (perm);
 
 CREATE TABLE mnemo_shares_users (
     share_id INT NOT NULL,
-    user_uid VARCHAR(32) NOT NULL,
+    user_uid VARCHAR(255) NOT NULL,
     perm SMALLINT NOT NULL
 );
 
diff --git a/scripts/sql/mnemo.xml b/scripts/sql/mnemo.xml
index 4fc2719..332b43e 100644
--- a/scripts/sql/mnemo.xml
+++ b/scripts/sql/mnemo.xml
@@ -297,7 +297,7 @@
     <type>text</type>
     <default></default>
     <notnull>true</notnull>
-    <length>32</length>
+    <length>255</length>
    </field>
 
    <field>
diff --git a/scripts/upgrades/2.2_to_2.2.1.sql b/scripts/upgrades/2.2_to_2.2.1.sql
new file mode 100644
index 0000000..257e32c
--- /dev/null
+++ b/scripts/upgrades/2.2_to_2.2.1.sql
@@ -0,0 +1,2 @@
+ALTER TABLE mnemo_shares CHANGE share_owner share_owner VARCHAR(255);
+ALTER TABLE mnemo_shares_users CHANGE user_uid user_uid VARCHAR(255);
diff --git a/scripts/upgrades/convert_datatree_shares_to_sql.php b/scripts/upgrades/convert_datatree_shares_to_sql.php
index b6addf6..6eafbce 100755
--- a/scripts/upgrades/convert_datatree_shares_to_sql.php
+++ b/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -5,7 +5,7 @@
  * driver to the new SQL Horde_Share driver. You should run the 2.1_to_2.2.sql
  * upgrade script before executing this script.
  *
- * $Horde: mnemo/scripts/upgrades/convert_datatree_shares_to_sql.php,v 1.1.2.3 2008/05/23 02:28:40 chuck Exp $
+ * $Horde: mnemo/scripts/upgrades/convert_datatree_shares_to_sql.php,v 1.1.2.4 2008/06/06 15:08:03 mrubinsk Exp $
  */
 
 @define('AUTH_HANDLER', true);
@@ -28,6 +28,7 @@ $config = $GLOBALS['conf']['sql'];
 unset($config['charset']);
 $db = MDB2::factory($config);
 
+$error_cnt = 0;
 $delete_dt_data = false;
 $answer = $cli->prompt('Do you want to keep your old datatree data or delete it?', array('Keep', 'Delete'));
 if ($answer == 1) {
@@ -111,12 +112,14 @@ while ($row = $shares_result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
     $cli->message('Migrating share data for share_id: ' . $share_id, 'cli.message');
     $result = insertData('mnemo_shares', $data);
     if (is_a($result, 'PEAR_Error')) {
+        ++$error_cnt;
         $cli->message($result->getMessage(), 'cli.error');
     }
     if (count($groups)) {
         foreach ($groups as $group) {
             $result = insertData('mnemo_shares_groups', $group);
             if (is_a($result, 'PEAR_Error')) {
+                ++$error_cnt;
                 $cli->message($result->getMessage(), 'cli.error');
             }
         }
@@ -125,13 +128,14 @@ while ($row = $shares_result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
         foreach ($users as $user) {
             $result = insertData('mnemo_shares_users', $user);
             if (is_a($result, 'PEAR_Error')) {
+                ++$error_cnt;
                 $cli->message($result->getMessage(), 'cli.error');
             }
         }
     }
 
     /* Delete the datatree data, but ONLY if it was requested */
-    if ($delete_dt_data) {
+    if ($delete_dt_data && !$error_cnt) {
         $cli->message('DELETING datatree data for share_id: ' . $share_id, 'cli.message');
         $delete = $db->prepare('DELETE FROM horde_datatree_attributes WHERE datatree_id = ?', null, MDB2_PREPARE_MANIP);
         $delete->execute(array($share_id));
@@ -146,6 +150,10 @@ while ($row = $shares_result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
     $query_result->free();
     unset($row, $rows, $data, $groups, $users);
 }
+if ($error_cnt) {
+    $cli->message(sprintf("Encountered %u errors. No data was deleted from your database.", $error_cnt));
+}
+echo "\nDone.\n";
 
 /**
  * Helper function
diff --git a/templates/notepad_list.php b/templates/notepad_list.php
index 9587314..350b0fa 100644
--- a/templates/notepad_list.php
+++ b/templates/notepad_list.php
@@ -2,22 +2,20 @@
  <?php echo _("Manage Notepads") ?>
 </h1>
 
+<?php if (!$prefs->isLocked('default_notepad')): ?>
 <div id="notepad-list-buttons">
  <form method="get" action="create.php">
 <?php echo Util::formInput() ?>
   <input type="submit" class="button" value="<?php echo _("Create a new Notepad") ?>" />
  </form>
 </div>
+<?php endif; ?>
 
 <table summary="<?php echo _("Notepad List") ?>" cellspacing="0" id="notepad-list" class="striped sortable">
  <thead>
   <tr>
-<th class="sortdown"><?php echo _("Notepad") ?></th>
-   <th class="notepad-list-icon nosort"><?php echo $edit_img ?></th>
-<?php if (empty($conf['share']['no_sharing'])): ?>
-   <th class="notepad-list-icon nosort"><?php echo $perms_img ?></th>
-<?php endif; ?>
-   <th class="notepad-list-icon nosort"><?php echo $delete_img ?></th>
+   <th class="sortdown"><?php echo _("Notepad") ?></th>
+   <th class="notepad-list-icon nosort" colspan="<?php echo empty($conf['share']['no_sharing']) ? 3 : 2 ?>">&nbsp;</th>
   </tr>
  </thead>
 

-- 
Debian Horde Packages repository: mnemo2 package