[pkg-horde] [COMMIT lionel turba--sid--2--patch-2] New upstream version 2.1

Lionel Elie Mamane lmamane at costa.debian.org
Thu Apr 6 17:25:04 UTC 2006


A/ locale/is_IS/LC_MESSAGES
A/ locale/is_IS
A/ themes/ideas/.arch-ids
A/ lib/Object/.arch-ids
A/ lib/Object
A/ themes/ideas
A/ locale/is_IS/LC_MESSAGES/.arch-ids
A/ locale/is_IS/.arch-ids
A  scripts/sql/turba_objects.mssql.sql
A  lib/Block/.arch-ids/tree_menu.php.id
A  scripts/import_vcards.php
A  themes/ideas/screen.css
A  scripts/upgrades/public_to_horde_share.php
A  view.php
A  locale/is_IS/.arch-ids/=id
A  themes/ideas/.arch-ids/screen.css.id
A  addressbooks.php
A  scripts/.arch-ids/import_vcards.php.id
A  templates/prefs/.arch-ids/imsp_opt.inc.id
A  po/is_IS.po
A  templates/.arch-ids/addressbooks.inc.id
A  {arch}/turba/turba--upstream/turba--upstream--2/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-1
A  locale/is_IS/LC_MESSAGES/.arch-ids/=id
A  locale/is_IS/LC_MESSAGES/.arch-ids/turba.mo.id
A  scripts/upgrades/.arch-ids/public_to_horde_share.php.id
A  lib/Object/Group.php
A  .arch-ids/addressbooks.php.id
A  po/.arch-ids/is_IS.po.id
A  templates/prefs/imsp_opt.inc
A  templates/addressbooks.inc
A  locale/is_IS/LC_MESSAGES/turba.mo
A  locale/fa_IR/help.xml
A  templates/prefs/.arch-ids/addressbookselect.inc.id
A  config/mime_drivers.php.dist
A  lib/Object/.arch-ids/=id
A  locale/tr_TR/.arch-ids/help.xml.id
A  scripts/sql/.arch-ids/turba_objects.mssql.sql.id
A  locale/tr_TR/help.xml
A  lib/Driver/.arch-ids/null.php.id
A  .arch-ids/view.php.id
A  templates/browse/row.inc
A  config/.arch-ids/mime_drivers.php.dist.id
A  lib/Block/tree_menu.php
A  lib/Driver/null.php
A  templates/prefs/addressbookselect.inc
A  templates/browse/.arch-ids/row.inc.id
A  themes/ideas/.arch-ids/=id
A  {arch}/turba/turba--sid/turba--sid--2/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-2
A  locale/fa_IR/.arch-ids/help.xml.id
A  lib/Object/.arch-ids/Group.php.id
D  templates/browse/.arch-ids/select.inc.id
D  templates/browse/select.inc
M  po/sk_SK.po
M  po/es_ES.po
M  templates/block/minisearch.inc
M  lib/api.php
M  po/lv_LV.po
M  templates/browse/header.inc
M  docs/UPGRADING
M  po/cs_CZ.po
M  po/it_IT.po
M  lib/Driver/sql.php
M  themes/screen.css
M  po/sv_SE.po
M  po/gl_ES.po
M  lib/Driver.php
M  po/nl_NL.po
M  lib/Turba.php
M  templates/browse/column_headers.inc
M  po/zh_CN.po
M  po/bg_BG.po
M  templates/browse/search.inc
M  templates/data/export.inc
M  po/pt_PT.po
M  config/prefs.php.dist
M  docs/INSTALL
M  templates/data/import.inc
M  lib/version.php
M  templates/common-header.inc
M  docs/RELEASE_NOTES
M  lib/ObjectView.php
M  po/nn_NO.po
M  po/ko_KR.po
M  po/nb_NO.po
M  templates/browse/search_criteria.inc
M  po/fr_FR.po
M  po/turba.pot
M  edit.php
M  po/ro_RO.po
M  po/pt_BR.po
M  display.php
M  debian/changelog
M  locale/fi_FI/help.xml
M  vcard.php
M  templates/browse/actions.inc
M  add.php
M  lib/Driver/imsp.php
M  config/attributes.php.dist
M  scripts/sql/turba_objects.pgsql.sql
M  config/sources.php.dist
M  delete.php
M  po/da_DK.po
M  po/lt_LT.po
M  docs/CREDITS
M  po/ar_SY.po
M  README
M  po/fa_IR.po
M  templates/prefs/columnselect.inc
M  docs/CHANGES
M  po/hu_HU.po
M  lib/Driver/kolab.php
M  config/conf.xml
M  scripts/sql/turba_objects.mysql.sql
M  lib/Driver/ldap.php
M  lib/ListView.php
M  minisearch.php
M  po/fi_FI.po
M  LICENSE
M  po/de_DE.po
M  docs/LDAP
M  po/zh_TW.po
M  lib/List.php
M  po/el_GR.po
M  po/mk_MK.po
M  po/pl_PL.po
M  index.php
M  lib/Driver/prefs.php
M  po/ru_RU.po
M  po/sl_SI.po
M  lib/Block/minisearch.php
M  templates/browse/column_footers.inc
M  po/uk_UA.po
M  lib/base.php
M  browse.php
M  templates/menu.inc
M  lib/Object.php
M  lib/Renderer.php
M  test.php
M  templates/browse/javascript.inc
M  po/et_EE.po
M  po/ca_ES.po
M  po/ja_JP.po
M  scripts/upgrades/2004-10-26_create_default_histories.php
M  templates/browse/footer.inc
M  lib/prefs.php
M  search.php
M  data.php
M  templates/browse/footerAlpha.inc
M  po/tr_TR.po

--- /dev/null
+++ scripts/sql/turba_objects.mssql.sql
@@ -0,0 +1,30 @@
+-- $Horde: turba/scripts/sql/turba_objects.mssql.sql,v 1.1.2.1 2006/01/18 19:59:40 ben Exp $
+
+CREATE TABLE turba_objects (
+    object_id VARCHAR(32) NOT NULL,
+    owner_id VARCHAR(255) NOT NULL,
+    object_type VARCHAR(255) NOT NULL DEFAULT 'Object',
+    object_uid VARCHAR(255),
+    object_members BLOB,
+    object_name VARCHAR(255),
+    object_alias VARCHAR(32),
+    object_email VARCHAR(255),
+    object_homeaddress VARCHAR(255),
+    object_workaddress VARCHAR(255),
+    object_homephone VARCHAR(25),
+    object_workphone VARCHAR(25),
+    object_cellphone VARCHAR(25),
+    object_fax VARCHAR(25),
+    object_title VARCHAR(255),
+    object_company VARCHAR(255),
+    object_notes VARCHAR(MAX),
+    object_pgppublickey VARCHAR(MAX),
+    object_smimepublickey VARCHAR(MAX),
+    object_freebusyurl VARCHAR(255),
+--    
+    PRIMARY KEY(object_id)
+);
+
+CREATE INDEX turba_owner_idx ON turba_objects (owner_id);
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON turba_objects TO horde;


--- /dev/null
+++ lib/Block/.arch-ids/tree_menu.php.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28408.0


--- /dev/null
+++ scripts/import_vcards.php
@@ -0,0 +1,69 @@
+#!/usr/bin/php
+<?php
+/**
+ * This script imports VCARD data into turba address books.
+ * The VCARD data is read from standard input, the address book and user name
+ * passed as parameters.
+ *
+ * $Horde: turba/scripts/import_vcards.php,v 1.4.2.2 2006/01/01 21:29:17 jan Exp $
+ *
+ * Copyright 2005-2006 Jan Schneider <jan at horde.org>
+ *
+ * See the enclosed file LICENSE for license information (ASL).  If you
+ * did not receive this file, see http://www.horde.org/licenses/asl.php.
+ */
+
+ at define('AUTH_HANDLER', true);
+ at define('HORDE_BASE', dirname(__FILE__) . '/../..');
+
+// Do CLI checks and environment setup first.
+require_once HORDE_BASE . '/lib/core.php';
+require_once 'Horde/CLI.php';
+
+// Make sure no one runs this from the web.
+if (!Horde_CLI::runningFromCLI()) {
+    exit("Must be run from the command line\n");
+}
+
+// Load the CLI environment - make sure there's no time limit, init some
+// variables, etc.
+$cli = &Horde_CLI::singleton();
+$cli->init();
+
+// Read command line parameters.
+if (count($argv) != 3) {
+    $cli->message('Too many or too few parameters.', 'cli.error');
+    usage();
+}
+$source = $argv[1];
+$user = $argv[2];
+
+// Read standard input.
+$vcard = $cli->readStdin();
+if (empty($vcard)) {
+    $cli->message('No import data provided.', 'cli.error');
+    usage();
+}
+
+// Registry.
+$registry = &Registry::singleton();
+
+// Set user.
+$auth = &Auth::singleton($conf['auth']['driver']);
+$auth->setAuth($user, array());
+
+// Import data.
+$result = $registry->call('contacts/import',
+                          array($vcard, 'text/x-vcard', $source));
+if (is_a($result, 'PEAR_Error')) {
+    $cli->fatal($result->toString());
+}
+
+$cli->message('Imported successfully ' . count($result) . ' contacts', 'cli.success');
+
+function usage()
+{
+    $GLOBALS['cli']->writeln('Usage: import_vcards.php source user');
+    exit;
+}
+


--- /dev/null
+++ themes/ideas/screen.css
@@ -0,0 +1,10 @@
+/**
+ * Ideas theme by Roel Gloudemans <r.gloudemans at i-to-i.nl>
+ * Based on the Ideas to Interconnect BV website (http://www.i-to-i.nl)
+ */
+
+.text:hover td {
+    background-color: #bad0e7;
+}
+
+


--- /dev/null
+++ scripts/upgrades/public_to_horde_share.php
@@ -0,0 +1,149 @@
+#!/usr/local/bin/php
+<?php
+/**
+ * $Horde: turba/scripts/upgrades/public_to_horde_share.php,v 1.3.2.2 2006/01/01 21:29:17 jan Exp $
+ *
+ * Script to migrate an existing 'public' Turba address book to the
+ * Horde_Share based system.  This script is designed for a SQL source only.
+ * This script will move *ALL* existing entries in the turba_objects table into
+ * a single, globally shared Horde_Share owned by the user specified below.
+ * DO NOT RUN THIS SCRIPT UNLESS you have been using 'public' => true in
+ * a SQL source (such as 'localsql') - otherwise, you will turn every user's
+ * private address book into a public source!
+ *
+ * Copyright 2005-2006 Michael J. Rubinsky <mrubinsk at horde.org>
+ *
+ * See the enclosed file LICENSE for license information (ASL).  If you
+ * did not receive this file, see http://www.horde.org/licenses/asl.php.
+ */
+
+// Set up the CLI enviroment.
+require_once 'Horde/CLI.php';
+if (!Horde_CLI::runningFromCLI()) {
+    exit("Must be run from the command line\n");
+}
+Horde_CLI::init();
+$CLI = &Horde_CLI::singleton();
+
+// Load Horde and Turba enviroments
+ at define('AUTH_HANDLER', true);
+ at define('HORDE_BASE', dirname(__FILE__) . '/../../..');
+ at define('TURBA_BASE', dirname(__FILE__) . '/../..');
+require_once TURBA_BASE . '/lib/base.php';
+
+// Load Horde_Share stuff.
+require_once 'Horde/Share.php';
+$shares = &Horde_Share::singleton($registry->getApp());
+if (is_a($shares, 'PEAR_Error')) {
+    var_dump($share);
+    exit;
+}
+
+$CLI->writeln('This script will turn all entries in the SQL address book into a globally shared address book.');
+$CLI->writeln('Make sure you read the script comments and be sure you know what you are doing.');
+$sure = $CLI->prompt('Are you ' . $CLI->bold('sure') . ' you want to do this?', array('no', 'yes'));
+if (!$sure) {
+    exit;
+}
+
+// Find out what our Auth driver will let us do and
+// get the list of all users if we can.
+$authDriver = $conf['auth']['driver'];
+$auth = &Auth::singleton($authDriver);
+if ($auth->hasCapability('list')) {
+    $users = $auth->listUsers();
+}
+
+// Get all the details.
+do {
+    $owner = $CLI->prompt('Username of the user you would like to own the new public source.');
+    // Might as well check this if we have the list.
+    if (!empty($users) && !in_array($owner, $users)) {
+        $CLI->message($owner . ' is not a valid user!', 'cli.error');
+        $owner = '';
+    }
+} while(!$owner);
+
+do {
+    $title = $CLI->prompt('Enter the title you would like to give to the new public source.');
+} while (!$title);
+
+$sourceKey = $CLI->prompt('What is the internal name of the share we are converting? [localsql]');
+if (!$sourceKey) {
+    $sourceKey = 'localsql';
+}
+
+// Create the new share.
+$owner_uid = md5(microtime());
+$share = &$shares->newShare($sourceKey . ':' . $owner_uid);
+if (is_a($share, 'PEAR_Error')) {
+    var_dump($share);
+    exit;
+}
+$share->set('owner', $owner);
+$share->set('uid', $owner_uid);
+$share->set('name', $title);
+$share->set('perm_default', PERMS_SHOW | PERMS_READ);
+$result = $shares->addShare($share);
+if (is_a($result, 'PEAR_Error')) {
+    var_dump($result);
+    exit;
+}
+$share->save();
+$CLI->message('Created new Horde_Share object for the shared address book.', 'cli.success');
+
+// Share created, now get a Turba_Driver and make the changes.
+$driver = &Turba_Driver::singleton($sourceKey);
+if (is_a($driver, 'PEAR_Error')) {
+    var_dump($driver);
+    exit;
+}
+$db = & $driver->_db;
+if (is_a($db, 'PEAR_Error')) {
+    var_dump($db);
+}
+
+// Get the tablename in case we aren't using horde defaults.
+$tableName = $db->dsn['table'];
+$SQL = 'SELECT COUNT(*) FROM ' . $tableName . ';';
+$count = $db->getOne($SQL);
+$CLI->message("Moving $count contacts to $title.", 'cli.message');
+$SQL = 'UPDATE ' . $tableName . ' SET owner_id=\'' . $owner_uid . '\';';
+$result = $db->query($SQL);
+if (is_a($result, 'PEAR_Error')) {
+    var_dump($result);
+    exit;
+}
+$prefDriver = $conf['prefs']['driver'];
+if ($prefDriver != 'sql') {
+    // Automatically append this source to the addressbooks pref if desired.
+    $autoAppend = $CLI->prompt('Would you like to add the new public source to every user\'s address book preference?', array('no', 'yes'));
+    if ($autoAppend) {
+        $SQL = 'SELECT pref_uid, pref_value FROM horde_prefs WHERE pref_scope=\'turba\' AND pref_name=\'addressbooks\';';
+        $results = $db->getAll($SQL);
+        if (is_a($results, 'PEAR_Error')) {
+           $CLI->message('There was an error updating the user preferences: ' . $results->getMessage(), 'cli.error');
+        } else {
+            foreach ($results as $row) {
+                $newValue = $row[1] . "\n$sourceKey:$owner_uid";
+                $SQL = 'UPDATE horde_prefs SET pref_value=\'' . $newValue . '\' WHERE pref_uid=\'' . $row[0] . '\' AND pref_scope=\'turba\' AND pref_name=\'addressbooks\';';
+                $result = $db->query($SQL);
+                if (is_a($result, 'PEAR_Error')) {
+                    $CLI->message('Could not update preferences for ' . $row[0] . ': ' . $result->getMessage(), 'cli.error');
+                }
+            }
+        }
+        if (!is_a($results, 'PEAR_Error')) {
+            $CLI->message('Successfully added new shared address book to the user preferences.', 'cli.success');
+        }
+    }
+} else {
+    $CLI->message('Your preference backend does not support updating all user preferences.', 'cli.warning');
+    $CLI->message('Your users may have to manually add the new shared address book to their "addressbook" preference.', 'cli.warning');
+}
+// Share our success.
+$CLI->writeln($CLI->bold("*** $title successfully created ***"));
+$CLI->writeln('Share Info:');
+$CLI->writeln($CLI->indent('Title: ' . $share->get('name')));
+$CLI->writeln($CLI->indent('Owner: ' . $share->get('owner')));
+$CLI->writeln($CLI->indent('uid:   ' . $share->get('uid')));


--- /dev/null
+++ locale/is_IS/.arch-ids/=id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28413.0


--- /dev/null
+++ view.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * $Horde: turba/view.php,v 1.6.2.2 2006/01/01 21:29:15 jan Exp $
+ *
+ * Copyright 2004-2006 Jan Schneider <jan at horde.org>
+ *
+ * See the enclosed file LICENSE for license information (ASL).  If you
+ * did not receive this file, see http://www.horde.org/licenses/asl.php.
+ */
+
+ at define('TURBA_BASE', dirname(__FILE__));
+require_once TURBA_BASE . '/lib/base.php';
+
+if ($conf['documents']['type'] == 'none') {
+    Horde::fatal(_("The VFS backend needs to be configured to enable attachment uploads."), __FILE__, __LINE__);
+}
+
+$source = Util::getFormData('source');
+$key = Util::getFormData('key');
+$actionID = Util::getFormData('actionID');
+$filename = Util::getFormData('file');
+$type = Util::getFormData('type');
+
+/* Get the object. */
+if (!isset($cfgSources[$source])) {
+    Horde::fatal(_("The contact you requested does not exist."), __FILE__, __LINE__);
+}
+$driver = &Turba_Driver::singleton($source);
+$object = $driver->getObject($key);
+if (is_a($object, 'PEAR_Error')) {
+    Horde::fatal($object, __FILE__, __LINE__);
+}
+
+/* Check permissions. */
+if (!$object->hasPermission(PERMS_READ)) {
+    Horde::fatal(_("You do not have permission to view this contact."), __FILE__, __LINE__);
+}
+
+$v_params = Horde::getVFSConfig('documents');
+if (is_a($v_params, 'PEAR_Error')) {
+    Horde::fatal($v_params, __FILE__, __LINE__);
+}
+require_once 'VFS.php';
+$vfs = &VFS::singleton($v_params['type'], $v_params['params']);
+if (is_a($vfs, 'PEAR_Error')) {
+    Horde::fatal($vfs, __FILE__, __LINE__);
+} else {
+    $data = $vfs->read(TURBA_VFS_PATH . '/' . $object->getValue('__uid'), $filename);
+}
+if (is_a($data, 'PEAR_Error')) {
+    Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_ERR);
+    Horde::fatal(sprintf(_("Access denied to %s"), $filename), __FILE__, __LINE__);
+}
+
+/* Run through action handlers */
+switch ($actionID) {
+case 'download_file':
+     $browser->downloadHeaders($filename);
+     echo $data;
+     exit;
+
+case 'view_file':
+    require_once 'Horde/MIME/Magic.php';
+    require_once 'Horde/MIME/Viewer.php';
+    require_once 'Horde/MIME/Part.php';
+    require HORDE_BASE . '/config/mime_drivers.php';
+    require TURBA_BASE . '/config/mime_drivers.php';
+    $mime_part = &new MIME_Part(MIME_Magic::extToMIME($type), $data);
+    $mime_part->setName($filename);
+    $viewer = &MIME_Viewer::factory($mime_part);
+
+    $body = $viewer->render();
+    $browser->downloadHeaders($filename, $viewer->getType(), true, strlen($body));
+    echo $body;
+    exit;
+}


--- /dev/null
+++ themes/ideas/.arch-ids/screen.css.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:28 2006 28426.0


--- /dev/null
+++ addressbooks.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Turba script to manage the user's addressbook shares.
+ *
+ * Copyright 2005-2006 Michael J. Rubinsky <mrubinsk at horde.org>
+ *
+ * $Horde: turba/addressbooks.php,v 1.3.2.6 2006/01/11 16:40:09 jan Exp $
+ *
+ * See the enclosed file LICENSE for license information (ASL).  If you did
+ * not receive this file, see http://www.horde.org/licenses/asl.php.
+ *
+ * @author Michael J. Rubinsky <mrubinsk at horde.org>
+ */
+
+ at define('TURBA_BASE', dirname(__FILE__));
+require_once TURBA_BASE . '/lib/base.php';
+
+// Exit if this isn't an authenticated user, or if there's no source
+// configured for shares.
+if (!Auth::getAuth() || !$haveShare) {
+    require TURBA_BASE . '/' . ($browse_source_count
+                                ? basename($prefs->getValue('initial_page'))
+                                : 'search.php');
+    exit;
+}
+
+// Figure out why we are here.
+$actionID = Util::getFormData('actionID');
+switch ($actionID) {
+case 'add':
+    $params = array(
+        'sourceType' => $conf['shares']['source'],
+        'shareName' => Util::getFormData('sharename')
+    );
+
+    $share = &Turba::createShare($params, false);
+    if (is_a($share, 'PEAR_Error')) {
+        $notification->push(sprintf(_("There was an error creating this address book: %s"), $share->getMessage()), 'horde.error');
+    } else {
+        // Created the share, now add it to the address books pref it we need
+        // to.
+        $addressbooks = $prefs->getValue('addressbooks');
+        $shareKey = $conf['shares']['source'] . ':' . $share->get('uid');
+        if ($addressbooks) {
+            $addressbooks .= "\n" . $shareKey;
+            $prefs->setValue('addressbooks', $addressbooks);
+        }
+        $notification->push(sprintf(_("The address book \"%s\" was created successfully."), $share->get('name')), 'horde.success');
+    }
+    header('Location: ' . Horde::applicationUrl('addressbooks.php', true));
+    exit;
+
+case 'delete':
+    // Get the source type and uid
+    list($type, $uid) = explode(':', Util::getFormData('deleteshare'), 2);
+    $driver = &Turba_Driver::singleton($type);
+    if (is_a($driver, 'PEAR_Error')) {
+        $notification->push(sprintf(_("There was an error removing this address book: %s"), $driver->getMessage()), 'horde.error');
+    } else {
+        // We have a Turba_Driver, try to delete the address book.
+        $result = $driver->deleteAll($uid);
+        if (is_a($result, 'PEAR_Error')) {
+            $notification->push(sprintf(_("There was an error removing this address book: %s"), $result->getMessage()), 'horde.error');
+        } else {
+            // Address book successfully deleted from backend, remove the
+            // share.
+            $result = Turba::deleteShare(Util::getFormData('deleteshare'));
+            if (is_a($result, 'PEAR_Error')) {
+                $notification->push(sprintf(_("There was an error removing this address book: %s"), $result->getMessage()), 'horde.error');
+            } else {
+                $notification->push(sprintf(_("The address book \"%s\" was removed successfully."), $result), 'horde.success');
+            }
+        }
+    }
+    header('Location: ' . Horde::applicationUrl('addressbooks.php', true));
+    exit;
+
+case 'update':
+    // Updating some info on an existing share.
+    $shareName = Util::getFormData('editshare');
+    $params = array(
+        'name' => Util::getFormData('sharetitle'),
+        'description' => Util::getFormData('description')
+    );
+    $result = Turba::updateShare($shareName, $params);
+    if (is_a($result, 'PEAR_Error')) {
+        $notification->push(sprintf(_("There was an error updating this address book: %s"), $result->getMessage()), 'horde.error');
+    } else {
+        $notification->push(sprintf(_("The address book \"%s\" was successfully updated."), $result), 'horde.success');
+    }
+    header('Location: ' . Horde::applicationUrl('addressbooks.php', true));
+    exit;
+}
+
+// Get all the info we will need to display the page.
+$mySources = array();
+$myRemovable = array();
+
+// Get the shares owned by the current user, and figure out what we will
+// display the share name as to the user.
+$shares = Turba::listShares(true);
+foreach ($shares as $key => $value) {
+    list($src, $user) = explode(':', $key, 2);
+    if ($user == Auth::getAuth()) {
+        $cfgSrcKey = $src;
+    } else {
+        $myRemovable[] = $key;
+        $cfgSrcKey = $key;
+    }
+    // This is the 'display name' of the share.  This is so we can call the
+    // user's own default share "My Address Book" (or whatever this source is
+    // configured to be called in $cfgSources) but display the same share as
+    // "Username's Address Book" (or similar) if the current user is not the
+    // owner.
+    $mySources[$key] = $cfgSources[$cfgSrcKey]['title'];
+}
+
+Horde::addScriptFile('popup.js', 'horde', true);
+$title = _("My Address Books");
+require TURBA_TEMPLATES . '/common-header.inc';
+require TURBA_TEMPLATES . '/menu.inc';
+require TURBA_TEMPLATES . '/addressbooks.inc';
+require $registry->get('templates', 'horde') . '/common-footer.inc';


--- /dev/null
+++ scripts/.arch-ids/import_vcards.php.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28418.0


--- /dev/null
+++ templates/prefs/.arch-ids/imsp_opt.inc.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:28 2006 28424.0


--- /dev/null
+++ po/is_IS.po
@@ -0,0 +1,1120 @@
+# Icelandic translations for disk package.
+# Copyright (C) 2005 Horde Project
+# This file is distributed under the same license as the disk package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: disk 1\n"
+"Report-Msgid-Bugs-To: bjossi at snerpa.is\n"
+"POT-Creation-Date: 2005-11-19 20:33+0000\n"
+"PO-Revision-Date: 2005-11-19 20:33+0000\n"
+"Last-Translator: Bjorn Davidsson <bjossi at snerpa.is>\n"
+"Language-Team: support at snerpa.is\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: browse.php:120
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:118
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:111
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:110
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:87
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:256
+#, fuzzy, php-format
+msgid "%s file successfully imported"
+msgstr "Mappan \"%s\" var búin til."
+
+#: templates/browse/footer.inc:5
+#, fuzzy, php-format
+msgid "%s to %s of %s"
+msgstr "%d til %d af %d skeytum"
+
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:132
+msgid "Above search form"
+msgstr ""
+
+#: templates/browse/search.inc:65
+msgid "Ad_vanced Search"
+msgstr "Ítarleg leit"
+
+#: add.php:52
+msgid "Add"
+msgstr "Bæta við"
+
+#: templates/prefs/columnselect.inc:237
+msgid "Add column"
+msgstr ""
+
+#: templates/browse/actions.inc:22
+msgid "Add to"
+msgstr "Bæta við"
+
+#: browse.php:30 config/prefs.php.dist:99
+#, fuzzy
+msgid "Address Book Listing"
+msgstr "Netfangabók"
+
+#: add.php:86
+#, fuzzy
+msgid "Address book entry"
+msgstr "Netfangabækur"
+
+#: lib/Driver.php:478
+#, fuzzy
+msgid "Address book is read-only."
+msgstr "Netfangabækur"
+
+#: data.php:236
+msgid "Address book successfully purged."
+msgstr ""
+
+#: search.php:97 templates/browse/search.inc:65
+#: templates/browse/search.inc:113
+msgid "Advanced Search"
+msgstr "Ítarleg leit"
+
+#: config/attributes.php.dist:64
+msgid "Alias"
+msgstr "Stuttnefni"
+
+#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+msgid "All"
+msgstr "Allar skráningar"
+
+#: lib/api.php:395
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:89
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr "Ert þú viss um að þú viljir eyða %s?"
+
+#: templates/browse/javascript.inc:63
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr "Ert þú viss um að þú viljir eyða völdum línum?"
+
+#: config/prefs.php.dist:70
+msgid "Ascending"
+msgstr "Hækkandi"
+
+#: templates/prefs/columnselect.inc:233
+#, fuzzy
+msgid "Available Columns:"
+msgstr "Tiltækar netfangabækur:"
+
+#: templates/browse/actions.inc:44
+#, php-format
+msgid "Ba_ck to %s"
+msgstr "Til baka í %s"
+
+#: templates/browse/actions.inc:44
+msgid "Back to %s"
+msgstr "Til baka í %s"
+
+#: templates/browse/search.inc:116
+msgid "Basi_c Search"
+msgstr "Einföld leit"
+
+#: search.php:94 templates/browse/search.inc:62
+#: templates/browse/search.inc:116
+msgid "Basic Search"
+msgstr "Einföld leit"
+
+#: config/prefs.php.dist:131
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
+
+#: data.php:28
+msgid "CSV"
+msgstr ""
+
+#: templates/browse/actions.inc:48
+#, fuzzy
+msgid "C_lear Search"
+msgstr "Leita í skeytum"
+
+#: templates/browse/column_headers.inc:5
+msgid "Check _All/None"
+msgstr "Velja alla/engan"
+
+#: config/prefs.php.dist:29
+msgid ""
+"Choose a default directory for your personal addressbook, contact lists, and "
+"searches."
+msgstr ""
+
+#: add.php:44
+msgid "Choose an address book"
+msgstr "Veldu netfangabók"
+
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose the order of the columns to display in the address list."
+msgstr ""
+"Veldu uppröðun netfangabóka sem á að leita í, þegar leitað er að netföngum."
+
+#: templates/browse/actions.inc:48
+#, fuzzy
+msgid "Clear Search"
+msgstr "Leita í skeytum"
+
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Column Options"
+msgstr "Valstillingar"
+
+#: templates/data/export.inc:16 templates/data/import.inc:18
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:17
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
+msgid "Company"
+msgstr "Fyrirtæki"
+
+#: config/attributes.php.dist:144
+msgid "Company Address"
+msgstr ""
+
+#: lib/api.php:247 lib/api.php:268 lib/api.php:384 lib/api.php:454
+#: lib/api.php:544 lib/api.php:590 lib/api.php:638 lib/api.php:825
+#: lib/api.php:918
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Endurvísun misheppaðist."
+
+#: lib/Driver/ldap.php:66
+msgid "Connection failure"
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:257
+#, php-format
+msgid "Contacts in list: %s"
+msgstr "Tengiliðir í lista: %s"
+
+#: browse.php:281
+#, php-format
+msgid "Contents of %s"
+msgstr "Innihald í %s"
+
+#: templates/browse/actions.inc:12
+msgid "Copy"
+msgstr "Afrit"
+
+#: lib/ObjectView.php:134
+#, fuzzy
+msgid "Created"
+msgstr "Búa til"
+
+#: config/prefs.php.dist:16
+#, fuzzy
+msgid "Default Display"
+msgstr "Sjálfgefið kennimark"
+
+#: config/prefs.php.dist:121
+msgid ""
+"Default directory for your personal addressbook, contact lists, and searches."
+msgstr ""
+
+#: config/prefs.php.dist:72
+msgid "Default sorting direction:"
+msgstr "Sjálfgefin uppröðun:"
+
+#: templates/browse/actions.inc:3 lib/Renderer.php:48
+msgid "Delete"
+msgstr "Eyða"
+
+#: config/prefs.php.dist:35
+#, fuzzy
+msgid "Delete Confirmation"
+msgstr "Upplýsingar netþjóns"
+
+#: config/prefs.php.dist:36
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:283
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Eyða möppu(m)"
+
+#: delete.php:32
+#, fuzzy
+msgid "Deletion failed"
+msgstr "Endurvísun misheppaðist."
+
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:71
+msgid "Descending"
+msgstr "Lækkandi"
+
+#: templates/browse/search.inc:132
+msgid "Directory"
+msgstr "Netfangabók"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
+#: config/prefs.php.dist:27
+msgid "Display Options"
+msgstr "Útlitsstillingar"
+
+#: config/prefs.php.dist:149
+#, fuzzy
+msgid "Do you want to confirm deleting entries?"
+msgstr "Viltu opna þessa möppu?"
+
+#: templates/browse/contactrow.inc:25
+#, fuzzy
+msgid "Download vCard"
+msgstr "Sækja yfir á vinnustöð"
+
+#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
+#: lib/Renderer.php:46
+msgid "Edit"
+msgstr "Breyta"
+
+#: templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Breyta"
+
+#: edit.php:53 edit.php:80
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
+msgid "Email"
+msgstr "Netfang"
+
+#: edit.php:79
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:46
+msgid "Export"
+msgstr "Flytja út"
+
+#: templates/data/export.inc:7
+msgid "Export Address Book"
+msgstr "Flytja út netfangabók"
+
+#: templates/data/export.inc:26
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:32
+msgid "Export the following address book completely."
+msgstr ""
+
+#: search.php:52 data.php:110 data.php:228 add.php:63 browse.php:37
+#: browse.php:94 browse.php:109
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
+msgstr "Bæta í netfangabók (%s)"
+
+#: browse.php:128
+#, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr ""
+
+#: browse.php:263
+msgid "Failed to browse list"
+msgstr ""
+
+#: browse.php:297
+msgid "Failed to browse the directory"
+msgstr ""
+
+#: lib/Driver/ldap.php:321
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:114
+#, php-format
+msgid "Failed to find object to be added: %s"
+msgstr ""
+
+#: search.php:88 data.php:124
+#, php-format
+msgid "Failed to search the directory: %s"
+msgstr ""
+
+#: config/attributes.php.dist:167
+msgid "Fax"
+msgstr ""
+
+#: templates/browse/search.inc:72
+msgid "Find"
+msgstr "Finna"
+
+#: config/attributes.php.dist:48
+#, fuzzy
+msgid "First Name"
+msgstr "Fyrsta síða"
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:85
+msgid "From"
+msgstr "í"
+
+#: config/sources.php.dist:562
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Netfangabók"
+
+#: templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
+
+#: config/attributes.php.dist:82
+msgid "Home Address"
+msgstr "Heimilisfang"
+
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+msgid "Home Country"
+msgstr ""
+
+#: config/attributes.php.dist:150
+msgid "Home Phone"
+msgstr "Heimasími"
+
+#: config/attributes.php.dist:103
+msgid "Home Postal Code"
+msgstr ""
+
+#: config/attributes.php.dist:98
+msgid "Home State/Province"
+msgstr ""
+
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Sendandanetfang"
+
+#: config/sources.php.dist:487
+msgid "IMSP"
+msgstr ""
+
+#: templates/data/import.inc:9
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Netfangabók"
+
+#: data.php:274
+#, fuzzy
+msgid "Import/Export Address Books"
+msgstr "Netfangabók"
+
+#: lib/api.php:378 lib/api.php:604
+msgid "Invalid Content-Type"
+msgstr ""
+
+#: lib/api.php:441 lib/api.php:531
+msgid "Invalid ID"
+msgstr ""
+
+#: lib/api.php:191 lib/api.php:334 lib/api.php:437 lib/api.php:527
+#: lib/api.php:580 lib/api.php:895
+#, fuzzy
+msgid "Invalid address book"
+msgstr "Tiltækar netfangabækur:"
+
+#: lib/api.php:899 lib/api.php:973 lib/api.php:1026
+msgid "Invalid email"
+msgstr ""
+
+#: lib/api.php:907
+msgid "Invalid entry"
+msgstr ""
+
+#: lib/Driver/ldap.php:279
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "enginn texti tilgreindur"
+
+#: lib/api.php:903
+msgid "Invalid name"
+msgstr ""
+
+#: lib/api.php:584
+msgid "Invalid objectId"
+msgstr ""
+
+#: lib/Driver/ldap.php:38
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:139
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "síðasta bls."
+
+#: templates/browse/column_headers.inc:8
+msgid "List"
+msgstr ""
+
+#: templates/browse/search.inc:79
+msgid "Matching"
+msgstr "sem passar við"
+
+#: config/prefs.php.dist:81
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "Leita"
+
+#: lib/Driver/ldap.php:315
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+msgid "Mobile Phone"
+msgstr "Farsími"
+
+#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1012
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr "Flytja"
+
+#: templates/prefs/columnselect.inc:247
+#, fuzzy
+msgid "Move left"
+msgstr "Flytja upp"
+
+#: templates/prefs/columnselect.inc:249
+msgid "Move right"
+msgstr ""
+
+#: data.php:31 templates/data/import.inc:21
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "Netfangabók"
+
+#: lib/api.php:932
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:87 config/sources.php.dist:221
+#, fuzzy
+msgid "My Address Book"
+msgstr "Netfangabók"
+
+#: config/attributes.php.dist:42
+msgid "Name"
+msgstr "Nafn"
+
+#: config/prefs.php.dist:22
+msgid "Name Format"
+msgstr ""
+
+#: config/sources.php.dist:295
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:102 lib/Block/minisearch.php:27
+msgid "New Contact"
+msgstr "Nýr tengiliður"
+
+#: templates/browse/actions.inc:26
+#, fuzzy
+msgid "New List"
+msgstr "Nýr póstur"
+
+#: templates/data/import.inc:42
+msgid "Next"
+msgstr "Næsta"
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Nafn"
+
+#: lib/api.php:1014 lib/api.php:1063
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
+
+#: lib/api.php:982
+#, fuzzy
+msgid "No address books found."
+msgstr "Netfangabækur"
+
+#: minisearch.php:87
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:356
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
+msgid "None"
+msgstr "Engin"
+
+#: config/attributes.php.dist:184
+msgid "Notes"
+msgstr "Glósur"
+
+#: config/prefs.php.dist:89
+msgid "Number of items per page"
+msgstr ""
+
+#: lib/api.php:460
+msgid "Object not found"
+msgstr ""
+
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
+
+#: config/prefs.php.dist:34
+msgid "Other Options"
+msgstr "Aðrar stillingar"
+
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
+
+#: lib/api.php:340 lib/api.php:447 lib/api.php:537 lib/api.php:596
+#: lib/api.php:753 lib/api.php:913
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:436
+msgid "Permission denied"
+msgstr ""
+
+#: data.php:32 templates/data/import.inc:22
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "Netfangabók"
+
+#: templates/browse/javascript.inc:30
+#, fuzzy
+msgid "Please enter the name of the new list:"
+msgstr "Sláðu inn nýtt möppunafn:"
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Please select a directory:"
+msgstr "Veldu eða breyttu til hægri, næst:"
+
+#: config/sources.php.dist:399
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Netfangabók"
+
+#: lib/Driver/ldap.php:155
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Leita"
+
+#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "færa niður"
+
+#: templates/browse/actions.inc:3
+msgid "Remove from this list"
+msgstr "Fjarlægja úr listanum"
+
+#: templates/data/import.inc:26
+msgid ""
+"Replace existing address book with the imported one? <b>Warning: This "
+"deletes all entries in your current address book.</b>"
+msgstr ""
+
+#: lib/Driver.php:330
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:126
+msgid "Reset to Defaults"
+msgstr "Endursetja leitarreiti"
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:77
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:57 add.php:37
+msgid "Save"
+msgstr "Vista"
+
+#: templates/browse/search.inc:98 templates/browse/search.inc:125
+#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
+msgid "Search"
+msgstr "Leita"
+
+#: minisearch.php:66 browse.php:241
+msgid "Search Results"
+msgstr "Niðurstaða leitar"
+
+#: lib/api.php:829
+#, fuzzy
+msgid "Search failed"
+msgstr "Leita"
+
+#: lib/api.php:922 lib/api.php:928 lib/api.php:937 lib/api.php:950
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: config/prefs.php.dist:28
+msgid "Searching Options"
+msgstr "Leitarvalkostir"
+
+#: templates/block/minisearch.inc:24
+msgid "Searching..."
+msgstr "Leita..."
+
+#: templates/browse/select.inc:9
+msgid "Select Address Book"
+msgstr "Veljið netfangabók:"
+
+#: templates/browse/actions.inc:24
+msgid "Select List"
+msgstr "Valinn lista"
+
+#: templates/data/export.inc:37
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Valdar netfangabækur:"
+
+#: templates/data/import.inc:31
+#, fuzzy
+msgid "Select the address book to import to:"
+msgstr "Valdar netfangabækur:"
+
+#: templates/data/export.inc:14
+msgid "Select the export format:"
+msgstr ""
+
+#: templates/data/import.inc:40
+msgid "Select the file to import:"
+msgstr ""
+
+#: templates/data/import.inc:16
+msgid "Select the format of the source file:"
+msgstr ""
+
+#: config/prefs.php.dist:109
+msgid "Select the format used to display names:"
+msgstr ""
+
+#: config/prefs.php.dist:17
+msgid "Select view to display by default."
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Select which fields to display in the address lists."
+msgstr ""
+
+#: config/prefs.php.dist:23
+msgid "Select which format to display names."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:243
+#, fuzzy
+msgid "Selected Columns:"
+msgstr "Velja ekkert"
+
+#: add.php:50
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "Valdar netfangabækur:"
+
+#: config/sources.php.dist:154
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Röðunarátt"
+
+#: templates/browse/actions.inc:42
+msgid "Sho_w All"
+msgstr "Sýna allt"
+
+#: templates/browse/select.inc:11
+msgid "Show"
+msgstr "Sýna"
+
+#: templates/browse/actions.inc:42
+msgid "Show All"
+msgstr "Sýna allt"
+
+#: templates/browse/actions.inc:41
+msgid "Show Contacts"
+msgstr "Sýna tengiliði"
+
+#: templates/browse/actions.inc:40
+msgid "Show Lists"
+msgstr "Sýna lista"
+
+#: templates/browse/actions.inc:41
+msgid "Show _Contacts"
+msgstr "Sýna tengiliði"
+
+#: templates/browse/actions.inc:40
+msgid "Show _Lists"
+msgstr "Sýna lista"
+
+#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:15
+msgid "Sort Direction"
+msgstr "Röðunarátt"
+
+#: lib/api.php:154
+#, fuzzy
+msgid "Sources"
+msgstr "Framkvæmt"
+
+#: config/prefs.php.dist:130
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
+
+#: browse.php:130
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
+
+#: data.php:29
+msgid "TSV"
+msgstr ""
+
+#: templates/data/export.inc:18 templates/data/import.inc:19
+msgid "Tab separated values"
+msgstr ""
+
+#: data.php:234
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:24 vcard.php:22 display.php:23
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: browse.php:33
+msgid "There are no browseable address books."
+msgstr ""
+
+#: add.php:29
+msgid ""
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
+msgstr ""
+
+#: add.php:99
+msgid ""
+"There was an error adding the new contact. Contact your system administrator "
+"for further help."
+msgstr ""
+
+#: browse.php:185
+#, fuzzy
+msgid "There was an error creating a new list."
+msgstr "Villa kom upp þegar átti að vista uppkastið."
+
+#: browse.php:136
+#, fuzzy, php-format
+msgid "There was an error deleting %s from the source address book."
+msgstr ""
+"Villa kom upp þegar átti að eyða skeytum. Villutilkynning netþjónsins fylgir "
+"hér á eftir"
+
+#: delete.php:31
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Villa kom upp við birtingu þessa hluta skeytisins"
+
+#: browse.php:68
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "Villa kom upp við birtingu þessa hluta skeytisins"
+
+#: browse.php:273
+#, fuzzy
+msgid "There was an error displaying the select List"
+msgstr "Villa kom upp við birtingu þessa hluta skeytisins"
+
+#: data.php:249
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "Villa kom upp þegar átti að vista uppkastið."
+
+#: lib/api.php:352
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "Villa kom upp þegar átti að vista uppkastið."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing this object."
+msgstr "Villa kom upp þegar átti að vista uppkastið."
+
+#: edit.php:84
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "Villa kom upp við birtingu þessa hluta skeytisins"
+
+#: data.php:151
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Það eru engin skeyti í þessu pósthólfi."
+
+#: lib/Driver.php:390 lib/Driver.php:427
+msgid "This address book is read-only"
+msgstr ""
+
+#: data.php:211
+msgid "This file format is not supported."
+msgstr ""
+
+#: lib/api.php:941 lib/api.php:954
+#, php-format
+msgid "This person already has a %s entry in the address book"
+msgstr ""
+
+#: config/attributes.php.dist:70
+msgid "Title"
+msgstr "Titill"
+
+#: lib/Driver.php:835
+#, php-format
+msgid "Unable to load the definition of %s."
+msgstr ""
+
+#: edit.php:57
+msgid "Undo Changes"
+msgstr "Fjarlægja breytingar"
+
+#: lib/api.php:489
+msgid "Unsupported Content-Type."
+msgstr ""
+
+#: config/sources.php.dist:358
+msgid "Verisign Directory"
+msgstr ""
+
+#: templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
+msgstr "Sýna %s"
+
+#: minisearch.php:82
+msgid "View Contact"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "View to display by default:"
+msgstr ""
+
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
+
+#: config/attributes.php.dist:113
+msgid "Work Address"
+msgstr "Heimilisf. vinnu"
+
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+msgid "Work Country"
+msgstr ""
+
+#: config/attributes.php.dist:156
+msgid "Work Phone"
+msgstr "Vinnusími"
+
+#: config/attributes.php.dist:134
+msgid "Work Postal Code"
+msgstr ""
+
+#: config/attributes.php.dist:129
+msgid "Work State/Province"
+msgstr ""
+
+#: config/attributes.php.dist:119
+msgid "Work Street Address"
+msgstr ""
+
+#: templates/browse/javascript.inc:30
+#, fuzzy
+msgid "You are creating a distribution list."
+msgstr "Þú ert um það bil að búa til undirmöppu í "
+
+#: edit.php:44 display.php:59
+msgid "You do not have permission to view this contact."
+msgstr ""
+
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
+
+#: templates/browse/javascript.inc:51
+#, fuzzy
+msgid "You must select a target address book."
+msgstr "Þú þarft að velja netfang fyrst."
+
+#: templates/browse/javascript.inc:23
+#, fuzzy
+msgid "You must select a target list."
+msgstr "Þú þarft að velja í hvaða möppu pósturinn á að fara fyrst."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
+#: templates/browse/javascript.inc:68
+#, fuzzy
+msgid "You must select at least one entry first."
+msgstr "Veldu a.m.k. eitt skeyti fyrst."
+
+#: edit.php:48
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:284
+msgid "Your default addressbook is not browseable."
+msgstr ""
+
+#: templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:286
+msgid "_Add"
+msgstr "Bæta við"
+
+#: lib/Turba.php:283
+msgid "_Browse"
+msgstr "Skoða"
+
+#: templates/browse/actions.inc:3
+msgid "_Delete"
+msgstr "Eyða"
+
+#: lib/Turba.php:292
+msgid "_Import/Export"
+msgstr "Flytja inn/út"
+
+#: templates/browse/actions.inc:3
+msgid "_Remove from this list"
+msgstr "Fjarlægja úr listanum"
+
+#: lib/Turba.php:288
+msgid "_Search"
+msgstr "Leita"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:172 data.php:177 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:182
+#, fuzzy
+msgid "contacts.tsv"
+msgstr "Tengiliðalisti"
+
+#: templates/browse/actions.inc:14
+msgid "to Selected Address Book"
+msgstr "í valinni netfangabók"
+
+#: data.php:30 templates/browse/column_headers.inc:7
+#: templates/data/export.inc:20 templates/data/import.inc:20
+msgid "vCard"
+msgstr ""


--- /dev/null
+++ templates/.arch-ids/addressbooks.inc.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28421.0


--- /dev/null
+++ {arch}/turba/turba--upstream/turba--upstream--2/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-1
@@ -0,0 +1,124 @@
+Revision: turba--upstream--2--patch-1
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Thu Apr  6 19:13:29 CEST 2006
+Standard-date: 2006-04-06 17:13:29 GMT
+New-files: .arch-ids/addressbooks.php.id
+    .arch-ids/view.php.id addressbooks.php
+    config/.arch-ids/mime_drivers.php.dist.id
+    config/mime_drivers.php.dist
+    lib/Block/.arch-ids/tree_menu.php.id
+    lib/Block/tree_menu.php
+    lib/Driver/.arch-ids/null.php.id lib/Driver/null.php
+    lib/Object/.arch-ids/=id
+    lib/Object/.arch-ids/Group.php.id lib/Object/Group.php
+    locale/fa_IR/.arch-ids/help.xml.id
+    locale/fa_IR/help.xml locale/is_IS/.arch-ids/=id
+    locale/is_IS/LC_MESSAGES/.arch-ids/=id
+    locale/is_IS/LC_MESSAGES/.arch-ids/turba.mo.id
+    locale/is_IS/LC_MESSAGES/turba.mo
+    locale/tr_TR/.arch-ids/help.xml.id
+    locale/tr_TR/help.xml po/.arch-ids/is_IS.po.id
+    po/is_IS.po scripts/.arch-ids/import_vcards.php.id
+    scripts/import_vcards.php
+    scripts/sql/.arch-ids/turba_objects.mssql.sql.id
+    scripts/sql/turba_objects.mssql.sql
+    scripts/upgrades/.arch-ids/public_to_horde_share.php.id
+    scripts/upgrades/public_to_horde_share.php
+    templates/.arch-ids/addressbooks.inc.id
+    templates/addressbooks.inc
+    templates/browse/.arch-ids/row.inc.id
+    templates/browse/row.inc
+    templates/prefs/.arch-ids/addressbookselect.inc.id
+    templates/prefs/.arch-ids/imsp_opt.inc.id
+    templates/prefs/addressbookselect.inc
+    templates/prefs/imsp_opt.inc themes/ideas/.arch-ids/=id
+    themes/ideas/.arch-ids/screen.css.id
+    themes/ideas/screen.css view.php
+New-directories: lib/Object lib/Object/.arch-ids
+    locale/is_IS locale/is_IS/.arch-ids
+    locale/is_IS/LC_MESSAGES
+    locale/is_IS/LC_MESSAGES/.arch-ids themes/ideas
+    themes/ideas/.arch-ids
+Removed-files: templates/browse/.arch-ids/select.inc.id
+    templates/browse/select.inc
+Modified-files: LICENSE README add.php browse.php
+    config/attributes.php.dist config/conf.xml
+    config/prefs.php.dist config/sources.php.dist data.php
+    delete.php display.php docs/CHANGES docs/CREDITS
+    docs/INSTALL docs/LDAP docs/RELEASE_NOTES docs/UPGRADING
+    edit.php index.php lib/Block/minisearch.php
+    lib/Driver.php lib/Driver/imsp.php lib/Driver/kolab.php
+    lib/Driver/ldap.php lib/Driver/prefs.php
+    lib/Driver/sql.php lib/List.php lib/ListView.php
+    lib/Object.php lib/ObjectView.php lib/Renderer.php
+    lib/Turba.php lib/api.php lib/base.php lib/prefs.php
+    lib/version.php locale/ar_SY/LC_MESSAGES/turba.mo
+    locale/bg_BG/LC_MESSAGES/turba.mo
+    locale/ca_ES/LC_MESSAGES/turba.mo
+    locale/cs_CZ/LC_MESSAGES/turba.mo
+    locale/da_DK/LC_MESSAGES/turba.mo
+    locale/de_DE/LC_MESSAGES/turba.mo
+    locale/el_GR/LC_MESSAGES/turba.mo
+    locale/es_ES/LC_MESSAGES/turba.mo
+    locale/et_EE/LC_MESSAGES/turba.mo
+    locale/fa_IR/LC_MESSAGES/turba.mo
+    locale/fi_FI/LC_MESSAGES/turba.mo locale/fi_FI/help.xml
+    locale/fr_FR/LC_MESSAGES/turba.mo
+    locale/gl_ES/LC_MESSAGES/turba.mo
+    locale/hu_HU/LC_MESSAGES/turba.mo
+    locale/it_IT/LC_MESSAGES/turba.mo
+    locale/ja_JP/LC_MESSAGES/turba.mo
+    locale/ko_KR/LC_MESSAGES/turba.mo
+    locale/lt_LT/LC_MESSAGES/turba.mo
+    locale/lv_LV/LC_MESSAGES/turba.mo
+    locale/mk_MK/LC_MESSAGES/turba.mo
+    locale/nb_NO/LC_MESSAGES/turba.mo
+    locale/nl_NL/LC_MESSAGES/turba.mo
+    locale/nn_NO/LC_MESSAGES/turba.mo
+    locale/pl_PL/LC_MESSAGES/turba.mo
+    locale/pt_BR/LC_MESSAGES/turba.mo
+    locale/pt_PT/LC_MESSAGES/turba.mo
+    locale/ro_RO/LC_MESSAGES/turba.mo
+    locale/ru_RU/LC_MESSAGES/turba.mo
+    locale/sk_SK/LC_MESSAGES/turba.mo
+    locale/sl_SI/LC_MESSAGES/turba.mo
+    locale/sv_SE/LC_MESSAGES/turba.mo
+    locale/tr_TR/LC_MESSAGES/turba.mo
+    locale/uk_UA/LC_MESSAGES/turba.mo
+    locale/zh_CN/LC_MESSAGES/turba.mo
+    locale/zh_TW/LC_MESSAGES/turba.mo minisearch.php
+    po/ar_SY.po po/bg_BG.po po/ca_ES.po po/cs_CZ.po
+    po/da_DK.po po/de_DE.po po/el_GR.po po/es_ES.po
+    po/et_EE.po po/fa_IR.po po/fi_FI.po po/fr_FR.po
+    po/gl_ES.po po/hu_HU.po po/it_IT.po po/ja_JP.po
+    po/ko_KR.po po/lt_LT.po po/lv_LV.po po/mk_MK.po
+    po/nb_NO.po po/nl_NL.po po/nn_NO.po po/pl_PL.po
+    po/pt_BR.po po/pt_PT.po po/ro_RO.po po/ru_RU.po
+    po/sk_SK.po po/sl_SI.po po/sv_SE.po po/tr_TR.po
+    po/turba.pot po/uk_UA.po po/zh_CN.po po/zh_TW.po
+    scripts/sql/turba_objects.mysql.sql
+    scripts/sql/turba_objects.pgsql.sql
+    scripts/upgrades/2004-10-26_create_default_histories.php
+    search.php templates/block/minisearch.inc
+    templates/browse/actions.inc
+    templates/browse/column_footers.inc
+    templates/browse/column_headers.inc
+    templates/browse/footer.inc
+    templates/browse/footerAlpha.inc
+    templates/browse/header.inc
+    templates/browse/javascript.inc
+    templates/browse/search.inc
+    templates/browse/search_criteria.inc
+    templates/common-header.inc templates/data/export.inc
+    templates/data/import.inc templates/menu.inc
+    templates/prefs/columnselect.inc test.php
+    themes/screen.css vcard.php
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/turba--upstream--2--patch-1
+Summary: Imported turba-h3-2.1
+Keywords: 
+
+Imported turba-h3-2.1
+into pkg-horde-hackers at lists.alioth.debian.org--2006/turba--upstream--2
+
+


--- /dev/null
+++ locale/is_IS/LC_MESSAGES/.arch-ids/=id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28414.0


--- /dev/null
+++ locale/is_IS/LC_MESSAGES/.arch-ids/turba.mo.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28415.0


--- /dev/null
+++ scripts/upgrades/.arch-ids/public_to_horde_share.php.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28420.0


--- /dev/null
+++ lib/Object/Group.php
@@ -0,0 +1,192 @@
+<?php
+
+require_once TURBA_BASE . '/lib/Object.php';
+
+/**
+ * The Turba_Object_Group:: class provides a set of methods for dealing with
+ * contact groups.
+ *
+ * $Horde: turba/lib/Object/Group.php,v 1.9.2.2 2005/11/14 21:03:27 mrubinsk Exp $
+ *
+ * @author  Chuck Hagenbuch <chuck at horde.org>
+ * @author  Jon Parise <jon at csh.rit.edu>
+ * @package Turba
+ */
+class Turba_Object_Group extends Turba_Object {
+
+    /**
+     * Constructs a new Turba_Object_Group.
+     *
+     * @param Turba_Driver $driver  The driver object that this group comes
+     *                              from.
+     * @param array $attributes     Hash of attributes for this group.
+     */
+    function Turba_Object_Group(&$driver, $attributes = array())
+    {
+        parent::Turba_Object($driver, $attributes);
+        $this->attributes['__type'] = 'Group';
+    }
+
+    /**
+     * Returns true if this object is a group of multiple contacts.
+     *
+     * @return boolean  True.
+     */
+    function isGroup()
+    {
+        return true;
+    }
+
+    /**
+     * Adds a new contact entry to this group.
+     *
+     * @param string $contactId  The id of the contact to add.
+     * @param string $sourceId   The source $contactId is from.
+     *
+     * @since Turba 1.2
+     */
+    function addMember($contactId, $sourceId = null)
+    {
+        // Default to the same source as the group.
+        if (is_null($sourceId)) {
+            $sourceId = $this->getSource();
+        }
+
+        // Can't add a group to itself.
+        if ($contactId == $this->attributes['__key']) {
+            return PEAR::raiseError(_("Can't add a group to itself."));
+        }
+
+        // Try to find the contact being added.
+        if ($sourceId == $this->getSource()) {
+            $contact = $this->driver->getObject($contactId);
+        } else {
+            $driver = &Turba_Driver::singleton($sourceId);
+            if (is_a($driver, 'PEAR_Error')) {
+                return $driver;
+            }
+            $contact = $driver->getObject($contactId);
+        }
+
+        // Bail out if the contact being added doesn't exist or can't
+        // be retrieved.
+        if (is_a($contact, 'PEAR_Error')) {
+            return $contact;
+        }
+
+        // Explode members.
+        $members = @unserialize($this->attributes['__members']);
+        if (!is_array($members)) {
+            $members = array();
+        }
+
+        // If the contact is from a different source, store its source
+        // id as well.
+        if ($sourceId == $this->getSource()) {
+            $members[] = $contactId;
+        } else {
+            $members[] = $sourceId . ':' . $contactId;
+        }
+
+        // Remove duplicates.
+        $members = array_unique($members);
+
+        $this->attributes['__members'] = serialize($members);
+
+        return true;
+    }
+
+    /**
+     * Deletes a contact from this group.
+     *
+     * @param string $contactId  The id of the contact to remove.
+     * @param string $sourceId   The source $contactId is from.
+     *
+     * @since Turba 1.2
+     */
+    function removeMember($contactId, $sourceId = null)
+    {
+        $members = @unserialize($this->attributes['__members']);
+
+        if (is_null($sourceId) || $sourceId == $this->getSource()) {
+            $i = array_search($contactId, $members);
+        } else {
+            $i = array_search($sourceId . ':' . $contactId, $members);
+        }
+
+        if ($i !== false) {
+            unset($members[$i]);
+        }
+
+        $this->attributes['__members'] = serialize($members);
+
+        return true;
+    }
+
+    /**
+     * Retrieve the Objects in this group
+     *
+     * @param $sort_criteria     The requested sort order which is passed to
+     *                           Turba_List::sort().
+     *
+     * @param $sort_direction    The requested sort direction which is passed to
+     *                           Turba_List::sort().
+     *
+     * @return Turba_List        List containing the members of this group
+     *
+     * @since Turba 1.2
+     */
+    function &listMembers($sort_criteria = 'lastname', $sort_direction = 0)
+    {
+        require_once TURBA_BASE . '/lib/List.php';
+        $list = &new Turba_List();
+
+        $children = unserialize($this->attributes['__members']);
+        if (!is_array($children)) {
+            $children = array();
+        }
+
+        reset($children);
+        $modified = false;
+        foreach ($children as $member) {
+            if (strpos($member, ':') === false) {
+                $contact = $this->driver->getObject($member);
+                if (is_a($contact, 'PEAR_Error')) {
+                    // Remove the contact if it no longer exists
+                    $this->removeMember($member);
+                    $modified = true;
+                }
+            } else {
+                list($sourceId, $contactId) = explode(':', $member, 2);
+                if (strpos($contactId, ':')) {
+                    list($owner, $contactId) = explode(':', $contactId, 2);
+                    $sourceId .= ':' . $owner;
+                }
+                $driver = &Turba_Driver::singleton($sourceId);
+                // Don't prune contacts if the source is not
+                // found, could just be temporarily unavailable.
+                if (!is_a($driver, 'PEAR_Error')) {
+                    $contact = $driver->getObject($contactId);
+                    if (is_a($contact, 'PEAR_Error')) {
+                        // Remove the contact if it no longer exists
+                        $this->removeMember($contactId, $sourceId);
+                        $modified = true;
+                    }
+                } else {
+                    continue;
+                }
+            }
+
+            $list->insert($contact);
+        }
+
+        // If we've pruned any dead entries, store the changes.
+        if ($modified) {
+            $this->store();
+        }
+
+        $list->sort($sort_criteria, $sort_direction);
+        return $list;
+    }
+
+}


--- /dev/null
+++ .arch-ids/addressbooks.php.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28406.0


--- /dev/null
+++ po/.arch-ids/is_IS.po.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28417.0


--- /dev/null
+++ templates/prefs/imsp_opt.inc
@@ -0,0 +1,44 @@
+<?php
+
+if (!$prefs->isLocked('imsp_opt')):
+    global $cfgSources;
+    $source_count = 0;
+    $imsp_souces = array();
+
+    foreach ($cfgSources as $key => $value) {
+        if (($value['type'] == 'imsp') && (!$value['params']['is_root']) &&
+            (strpos($value['params']['my_rights'], 'd') != false)) {
+            $source_count++;
+            $imsp_sources[$key] = $value;
+        }
+    }
+
+?>
+<script type="text/javascript">
+<!--
+function showAlert()
+{
+    if (document.prefs.imsp_books_delete.value != 'none') {
+        window.alert('<?php echo addslashes(_("Once you save this option page, the address book will be permanently deleted. If this is not what you want, then you must change your selection to \"None\".")) ?>');
+    }
+}
+//-->
+</script>
+<table>
+ <tr>
+  <td><?php echo(_(" Delete IMSP Address Book")) ?></td>
+  <td>
+   <select name="imsp_books_delete" style="width:200px" onchange="showAlert();">
+    <option value="none"><?php echo _("none") ?></option>
+    <?php foreach ($imsp_sources as $key => $value): ?>
+    <option value="<?php echo htmlspecialchars($key) ?>"><?php echo htmlspecialchars($value['title']) ?></option>
+    <?php endforeach ?>
+   </select>
+  </td>
+ </tr>
+ <tr>
+  <td><?php echo(_(" Add an IMSP Address Book")) ?></td>
+  <td><input name="imsp_name" type="text" style="width:200px" /></td>
+ </tr>
+</table>
+<?php endif; ?>


--- /dev/null
+++ templates/addressbooks.inc
@@ -0,0 +1,128 @@
+<script type="text/javascript">
+<!--
+var editURL = decodeURIComponent('<?php echo rawurlencode(Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/services/shares/edit.php?app=turba', true), 'share', '@ID@', false)) ?>');
+var shares = new Array();
+<?php foreach ($shares as $key => $value): ?>
+shares['<?php echo addslashes($key) ?>'] = new Array();
+shares['<?php echo addslashes($key) ?>']['name'] = decodeURIComponent("<?php echo rawurlencode($shares[$key]->get('name')) ?>");
+shares['<?php echo addslashes($key) ?>']['description'] = decodeURIComponent("<?php echo rawurlencode($shares[$key]->get('description')) ?>");
+<?php endforeach ?>
+
+function newChoice()
+{
+    var share = document.editshares.share.options[document.editshares.share.selectedIndex].value;
+    if (share == -1) {
+        document.editshares.editshare.value = '';
+        document.editshares.reset();
+    } else {
+        document.editshares.editshare.value = share;
+        document.editshares.sharetitle.value = shares[share]['name'];
+        document.editshares.description.value = shares[share]['description'];
+    }
+}
+
+function checkSubmit()
+{
+    if ((document.editshares.actionID.value == 'add') &
+        ((document.editshares.sharename.value == '') |
+         (document.editshares.sharetype.value == 'none'))) {
+        return false;
+    }
+    if ((document.editshares.actionID.value == 'delete') &
+        (document.editshares.deleteshare.value == 'none')) {
+        return false;
+    }
+}
+// -->
+</script>
+<form action="addressbooks.php" method="post" name="editshares" onsubmit="return checkSubmit();">
+ <input type="hidden" name="actionID" value="none">
+ <h1 class="header"><?php echo _("Create Address Book") ?></h1>
+  <table width = "100%" class="headerbox">
+   <tr>
+    <td width="15%" class="nowrap" align="right">
+     <strong><?php echo _("Choose a name") ?></strong>
+    </td>
+    <td width="85%">
+     <input type="text" style="width:200px" name="sharename" />
+    </td>
+   </tr>
+   <tr>
+    <td>&nbsp;</td>
+    <td>
+     <input type="submit" name="newshare" class="button" onclick="document.editshares.actionID.value='add';" value="<?php echo _("Create") ?>" />
+    </td>
+   </tr>
+  </table>
+<?php if (count($myRemovable)): ?>
+  <h1 class="header"><?php echo _("Delete Address Book") ?></h1>
+  <table width="100%" class="headerbox">
+   <tr>
+    <td width="15%" class="nowrap" align="right">
+     <strong><?php echo _("Address book to delete ") ?></strong>
+    </td>
+    <td width="85%">
+     <select name="deleteshare" style="width:200px">
+      <option value="none"><?php echo _("Select an address book to delete") ?></option>
+      <?php foreach ($myRemovable as $srcName): ?>
+      <option value="<?php echo htmlspecialchars($srcName) ?>"><?php echo htmlspecialchars($mySources[$srcName]) ?></option>
+      <?php endforeach; ?>
+     </select>
+    </td>
+   </tr>
+   <tr>
+    <td>&nbsp;</td>
+    <td>
+     <input type="submit" name="delete" class="button" onclick="document.editshares.actionID.value='delete';" value="<?php echo _("Delete") ?>" />
+    </td>
+   </tr>
+  </table>
+ <?php endif ?>
+ <h1 class="header"><?php echo _("Edit Address Books") ?></h1>
+ <table class="headerbox" width="100%">
+  <tr>
+   <td width="15%" class="nowrap" align="right">
+    <input type="hidden" name="editshare" value="" />
+    <strong><?php echo _("Address Book") ?></strong>
+   </td>
+   <td width="85%">
+    <select name="share" style="width:200px" onchange="newChoice();">
+     <option value="none"><?php echo _("Select an address book to edit") ?></option>
+     <?php foreach ($mySources as $key => $value): ?>
+     <option value="<?php echo htmlspecialchars($key) ?>"><?php echo htmlspecialchars($value) ?></option>
+     <?php endforeach; ?>
+    </select>
+   </td>
+  </tr>
+  <tr>
+   <td class="nowrap" align="right">
+    <strong><?php echo _("Permissions") ?></strong>
+   </td>
+   <td>
+    <input type="button" name="perms" class="button" onclick="if (document.editshares.editshare.value) popup(editURL.replace(/%40ID%40/, document.editshares.editshare.value));" value="<?php echo _("Edit") ?>" />
+   </td>
+  </tr>
+  <tr>
+   <td class="nowrap" align="right">
+    <strong><?php echo _("Name") ?></strong>
+   </td>
+   <td>
+    <input type="text" name="sharetitle" style="width:200px" />
+   </td>
+  </tr>
+  <tr>
+   <td class="nowrap" valign="top" align="right">
+    <strong><?php echo _("Description") ?></strong>
+   </td>
+   <td>
+    <textarea style="width:200px" name="description" rows="4" cols="60"></textarea>
+   </td>
+  </tr>
+  <tr>
+   <td>&nbsp;</td>
+   <td>
+    <input type="submit" name="save" class="button" onclick="document.editshares.actionID.value='update'" value="<?php echo _("Save") ?>" />
+   </td>
+  </tr>
+ </table>
+</form>


Þ•


















Report-Msgid-Bugs-To: bjossi at snerpa.is
POT-Creation-Date: 2005-11-19 20:33+0000
PO-Revision-Date: 2005-11-19 20:33+0000
Last-Translator: Bjorn Davidsson <bjossi at snerpa.is>
Language-Team: support at snerpa.is
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit


--- /dev/null
+++ locale/fa_IR/help.xml
@@ -0,0 +1,113 @@
+<?xml version='1.0'?>
+<!-- $Horde: turba/locale/fa_IR/help.xml,v 1.1 2005/04/1 22:10:12 persian-horde in MetaNET -->
+<help>
+
+<entry id="Overview">
+    <title>مرور</title>
+    <heading>مقدمه</heading>
+    <para>
+    کتابچهٔ آدرس يک روش ساده را برای حفظ و واکشی اطلاعات تماس در اختيار قرار می‌دهد. بسته به اينکه سرپرست سامانهٔ شما چگونه سامانه را پيکربندی نمايد، 
+   شما می‌توانيد کتابچهٔ آدرسهای مختلفی داشته باشيد. همچنين در اين سامانه از ايجاد فهرستهای پستی نيز پشتيبانی می‌شود. 
+    </para>
+</entry>
+
+<entry id="menu-add">
+    <title>گزینگان: اضافه کردن</title>
+    <heading>اضافه کردن</heading>
+    <para>
+    اضافه کردن يک ورودی در کتابچهٔ آدرس: شما تنها می‌توانيد در کتابچهٔ آدرسهايی ورودی جديد درج نماييد که 
+    مجوز نوشتن در آنها را داشته باشيد. عموماْ در کتابچهٔ آدرسهای مشترک و يا عمومی افراد مجوز نوشتن ندارند
+    </para>
+</entry>
+
+<entry id="menu-search">
+    <title>گزینگان: جستجو</title>
+    <heading>جستجو</heading>
+    <para>
+    جستجوی يک کتابچهٔ آدرس برای يافتن اطلاعات مورد نظر: در اين روش يک جستجوی سريع صورت گرفته و جستجو تنها بر روی فيلدهای محدودی
+    صورت می‌گيرد. فيلدهای مشخص شده در اين قسمت بسته به هر سامانه می‌تواند متفاوت باشد.
+    </para>
+    <para>
+    برای جستجوی پيشرفته شما می‌توانيد از  &quot;<ref module="turba" entry="menu-advanced-search">جستجوی پيشرفته</ref>&quot; 
+    استفاده کنيد که به شما اجازه جستجو بر روی فيلدهای ديگر را می‌دهد.
+    </para>
+</entry>
+
+<entry id="menu-advanced-search">
+    <title>گزینگان:جستجوی پيشرفته</title>
+    <heading>جستجوی پيشرفته</heading>
+    <para>
+    يک کتابچهٔ آدرس را برای يافتن اطلاعات مورد نظر جستجو می‌کند. در اين روش جستجو بر روی چندين فيلد (بسته به کتابچهٔ آدرس انتخابی) صورت می‌گيرد
+    </para>
+</entry>
+
+<entry id="menu-import">
+    <title>گزینگان: درون‌برد/ برون‌برد</title>
+    <heading>برون‌برد/ درون‌برد</heading>
+    <para>
+    اين گزینگان به برون‌برد و يا درون‌برد اطلاعات به کتابچهٔ آدرس شما کمک می‌نمايد.  
+    در اين حالت از قالبهای زيادی پشتيبانی می‌شود.
+    </para>
+
+    <heading>درون‌برد</heading>
+    <para>
+     برای اخذ اطلاعات از يک کتابچهٔ آدرس شما بايد اطلاعات آن کتابچه آدرس را بر روی کامپيوتر محلی خود درون‌برد نماييد.   
+    </para>
+    <para>
+    اگر شما از Outlook استفاده کنيد:
+    </para>
+    <para>
+    ۱) بر روی گزینگان کتابچهٔ آدرس -> برون‌برد -> پرونده کليک نماييد 
+    </para>
+    <para>
+    ۲)  &quot;فايل متنی&quot; را انتخاب نماييد 
+    </para>
+    <para>
+    ۳) کتابچهٔ آدرس مورد نظر را انتخاب نماييد.
+    </para>
+    <para>
+    ۴) فيلدهايي را که مايل به برون‌برد آنها هستيد علامت زده و سپس کليد خاتمه را فشار دهيد.
+    </para>
+    <para>
+    ۵) در انتهای عمل برون‌برد پيغام 'خاتمه عمل برون‌برد' را دريافت خواهيد نمود 
+    </para>
+    <para>
+    ۶) بر روی کليد خانمه فشار دهيد    
+    </para>
+
+    <tip>
+     کتابچهٔ آدرس برون‌برد شده بر روی کامپيوتر محلّی شما قرار خواهد گرفت. در صورت عدم مشاهده آن بر روی صفحه desktop می‌توانيد به جستجوی آن در فضای ديسک سخت خود بپردازيد.    
+    </tip>
+
+    <para>
+    برای ورود اطلاعات به يک کتابچهٔ آدرس، ابتدا بايد کتابچهٔ آدرس مورد نظر را باز کرده و بر روی کليد درون‌برد/برون‌برد کليک نموده و
+    پروندهٔ مورد نظر را برای اطلاعات انتخاب نموده و کليد ورود را فشار دهيد.
+    </para>
+    <tip>
+    ورودی‌های پيچيده و يا ورودی‌هايي که با فيلدهای کتابچهٔ آدرس شما تطابق ندارند ممکن است به خوبی در کتابچهٔ آدرس شما درج نشوند. اين ورودی‌ها بعد از خاتمه عمل ورود
+    بايد کنترل شوند.
+    </tip>
+</entry>
+
+<entry id="searching-search_results">
+    <title>جستجو: نتايج جستجو</title>
+    <heading>نتايج جستجو</heading>
+    <para>
+    اگر جستجو موفّق باشد، نتايج آن را در بخش &quot;نتيجه جستجو&quot; مشاهده خواهد گرديد.
+    </para>
+    <para>
+    چنانچه در اين بخش بر روی کليد &quot;پست الکترونيک &quot; (برای هر ورودی) فشاردهيد پنجرهٔ انشای پيغام برای آن آدرس گشوده شده و در 
+    و چنانچه بر روی فيلد &quot;نام&quot; کليک نماييد قادر خواهيد بود اطلاعات مربوط به ورودی مورد نظر را ويرايش نماييد.
+    </para>
+    <para>
+    بسته به نوع پيکربندی انجام شده از طرف سرپرست سامانهٔ شما، جستجو می‌تواند به صورت تجمعی صورت گيرد که در اين حالت نتايج هر جستجو به جستجوی 
+    قبلی افزوده می‌گردد. در اين حالت برای حذف نتايج قبل می‌بايست بر روی کليد پاک کردن نتايج جستجو فشار دهيد.
+    </para>
+
+    <tip>
+     هنگامی که يک فهرست از ورودی‌ها مشاهده می‌شود شما می‌توانيد نتايج را بر اساس فيلد دلخواه خود مرتب نماييد. برای تغيير
+    ترتيب مرتب سازی بر روی فلش کنار ستون مورد نظر فشار دهيد.
+    </tip>
+</entry>
+
+</help>


--- /dev/null
+++ templates/prefs/.arch-ids/addressbookselect.inc.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:28 2006 28423.0


--- /dev/null
+++ config/mime_drivers.php.dist
@@ -0,0 +1,21 @@
+<?php
+/**
+ * $Horde: turba/config/mime_drivers.php.dist,v 1.2.2.1 2005/10/18 12:50:04 jan Exp $
+ *
+ * Decide which output drivers you want to activate for Turba.
+ * Settings in this file override settings in horde/config/mime_drivers.php.
+ */
+$mime_drivers_map['turba']['registered'] = array();
+
+/**
+ * If you want to specifically override any MIME type to be handled by
+ * a specific driver, then enter it here. Normally, this is safe to
+ * leave, but it's useful when multiple drivers handle the same MIME
+ * type, and you want to specify exactly which one should handle it.
+ */
+$mime_drivers_map['turba']['overrides'] = array();
+
+/**
+ * Driver specific settings. See horde/config/mime_drivers.php for
+ * the format.
+ */


--- /dev/null
+++ lib/Object/.arch-ids/=id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28410.0


--- /dev/null
+++ locale/tr_TR/.arch-ids/help.xml.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28416.0


--- /dev/null
+++ scripts/sql/.arch-ids/turba_objects.mssql.sql.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28419.0


--- /dev/null
+++ locale/tr_TR/help.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="iso-8859-9"?>
+<!-- $Horde: turba/locale/tr_TR/help.xml,v 1.1.2.1 2005/10/18 12:50:14 jan Exp $ -->
+<help>
+
+<!-- English entry:
+<entry id="Overview">
+    <title>Overview</title>
+    <heading>Introduction</heading>
+    <para>
+    The Address Book provides a convenient method and place to store contact information for easy retrieval and use. Depending on how your administrator has set up the system it can provide a private address book as well as access to public network directory services. It also supports distribution lists so you can create your own "mailing lists."
+    </para>
+</entry>
+-->
+
+<entry id="Overview" md5="290506ade4e6f749246f77bbe5d48835" state="uptodate">
+<title>Genel Bakýþ</title>
+<heading>Tanýtým</heading>
+<para>
+Adres Defteri eriþim listenizi saklamak ve hýzlý sorgulamak için ideal bir yapýdýr. Sistem yöneticinizin ayarlamasýna baðlý olarak herkese açýk veya gizli listeler yapýlabilir. Ayrýca daðýtým listeleri ile kendi e-posta listenizi yaratabilirsiniz.
+</para>
+</entry>
+
+<!-- English entry:
+<entry id="menu-add">
+    <title>Menu: Add</title>
+    <heading>Add</heading>
+    <para>
+    Add a user to an address book. You can only add users to the address books to which you have write access. If shared or public address books have been enabled they are often read-only and you will not be able to add contacts to them.
+    </para>
+</entry>
+-->
+
+<entry id="menu-add" md5="3c1f92eb1a82839404d11d9b0a20b3ce" state="uptodate">
+<title>Menü: Ekle</title>
+<heading>Ekle</heading>
+<para>
+Adres defterinize kullanýcýlarý ekleyebilirsiniz. Yazma izniniz olan defterlere ekleme yapabilirsiniz. Ortak kullanýlan veya herkese açýk defterler için sadece okuma izni olduðundan buralara kaydedemezsiniz.
+</para>
+</entry>
+
+<!-- English entry:
+<entry id="menu-search">
+    <title>Menu: Search</title>
+    <heading>Search</heading>
+    <para>
+    Search an address book to locate information. This is intended as a quick search and only allows you to search on a few basic fields. Usually this is the name and email address fields, but could vary depending on how your administrator set up the address book.
+    </para>
+    <para>
+    For a more complex search you can use the &quot;<ref module="turba" entry="menu-advanced-search">Advanced Search</ref>&quot; which permits searching on other fields.
+    </para>
+</entry>
+-->
+
+<entry id="menu-search" md5="8daf81ab28602d772358a174571f9ad2" state="uptodate">
+<title>Menu: Arama</title>
+<heading>Arama</heading>
+<para>
+Arama özelliði bir bilginin yerini bulmak içindir.Ýsim,e-posta adresi gibi temel özellikler hakkýnda hýzlýca arama yapabilirken , baþka özelliklere göre arama yapabilip yapamamanýz yöneticinin ayarlamasýna baðlýdýr.
+</para>
+<para>
+Daha geliþkin özellikleri sorgulayabilmek için "<ref module="turba" entry="menu-advanced-search">Geliþmiþ Arama</ref>" menüsünü kullanmanýz gerekmektedir.
+</para>
+</entry>
+
+<!-- English entry:
+<entry id="menu-advanced-search">
+    <title>Menu: Advanced Search</title>
+    <heading>Advanced Search</heading>
+    <para>
+    Search an address book to locate information. This search allows you to search on multiple fields. Which fields are available for searching depends on the address book being searched.
+    </para>
+</entry>
+-->
+
+<entry id="menu-advanced-search" md5="6be703ffeba614f6ada151749fa44ab5" state="uptodate">
+<title>Menü: Geliþmiþ Arama</title>
+<heading>Geliþmiþ Arama</heading>
+<para>
+Burada birden fazla alan hakkýnda arama yapýlabilir.Hangi alanlar üzerinde arama yapýlabileceði hangi adres defterinin hangi alanlarý içerdiðine baðlýdýr.
+</para>
+</entry>
+
+<!-- English entry:
+<entry id="menu-import">
+    <title>Menu: Import/Export</title>
+    <heading>Import/Export</heading>
+
+    <para>
+    This menu allows importing to and exporting from your personal address book. It supports both CSV (Comma Separated Variable), Outlook, and vCard formats, as well as some other popular formats.
+    </para>
+
+    <heading>Importing</heading>
+    <para>
+    To import an address book, you need to have the address book data to import on your local machine (on which the web browser is running). To do this, you will need to first export the address book information from your current email client.
+    </para>
+
+    <para>
+    If you use Outlook Express:
+    </para>
+    <para>
+    1) Click on File > Export > Address Book
+    </para>
+    <para>
+    2) Select &quot;Text File&quot; (Comma Separated Values) in the &quot;Address Book Export Tool&quot;. Click on &quot;Export&quot;.
+    </para>
+    <para>
+    3) In the &quot;Save exported files as&quot; field, type in a name for your address book. Click &quot;Next&quot;.
+    </para>
+    <para>
+    4) Put a checkmark in the box to the left of each of the fields that you wish to export. Click &quot;Finish&quot;.
+    </para>
+    <para>
+    5) You should receive a message that states 'Address book export process has completed'. Click 'OK'.
+    </para>
+    <para>
+    6) Click 'Close' on the 'Address Book Export Tool' and close Outlook Express.
+    </para>
+
+    <tip>
+    If the exported address book file is not located on your desktop, and you're using a Windows operating system, click on Start > Find or Search > Files or Folders and search your main hard drive for the file name that you used in step 3. Make a note of the file's location.
+    </tip>
+
+    <para>
+    To import an address book, open the address book you want to import the information into. Click on the &quot;Import/Export&quot; Icon. Select the type of address information data file you want to import from the selection list. Click on the &quot;browse&quot; button to look for the address data file on your computer. Select the file, and click on the &quot;Import&quot; button. The information in the file will be imported into your address book.
+    </para>
+    <tip>
+    Some complex entries, or entries with fields that do not match your address book fields, may not import correctly. You should verify the imported data after an import.
+    </tip>
+</entry>
+-->
+
+<entry id="menu-import" md5="3c6c40f2a6213e9fc1f9a77827bfb5d4" state="uptodate">
+<title>Menu:Alým ve Gönderim</title>
+<heading>Alým ve Gönderim</heading>
+<para>
+Bu menü aracýlýðýyla adres defterinizi baþka bir kaynaða alabilir veya baþka bir kaynaktan adres defterinize dahil edebilirsiniz.CSV,Outlook, ve vCard gibi daha pek çok popüler biçimler desteklenmektedir.
+</para>
+<heading>Alým</heading>
+<para>
+Baþka bir kaynaktan liste alýmý öncesinde , almak istediðiniz liste bilgisini bulunduðu e-posta istemcisinden ayrý bir dosyaya çýkarmalýsýnýz.
+</para>
+Outlook Express kullanýyorsanýz;
+<para>
+"File &gt; Export &gt; Address Book" menüsüne týklayýnýz.
+</para>
+<para>
+"Address Book Export Tool" dan "Text File" (Comma Separated Values) i seçiniz.Burada da "Export" i seçiniz.
+</para>
+<para>
+"Save exported files as"  alanýna çýkarýlacak liste dosyasýnýn kaydedileceði adý giriniz ve "Next" a basýnýz.
+</para>
+<para>
+Çýkarýlmasýný istediðiniz alanlarý seçmek için sol yanlarýndaki kutucuklarý iþaretleyip "Finish" a basýnýz.
+</para>
+<para>
+Ýþlem bitince 'Address book export process has completed' mesajý alacaksýnýz.Burada 'OK' diyerek iþlemi bitirebilirsiniz.
+</para>
+<para>
+'Address Book Export Tool' menüsünü kapatýnýz sonra da Outlook Express ten çýkýnýz.
+</para>
+<para>
+Çýkarýlan dosyayý bulamamanýz durumunda Windows iþletim sistemi kullanýyorsanýz Start &gt; Find menüsünden Search &gt; Files or Folders i seçerek yukarda girdiðiniz dosya adýný aratýp bunu not etmeniz tavsiye edilir.
+</para>
+<tip>
+Çýkarýlan dosyayý yüklemek için "Alým/Çýkarým" menüsüne giriniz."gözat" ile dosyanýzý bulduktan sonra "Alým" seçeneði ile dosyanýzý listenize dahil edebilirsiniz.
+</tip>
+<tip>
+Eklenen dosya içindeki kimi alan bilgileri mevcut adres defterinden farklýlýk gösteriyorsa vb.. karmaþýk durumlarda ekleme sonucunda sorunlar oluþabilir. Bu nedenle iþlemin ardýndan adres defterinizi kontrol etmeniz tavsiye olunur.
+</tip>
+</entry>
+
+
+<!-- English entry:
+<entry id="searching-search_results">
+    <title>Searching: Search Results</title>
+    <heading>Search Results</heading>
+    <para>
+    If a search is successful, the results will show up in the &quot;Search Results&quot; area.
+    </para>
+    <para>
+    Clicking on an &quot;Email&quot; field entry will open a new Compose window to send mail to that address. Clicking on a &quot;Name&quot; field entry will display the address book record for that name, allowing you to then edit or delete the entry.
+    </para>
+    <para>
+    Depending on how your system has been set up by the administrator search results can be cumulative. Each search will add any new results to your existing results. This is helpful when building lists. To remove the results of cumulative searches and start a new search, click on the &quot;Clear Search&quot; link.
+    </para>
+
+    <tip>
+    When viewing a list of entries, you can sort the entries by each field shown by clicking on the appropriate column heading. To switch columns between ascending and descending sort order, click on the arrow icon in the column heading.
+    </tip>
+</entry>
+-->
+
+<entry id="searching-search_results" md5="ffed8d72fa3b710df8e902c2493b254f" state="uptodate">
+<title>Arama: Arama Sonuçlarý</title>
+<heading>Arama Sonuçlarý</heading>
+<para>
+Baþarýlý arama sonuçlarýnýn listesi "Arama Sonuçlarý" menüsünden görüntülenebilecektir.
+</para>
+<para>
+"Eposta" menüsünün seçimi ile bulunan sonuç adrese e-posta atýlabilir."Ýsim" alanýndan arama sonucundaki isim alaný düzenlenebilir.
+</para>
+<para>
+Arama sonuçlarý önceki arama sonuçlarýna ilaveten gösteriliyor olabilir.Bu sistem yöneticisinin ayarýna baðlýdýr.Bu durumda önceki arama sonuçlarýný "Aramayý Sil" menüsü ile silebilirsiniz.
+</para>
+<tip>
+Giriþlerin listesini görüntülerken, giriþleri herhangi bir sütuna göre o sütunun baþlýðýna týklayarak sýnýflandýrabilirsiniz. Sütunu yükselen ve alçalan sýnýflandýrma arasýnda deðiþtirmek için, sütun baþlýðýndaki ok simgesini týklayýn.
+</tip>
+</entry>
+
+</help>


--- /dev/null
+++ lib/Driver/.arch-ids/null.php.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28409.0


--- /dev/null
+++ .arch-ids/view.php.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:28 2006 28427.0


--- /dev/null
+++ templates/browse/row.inc
@@ -0,0 +1,74 @@
+<?php
+
+if ($ob->hasValue('name')) {
+    $link_text = htmlspecialchars(Turba::formatName($ob));
+} else {
+    $link_text = _("[no value]");
+}
+
+$edit_url = $vcard_url = '&nbsp;';
+if ($ob->hasValue('__key')) {
+    $url = Util::addParameter($ob->isGroup() ? 'browse.php' : 'display.php',
+                              array('source' => $ob->getSource(),
+                                    'key' => $ob->getValue('__key')));
+
+    $vcard_url = Util::addParameter('vcard.php', array('source' => $ob->getSource(),
+                                                       'key' => $ob->getValue('__key')));
+    $vcard_url = Horde::link(Horde::applicationUrl($vcard_url), _("Download vCard")) . Horde::img('mime/vcard.png', _("Download vCard"), '', $GLOBALS['registry']->getImageDir('horde')) . '</a>';
+
+    $cell = Horde::link(Horde::applicationUrl($url), sprintf(_("View \"%s\""), $ob->getValue('name'))) .
+        $link_text . '</a>';
+    if ($ob->hasPermission(PERMS_EDIT)) {
+        $edit_url = Util::addParameter('edit.php', array('source' => $ob->getSource(),
+                                                         'key' => $ob->getValue('__key'),
+                                                         'url' => Horde::selfUrl(true)));
+        $edit_url = Horde::link(Horde::applicationUrl($edit_url), sprintf(_("Edit \"%s\""), $ob->getValue('name'))) . Horde::img('edit.png', _("Edit"), '', $GLOBALS['registry']->getImageDir('horde')) . '</a>';
+    }
+} else {
+    $cell = $link_text;
+}
+
+?>
+<tr>
+<?php if ($this->showMark): ?>
+  <td><input type="checkbox" class="checkbox" name="objectkeys[]" value="<?php echo htmlspecialchars($ob->getSource() . ':' . $ob->getValue('__key')) ?>" /></td>
+<?php endif; ?>
+<?php if ($this->showEdit): ?>
+  <td><?php echo $edit_url ?></td>
+<?php endif; ?>
+<?php if ($this->showVcard): ?>
+  <td><?php echo $vcard_url ?></td>
+<?php endif; ?>
+<?php if ($this->showGroup): ?>
+  <td><?php echo $ob->isGroup() ? Horde::img('group.png', _("Group")) : '&nbsp;' ?></td>
+<?php endif; ?>
+  <td<?php if ($this->showSort && $sortby == 0) echo ' class="linedRowSelectedCol"' ?>><?php
+echo $cell;
+
+// We purposefully do this before the </td> so that if we end up
+// including a script file (say, for the IMP compose window), it's in
+// a legal spot.
+//
+// Build the columns to display.
+$shown_columns = array();
+for ($c = 1; $c <= count($columns); $c++) {
+    if ($ob->hasValue($columns[$c - 1])) {
+        $shown_columns[$c] = htmlspecialchars($ob->getValue($columns[$c - 1]));
+        if ($GLOBALS['attributes'][$columns[$c - 1]]['type'] == 'email') {
+            $shown_columns[$c] = Turba::formatEmailAddresses($shown_columns[$c], $ob->getValue('name'));
+        }
+    } else {
+        $shown_columns[$c] = '&nbsp;';
+    }
+}
+
+echo '</td>';
+foreach ($shown_columns as $column => $value) {
+    echo '<td';
+    if ($this->showSort && $column == $sortby) {
+        echo ' class="linedRowSelectedCol"';
+    }
+    echo '>' . $value . '</td>';
+}
+?>
+</tr>


--- /dev/null
+++ config/.arch-ids/mime_drivers.php.dist.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28407.0


--- /dev/null
+++ lib/Block/tree_menu.php
@@ -0,0 +1,57 @@
+<?php
+
+$block_name = _("Menu List");
+$block_type = 'tree';
+
+/**
+ * $Horde: turba/lib/Block/tree_menu.php,v 1.5.2.1 2005/10/18 12:50:05 jan Exp $
+ *
+ * @package Horde_Block
+ */
+class Horde_Block_turba_tree_menu extends Horde_Block {
+
+    var $_app = 'turba';
+
+    function _buildTree(&$tree, $indent = 0, $parent = null)
+    {
+        global $registry;
+
+        define('TURBA_BASE', dirname(__FILE__) . '/../..');
+        require_once TURBA_BASE . '/lib/base.php';
+
+        $browse = Horde::applicationUrl('browse.php');
+        $icondir = $registry->getImageDir() . '/menu';
+
+        $tree->addNode($parent . '__new',
+                       $parent,
+                       _("New Contact"),
+                       $indent + 1,
+                       false,
+                       array('icon' => 'new.png',
+                             'icondir' => $icondir,
+                             'url' => Horde::applicationUrl('add.php')));
+
+        foreach (Turba::getAddressBooks() as $addressbook => $config) {
+            if (!empty($config['browse'])) {
+                $tree->addNode($parent . $addressbook,
+                               $parent,
+                               $config['title'],
+                               $indent + 1,
+                               false,
+                               array('icon' => 'browse.png',
+                                     'icondir' => $icondir,
+                                     'url' => Util::addParameter($browse, array('source' => $addressbook))));
+            }
+        }
+
+        $tree->addNode($parent . '__search',
+                       $parent,
+                       _("Search"),
+                       $indent + 1,
+                       false,
+                       array('icon' => 'search.png',
+                             'icondir' => $registry->getImageDir('horde'),
+                             'url' => Horde::applicationUrl('search.php')));
+    }
+
+}


--- /dev/null
+++ lib/Driver/null.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Null Turba directory driver.
+ *
+ * $Horde: turba/lib/Driver/null.php,v 1.2.2.1 2005/11/10 00:02:40 mdjukic Exp $
+ *
+ * @author  Marko Djukic <mdjukic at horde.org>
+ * @since   Turba 2.2
+ * @package Turba
+ */
+class Turba_Driver_null extends Turba_Driver {
+
+    /**
+     * Whether this source has a readonly driver.
+     *
+     * @var boolean
+     */
+    var $readonly = true;
+
+    /**
+     *
+     */
+    function _init()
+    {
+        return true;
+    }
+
+    /**
+     * Checks if the current user has the requested permissions on this
+     * source.
+     *
+     * @param integer $perm  The permission to check for.
+     *
+     * @return boolean  True if the user has permission, otherwise false.
+     */
+     function hasPermission($perm)
+     {
+         switch ($perm) {
+             case PERMS_EDIT: return false;
+             case PERMS_DELETE: return false;
+             default: return true;
+         }
+     }
+
+    function _search()
+    {
+        return PEAR::raiseError(_("Searching is not available."));
+    }
+
+    function _read()
+    {
+        return PEAR::raiseError(_("Reading contacts is not available."));
+    }
+
+    function _add($attributes)
+    {
+        return PEAR::raiseError(_("Adding contacts is not available."));
+    }
+
+    function _delete($object_key, $object_id)
+    {
+        return PEAR::raiseError(_("Deleting contacts is not available."));
+    }
+
+    function _save($object_key, $object_id, $attributes)
+    {
+        return PEAR::raiseError(_("Saving contacts is not available."));
+    }
+
+}


--- /dev/null
+++ templates/prefs/addressbookselect.inc
@@ -0,0 +1,197 @@
+<?php
+
+$order = Turba::getAddressBookOrder();
+$js = "var addressbooks = new Array();\n";
+$source_count = 0;
+foreach ($GLOBALS['cfgSources'] as $source => $info) {
+    $selected = isset($order[$source]) ? 'true' : 'false';
+    $js .= "addressbooks[$source_count] = ['" . addslashes($source) . "', decodeURIComponent('" . rawurlencode($info['title']) . "'), $selected, " . (isset($order[$source]) ? (int)$order[$source] : 'null') . "];\n";
+    $source_count++;
+}
+
+if (!$prefs->isLocked('addressbooks') && $source_count):
+?>
+
+<script type="text/javascript">
+<!--
+<?php echo $js ?>
+
+function selectAddressBooks()
+{
+    var selected = new Array();
+    var unselected = new Array();
+    for (var i = 0; i < addressbooks.length; i++) {
+        if (addressbooks[i][2]) {
+            selected[addressbooks[i][3]] = new Array(addressbooks[i][1], addressbooks[i][0]);
+        } else {
+            unselected[unselected.length] = new Array(addressbooks[i][1], addressbooks[i][0]);
+        }
+    }
+    for (i = 0; i < selected.length; i++) {
+        f.selected_addressbooks.options[i + 1] = new Option(selected[i][0], selected[i][1]);
+    }
+    for (i = 0; i < unselected.length; i++) {
+        f.unselected_addressbooks.options[i + 1] = new Option(unselected[i][0], unselected[i][1]);
+    }
+}
+
+function deselectHeaders()
+{
+    document.prefs.unselected_addressbooks[0].selected = false;
+    document.prefs.selected_addressbooks[0].selected = false;
+}
+
+function resetHidden()
+{
+    var tmp = '';
+    for (var i = 1; i < f.selected_addressbooks.length; i++) {
+        if (tmp != '') {
+            tmp += '\n';
+        }
+        tmp += f.selected_addressbooks[i].value;
+    }
+    document.prefs.addressbooks.value = tmp;
+}
+
+function addAddressBook()
+{
+    for (i = 1; i < f.unselected_addressbooks.length; i++) {
+        if (f.unselected_addressbooks[i].selected) {
+            f.selected_addressbooks[f.selected_addressbooks.length] = new Option(f.unselected_addressbooks[i].text, f.unselected_addressbooks[i].value);
+            f.unselected_addressbooks[i] = null;
+            i--;
+        }
+    }
+
+    resetHidden();
+}
+
+function removeAddressBook()
+{
+    for (i = 1; i < f.selected_addressbooks.length; i++) {
+        if (f.selected_addressbooks[i].selected) {
+            f.unselected_addressbooks[f.unselected_addressbooks.length] = new Option(f.selected_addressbooks[i].text, f.selected_addressbooks[i].value)
+            f.selected_addressbooks[i] = null;
+            i--;
+        }
+    }
+
+    resetHidden();
+}
+
+function moveAddressBookUp()
+{
+    var sel = f.selected_addressbooks.selectedIndex;
+
+    if (sel <= 1 || f.selected_addressbooks.length <= 2) return;
+
+    // deselect everything but the first selected item
+    f.selected_addressbooks.selectedIndex = sel;
+    var up = f.selected_addressbooks[sel].value;
+
+    tmp = new Array();
+
+    for (i = 1; i < f.selected_addressbooks.length; i++) {
+        tmp[i - 1] = new Option(f.selected_addressbooks[i].text, f.selected_addressbooks[i].value)
+    }
+
+    for (i = 0; i < tmp.length; i++) {
+        if (i + 1 == sel - 1) {
+            f.selected_addressbooks[i + 1] = tmp[i + 1];
+        } else if (i + 1 == sel) {
+            f.selected_addressbooks[i + 1] = tmp[i - 1];
+        } else {
+            f.selected_addressbooks[i + 1] = tmp[i];
+        }
+    }
+
+    f.selected_addressbooks.selectedIndex = sel - 1;
+
+    for (i = 2; i < addressbooks.length - 1; i++) {
+        if (addressbooks[i][0] == up) {
+            addressbook = addressbooks[i];
+            addressbooks[i] = addressbooks[i - 1];
+            addressbooks[i - 1] = addressbook;
+        }
+    }
+
+    resetHidden();
+}
+
+function moveAddressBookDown()
+{
+    var sel = f.selected_addressbooks.selectedIndex;
+
+    if (sel == -1 || f.selected_addressbooks.length <= 2 || sel == f.selected_addressbooks.length - 1) return;
+
+    // deselect everything but the first selected item
+    f.selected_addressbooks.selectedIndex = sel;
+    var down = f.selected_addressbooks[sel].value;
+
+    tmp = new Array();
+
+    for (i = 1; i < f.selected_addressbooks.length; i++) {
+        tmp[i - 1] = new Option(f.selected_addressbooks[i].text, f.selected_addressbooks[i].value)
+    }
+
+    for (i = 0; i < tmp.length; i++) {
+        if (i + 1 == sel) {
+            f.selected_addressbooks[i + 1] = tmp[i + 1];
+        } else if (i + 1 == sel + 1) {
+            f.selected_addressbooks[i + 1] = tmp[i - 1];
+        } else {
+            f.selected_addressbooks[i + 1] = tmp[i];
+        }
+    }
+
+    f.selected_addressbooks.selectedIndex = sel + 1;
+
+    for (i = addressbooks.length - 2; i > 0; i--) {
+        if (addressbooks[i][0] == down || addressbooks[i + 1][0] == down) {
+            addressbook = addressbooks[i];
+            addressbooks[i] = addressbooks[i + 1];
+            addressbooks[i + 1] = addressbook;
+        }
+    }
+
+    resetHidden();
+}
+
+// -->
+</script>
+
+<input type="hidden" name="addressbooks" value="<?php echo htmlspecialchars($prefs->getValue('addressbooks')) ?>" />
+
+<?php echo _("Choose which address books to display, and in what order:") ?><br />
+<table>
+ <tr>
+  <td>
+   <select name="unselected_addressbooks" multiple="multiple" size="5" style="width:300px" onchange="deselectHeaders();">
+    <option class="control" value=""><?php echo _("Address books that will not be displayed:") ?></option>
+   </select>
+  </td>
+  <td>
+   <a href="#" onclick="addAddressBook(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add address book"), null, $registry->getImageDir('horde')) ?></a>
+   <br />
+   <a href="#" onclick="removeAddressBook(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove address book"), null, $registry->getImageDir('horde')) ?></a>
+  </td>
+  <td>
+   <select name="selected_addressbooks" multiple="multiple" size="5" style="width:300px" onchange="deselectHeaders();">
+    <option class="control" value=""><?php echo _("These address books will display in this order:") ?></option>
+   </select>
+  </td>
+  <td>
+   <a href="#" onclick="moveAddressBookUp(); return false;"><?php echo Horde::img('nav/up.png', _("Move left"), null, $registry->getImageDir('horde')) ?></a>
+   <br />
+   <a href="#" onclick="moveAddressBookDown(); return false;"><?php echo Horde::img('nav/down.png', _("Move right"), null, $registry->getImageDir('horde')) ?></a>
+  </td>
+ </tr>
+</table>
+<script type="text/javascript">
+<!--
+var f = document.prefs;
+selectAddressBooks();
+// -->
+</script>
+
+<?php endif; // End if not locked && address books exist.


--- /dev/null
+++ templates/browse/.arch-ids/row.inc.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28422.0


--- /dev/null
+++ themes/ideas/.arch-ids/=id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:28 2006 28425.0


--- /dev/null
+++ {arch}/turba/turba--sid/turba--sid--2/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-2
@@ -0,0 +1,127 @@
+Revision: turba--sid--2--patch-2
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Thu Apr  6 19:21:40 CEST 2006
+Standard-date: 2006-04-06 17:21:40 GMT
+New-files: .arch-ids/addressbooks.php.id
+    .arch-ids/view.php.id addressbooks.php
+    config/.arch-ids/mime_drivers.php.dist.id
+    config/mime_drivers.php.dist
+    lib/Block/.arch-ids/tree_menu.php.id
+    lib/Block/tree_menu.php
+    lib/Driver/.arch-ids/null.php.id lib/Driver/null.php
+    lib/Object/.arch-ids/=id
+    lib/Object/.arch-ids/Group.php.id lib/Object/Group.php
+    locale/fa_IR/.arch-ids/help.xml.id
+    locale/fa_IR/help.xml locale/is_IS/.arch-ids/=id
+    locale/is_IS/LC_MESSAGES/.arch-ids/=id
+    locale/is_IS/LC_MESSAGES/.arch-ids/turba.mo.id
+    locale/is_IS/LC_MESSAGES/turba.mo
+    locale/tr_TR/.arch-ids/help.xml.id
+    locale/tr_TR/help.xml po/.arch-ids/is_IS.po.id
+    po/is_IS.po scripts/.arch-ids/import_vcards.php.id
+    scripts/import_vcards.php
+    scripts/sql/.arch-ids/turba_objects.mssql.sql.id
+    scripts/sql/turba_objects.mssql.sql
+    scripts/upgrades/.arch-ids/public_to_horde_share.php.id
+    scripts/upgrades/public_to_horde_share.php
+    templates/.arch-ids/addressbooks.inc.id
+    templates/addressbooks.inc
+    templates/browse/.arch-ids/row.inc.id
+    templates/browse/row.inc
+    templates/prefs/.arch-ids/addressbookselect.inc.id
+    templates/prefs/.arch-ids/imsp_opt.inc.id
+    templates/prefs/addressbookselect.inc
+    templates/prefs/imsp_opt.inc themes/ideas/.arch-ids/=id
+    themes/ideas/.arch-ids/screen.css.id
+    themes/ideas/screen.css view.php
+New-directories: lib/Object lib/Object/.arch-ids
+    locale/is_IS locale/is_IS/.arch-ids
+    locale/is_IS/LC_MESSAGES
+    locale/is_IS/LC_MESSAGES/.arch-ids themes/ideas
+    themes/ideas/.arch-ids
+Removed-files: templates/browse/.arch-ids/select.inc.id
+    templates/browse/select.inc
+Modified-files: LICENSE README add.php browse.php
+    config/attributes.php.dist config/conf.xml
+    config/prefs.php.dist config/sources.php.dist data.php
+    debian/changelog delete.php display.php docs/CHANGES
+    docs/CREDITS docs/INSTALL docs/LDAP docs/RELEASE_NOTES
+    docs/UPGRADING edit.php index.php
+    lib/Block/minisearch.php lib/Driver.php
+    lib/Driver/imsp.php lib/Driver/kolab.php
+    lib/Driver/ldap.php lib/Driver/prefs.php
+    lib/Driver/sql.php lib/List.php lib/ListView.php
+    lib/Object.php lib/ObjectView.php lib/Renderer.php
+    lib/Turba.php lib/api.php lib/base.php lib/prefs.php
+    lib/version.php locale/ar_SY/LC_MESSAGES/turba.mo
+    locale/bg_BG/LC_MESSAGES/turba.mo
+    locale/ca_ES/LC_MESSAGES/turba.mo
+    locale/cs_CZ/LC_MESSAGES/turba.mo
+    locale/da_DK/LC_MESSAGES/turba.mo
+    locale/de_DE/LC_MESSAGES/turba.mo
+    locale/el_GR/LC_MESSAGES/turba.mo
+    locale/es_ES/LC_MESSAGES/turba.mo
+    locale/et_EE/LC_MESSAGES/turba.mo
+    locale/fa_IR/LC_MESSAGES/turba.mo
+    locale/fi_FI/LC_MESSAGES/turba.mo locale/fi_FI/help.xml
+    locale/fr_FR/LC_MESSAGES/turba.mo
+    locale/gl_ES/LC_MESSAGES/turba.mo
+    locale/hu_HU/LC_MESSAGES/turba.mo
+    locale/it_IT/LC_MESSAGES/turba.mo
+    locale/ja_JP/LC_MESSAGES/turba.mo
+    locale/ko_KR/LC_MESSAGES/turba.mo
+    locale/lt_LT/LC_MESSAGES/turba.mo
+    locale/lv_LV/LC_MESSAGES/turba.mo
+    locale/mk_MK/LC_MESSAGES/turba.mo
+    locale/nb_NO/LC_MESSAGES/turba.mo
+    locale/nl_NL/LC_MESSAGES/turba.mo
+    locale/nn_NO/LC_MESSAGES/turba.mo
+    locale/pl_PL/LC_MESSAGES/turba.mo
+    locale/pt_BR/LC_MESSAGES/turba.mo
+    locale/pt_PT/LC_MESSAGES/turba.mo
+    locale/ro_RO/LC_MESSAGES/turba.mo
+    locale/ru_RU/LC_MESSAGES/turba.mo
+    locale/sk_SK/LC_MESSAGES/turba.mo
+    locale/sl_SI/LC_MESSAGES/turba.mo
+    locale/sv_SE/LC_MESSAGES/turba.mo
+    locale/tr_TR/LC_MESSAGES/turba.mo
+    locale/uk_UA/LC_MESSAGES/turba.mo
+    locale/zh_CN/LC_MESSAGES/turba.mo
+    locale/zh_TW/LC_MESSAGES/turba.mo minisearch.php
+    po/ar_SY.po po/bg_BG.po po/ca_ES.po po/cs_CZ.po
+    po/da_DK.po po/de_DE.po po/el_GR.po po/es_ES.po
+    po/et_EE.po po/fa_IR.po po/fi_FI.po po/fr_FR.po
+    po/gl_ES.po po/hu_HU.po po/it_IT.po po/ja_JP.po
+    po/ko_KR.po po/lt_LT.po po/lv_LV.po po/mk_MK.po
+    po/nb_NO.po po/nl_NL.po po/nn_NO.po po/pl_PL.po
+    po/pt_BR.po po/pt_PT.po po/ro_RO.po po/ru_RU.po
+    po/sk_SK.po po/sl_SI.po po/sv_SE.po po/tr_TR.po
+    po/turba.pot po/uk_UA.po po/zh_CN.po po/zh_TW.po
+    scripts/sql/turba_objects.mysql.sql
+    scripts/sql/turba_objects.pgsql.sql
+    scripts/upgrades/2004-10-26_create_default_histories.php
+    search.php templates/block/minisearch.inc
+    templates/browse/actions.inc
+    templates/browse/column_footers.inc
+    templates/browse/column_headers.inc
+    templates/browse/footer.inc
+    templates/browse/footerAlpha.inc
+    templates/browse/header.inc
+    templates/browse/javascript.inc
+    templates/browse/search.inc
+    templates/browse/search_criteria.inc
+    templates/common-header.inc templates/data/export.inc
+    templates/data/import.inc templates/menu.inc
+    templates/prefs/columnselect.inc test.php
+    themes/screen.css vcard.php
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/turba--sid--2--patch-2
+    pkg-horde-hackers at lists.alioth.debian.org--2006/turba--upstream--2--patch-1
+Summary: New upstream version 2.1
+
+
+Patches applied:
+
+ * pkg-horde-hackers at lists.alioth.debian.org--2006/turba--upstream--2--patch-1
+   Imported turba-h3-2.1
+


--- /dev/null
+++ locale/fa_IR/.arch-ids/help.xml.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28412.0


--- /dev/null
+++ lib/Object/.arch-ids/Group.php.id
@@ -0,0 +1,1 @@
+Lionel Elie Mamane <lionel at mamane.lu> Thu Apr  6 19:13:27 2006 28411.0


--- templates/browse/.arch-ids/select.inc.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Apr  2 12:03:45 2006 32544.0


--- templates/browse/select.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<form name="directory_list" action="<?php echo Horde::applicationUrl('browse.php') ?>" method="get">
-<?php echo Util::formInput() ?>
-<table border="0" align="center" width="100%" cellpadding="0" cellspacing="0">
-<tr>
-  <td>
-    <table border="0" width="100%" cellpadding="0" cellspacing="0">
-    <tr>
-      <td class="header">
-        <b><?php echo _("Select Address Book") ?>&nbsp;&nbsp;</b>
-        <select name="source" onchange="document.directory_list.submit();"><?php echo $source_options ?></select>
-        <input class="button" type="submit" value="<?php echo _("Show") ?>" />
-      </td>
-    </tr>
-    </table>
-  </td>
-</tr>
-</table>
-</form>
-<br />


--- orig/po/sk_SK.po
+++ mod/po/sk_SK.po
@@ -1,33 +1,56 @@
 # Turba Slovak translation.
 # Copyright (C) 2002 Leo Mrafko. <leo at oel.sk> (original translator)
-# (C) 2002, 2003, 2004, 2005 Ivan Noris <vix at vazka.sk>
+# (C) 2002, 2003 Ivan Noris <vix at vazka.sk>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba 2.0.3\n"
+"Project-Id-Version: Turba 2.1\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-07-18 21:29+0200\n"
-"PO-Revision-Date: 2005-07-18 21:35+0100\n"
+"POT-Creation-Date: 2006-01-30 21:30+0100\n"
+"PO-Revision-Date: 2006-01-30 21:57+0100\n"
 "Last-Translator: Ivan Noris <vix at vazka.sk>\n"
 "Language-Team: Slovak <vix at vazka.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr " Prida» IMSP adresár"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr " Vymaza» IMSP adresár"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "\"%s\" u¾ existuje a nebol importovaný."
+
+#: browse.php:140
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "\"%s\" nebol skopírovaný, preto¾e je to zoznam."
+
+#: browse.php:138
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "\"%s\" nebol presunutý, preto¾e je to zoznam."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Meno, Priezvisko\" (napr. John Doe)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Priezvisko, Meno\" (napr. Doe, John)"
 
-#: add.php:96
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s bol(a) pridaný(á)."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "Súbor %s bol úspe¹ne importovaný."
@@ -37,58 +60,81 @@
 msgid "%s to %s of %s"
 msgstr "%s a¾ %s z %s"
 
-#: browse.php:120
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s' sa nepodarilo skopírova», preto¾e je to zoznam."
-
-#: browse.php:118
+#: lib/Turba.php:464
 #, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s' sa nepodarilo skopírova», preto¾e je to zoznam."
+msgid "%s's Address Book"
+msgstr "Adresár %s"
 
-#: lib/Block/minisearch.php:45
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr "Prehliadaè musí podporova» iFrames"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "Nad formulárom hµadania"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "_Roz¹írené vyhµadávanie"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "Prístup k %s je zamietnutý"
 
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "Prida»"
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "Prida» adresár"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "Prida» a vymaza» IMSP adresáre"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Prida» ståpec"
 
-#: templates/browse/actions.inc:22
+#: edit.php:135
+msgid "Add file"
+msgstr "Prida» súbor"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Prida» do"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "Pridávanie kontaktov nie je dostupné."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "Adresár"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Zobrazi» adresár"
 
-#: add.php:95
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Adresáre"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Polo¾ka adresára"
 
-#: lib/Driver.php:478
-msgid "Address book is read-only."
-msgstr "Adresár je nastavený len na èítanie."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Adresár bol úspe¹ne vymazaný."
 
-#: search.php:98 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "Adresáre na vymazanie"
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "Adresáre, ktoré sa nebudú zobrazova»:"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Roz¹írené vyhµadávanie"
 
@@ -96,55 +142,37 @@
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr "V¹etky"
 
-#: lib/api.php:393
+#: lib/api.php:554
 msgid "Already Exists"
 msgstr "U¾ existuje"
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Naozaj chcete zmaza» %s?"
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Naozaj chcete vymaza» vybrané adresy?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Dostupné ståpce:"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Na_spä» na %s"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "Naspä» na %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Zá_kladné hµadanie"
-
-#: search.php:95 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Základné hµadanie"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "Pod formulárom hµadania"
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Pripojenie (bind) zlyhalo: (%s) %s"
@@ -153,51 +181,63 @@
 msgid "Birthday"
 msgstr "Narodeniny"
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "Prezera»"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Obchodné zameranie"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV (hodnoty oddelené èiarkou)"
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "Z_ru¹i» výsledok hµadania"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "Nemo¾no prida» skupinu do samej seba."
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Vybra» _v¹etky/¾iadne"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Vyberte prednastavený adresár pre Va¹e osobné adresáre, zoznamy kontaktov a "
-"vyhµadávanie."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "Vyberte si meno"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Vyberte si adresár"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Vyberte si poradie ståpcov v zozname adries."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "Vyberte si adresár:"
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "Zru¹i» výsledok hµadania"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr "Vyberte si adresáre, ktoré chcete zobrazi» a ich poradie:"
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "Vyberte si adresáre, ktoré chcete pou¾i»."
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "Vyberte ståpce, ktoré chcete zobrazi» a ich poradie:"
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Nastavenia ståpcov"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Ståpce, ktoré sa nebudú zobrazova»:"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Hodnoty oddelené èiarkou"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Hodnoty oddelené èiarkou (Microsoft Outlook)"
 
@@ -209,72 +249,77 @@
 msgid "Company Address"
 msgstr "Adresa spoloènosti"
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:382 lib/api.php:452
-#: lib/api.php:542 lib/api.php:588 lib/api.php:636 lib/api.php:823
-#: lib/api.php:916
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:837
+#: lib/api.php:1024 lib/api.php:1112
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Pokus o spojenie zlyhal: %s"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Nastala chyba pri pokuse o spojenie"
 
-#: browse.php:60
-msgid "Contact removed from list."
-msgstr "Kontakt bol odstránený zo zoznamu."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Hµadanie kontaktu"
 
-#: browse.php:257
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Kontakty v zozname: %s"
 
-#: browse.php:281
-#, php-format
-msgid "Contents of %s"
-msgstr "Obsah %s"
-
-#: templates/browse/actions.inc:12
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "Kopírova»"
 
-#: lib/ObjectView.php:134
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Vytvori»"
+
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "Vytvori» adresár"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Vytvori» nový zoznam kontaktov v:"
+
+#: lib/ObjectView.php:133
 msgid "Created"
 msgstr "Vytvorené"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Prednastavené zobrazenie"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr ""
-"Prednastavený adresár pre Va¹e osobné adresáre, zoznamy kontaktov a "
-"vyhµadávanie."
-
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Prednastavený smer triedenia:"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Vymaza»"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "Vymaza» adresár"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Potvrdenie pri vymazaní"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Správanie sa tlaèidla na vymazanie"
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Vymazávanie zlyhalo: (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "Vymazávanie kontaktov nie je dostupné."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Vymazávanie zlyhalo"
 
@@ -282,38 +327,55 @@
 msgid "Department"
 msgstr "Oddelenie"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Zostupne"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Popis"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Adresár"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Zobrazenie"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Nastavenie zobrazenia"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "Chcete potvrdzova» vymazávanie polo¾iek?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Stiahnu»"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "Stiahnu» vCard"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Upravi»"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
-msgid "Edit '%s'"
-msgstr "Upravi» '%s'"
+msgid "Edit \"%s\""
+msgstr "Upravi» \"%s\""
+
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "Upravi» adresáre"
 
-#: edit.php:53 edit.php:80
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Upravi» polo¾ku pre %s"
@@ -322,59 +384,105 @@
 msgid "Email"
 msgstr "Email"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+"Polo¾ka pre %s bola aktualizovaná, ale ukladanie aktualizovaného súboru "
+"zlyhalo: %s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Polo¾ka pre %s bola aktualizovaná"
 
-#: templates/browse/actions.inc:6 templates/data/export.inc:46
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "Nastala chyba pri pridávaní %d kontaktov do zoznamu."
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr "Nastala chyba pri pridávaní %d z %d po¾adovaných kontaktov do zoznamu."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Nastala chyba pri vymazávaní %d kontaktov."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "Nastala chyba pri vymazávani %d z %d po¾adovaných kontaktov."
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "Nastala chyba pri vymazávaní %d kontaktov zo zoznamu."
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr ""
+"Nastala chyba pri vymazávaní %d z %d po¾adovaných kontaktov zo zoznamu."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "Nastala chyba pri hµadaní v adresári: %s"
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "Export"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Exportova» adresár"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Exportova» iba vybrané kontakty."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Exportova» celý nasledujúci adresár."
 
-#: data.php:110 data.php:228 browse.php:37 browse.php:94 browse.php:109
-#: add.php:72 search.php:52
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Nastala chyba pri prístupe k adresáru: %s"
 
-#: browse.php:128
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Nastala chyba pri pridávaní %s do %s: %s"
 
-#: browse.php:263
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "Nemo¾no zobrazi» zoznam"
 
-#: browse.php:297
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "Nastala chyba pri prehµadávaní adresára."
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
-"Nepodarilo sa zmeni» meno: (%s) %s; stará hodnota DN = %s, nová hodnota DN = "
-"%s, Koreò = %s"
+"Nepodarilo sa zmeni» meno: (%s) %s; staré DN = %s, nové DN = %s, koreò = %s"
 
-#: browse.php:114
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Nemo¾no nájs» objekt na pridanie: %s"
 
-#: data.php:124 search.php:89
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "Nepodarilo sa hµada» v adresári"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Nastala chyba pri prehµadávaní adresára: %s"
@@ -383,10 +491,18 @@
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72
+#: edit.php:131 display.php:100
+msgid "Files"
+msgstr "Súbory"
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr "Nájs»"
 
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "Skonèi»"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Krstné meno"
@@ -395,15 +511,15 @@
 msgid "Freebusy URL"
 msgstr "URL s informáciou o zaneprázdnenosti"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "Z"
 
-#: config/sources.php.dist:556
+#: config/sources.php.dist:606
 msgid "Global Address Book"
 msgstr "Globálny adresár"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Skupina"
 
@@ -433,61 +549,61 @@
 
 #: config/attributes.php.dist:88
 msgid "Home Street Address"
-msgstr "Ulica (domov)"
+msgstr "Domáca adresa"
 
-#: config/sources.php.dist:482
+#: config/sources.php.dist:508
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "Správa IMSP adresára"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Importova» adresár, krok %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Importova»/Exportova» adresáre"
 
-#: lib/api.php:376 lib/api.php:602
-msgid "Invalid Content-Type"
-msgstr "Neplatný typ obsahu (Content-Type)"
-
-#: lib/api.php:439 lib/api.php:529
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "Neplatné ID"
 
-#: lib/api.php:191 lib/api.php:334 lib/api.php:435 lib/api.php:525
-#: lib/api.php:578 lib/api.php:893
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1095
 msgid "Invalid address book"
 msgstr "Neplatný adresár"
 
-#: lib/api.php:897 lib/api.php:971 lib/api.php:1024
+#: lib/api.php:1099 lib/api.php:1172 lib/api.php:1225
 msgid "Invalid email"
 msgstr "Neplatná e-mailová adresa"
 
-#: lib/api.php:905
+#: lib/api.php:1107
 msgid "Invalid entry"
 msgstr "Neplatná polo¾ka"
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Bol zadaný neplatný kµúè."
 
-#: lib/api.php:901
+#: lib/api.php:1103
 msgid "Invalid name"
 msgstr "Neplatné meno"
 
-#: lib/api.php:582
+#: lib/api.php:753
 msgid "Invalid objectId"
 msgstr "Neplatné objectId"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "Je po¾adovaná podpora LDAP, ale LDAP modul nie je dostupný alebo nahratý."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Posledná aktualizácia"
 
@@ -495,23 +611,27 @@
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Zoznam"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "Obsahujúce"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "Maximálny poèet kontaktov"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Maximálny poèet strán"
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Mini hµadanie"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Menu"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "Chýba DN v konfigurácii LDAP zdroja."
 
@@ -519,62 +639,64 @@
 msgid "Mobile Phone"
 msgstr "Mobilný telefón"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Úprava zlyhala: (%s) %s"
 
-#: lib/api.php:1010
+#: lib/api.php:1211
 msgid "More than 1 entry found"
 msgstr "Vyhovuje viac ako 1 polo¾ka"
 
-#: templates/browse/actions.inc:11
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Presunú»"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Presunú» vµavo"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Presunú» vpravo"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Adresár z Mulberry"
 
-#: lib/api.php:930
+#: lib/api.php:1131
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr "Existuje viacero osôb s adresou [%s], ale ¾iadna s menom [%s]"
 
-#: config/sources.php.dist:87 config/sources.php.dist:221
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+msgid "My Address Book"
 msgstr "Môj adresár"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr "Moje adresáre"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Meno"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Formát mena"
 
-#: config/sources.php.dist:295
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Adresár èlenov Netcenter"
 
-#: add.php:45 add.php:112 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "Nový zoznam"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Ïalej"
 
@@ -582,20 +704,20 @@
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: lib/api.php:1012 lib/api.php:1061
+#: lib/api.php:1213 lib/api.php:1262
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Pre %s neexistuje nijaká polo¾ka %s"
 
-#: lib/api.php:980
+#: lib/api.php:1181
 msgid "No address books found."
 msgstr "Neboli nájdené ¾iadne adresáre."
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr "Neboli nájdené ¾iadne kontakty"
 
-#: lib/api.php:356
+#: lib/api.php:513 lib/api.php:784
 msgid "No vCard data was found."
 msgstr "Neboli nájdené údaje vCard."
 
@@ -607,11 +729,11 @@
 msgid "Notes"
 msgstr "Poznámky"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Poèet polo¾iek na stránku"
 
-#: lib/api.php:458
+#: lib/api.php:632 lib/api.php:765
 msgid "Object not found"
 msgstr "Objekt nebol nájdený"
 
@@ -619,7 +741,20 @@
 msgid "Office"
 msgstr "Pracovisko"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+"Keï ulo¾íte túto stránku s mo¾nos»ami, adresár bude vymazaný. Ak to "
+"nechcete, musíte zmeni» nastavenie na \"®iadne\""
+
+#: lib/api.php:792
+msgid "Only one vcard supported."
+msgstr "Je podporovaná iba jedna vcard."
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Iné nastavenia"
 
@@ -627,32 +762,36 @@
 msgid "PGP Public Key"
 msgstr "PGP verejný kµúè"
 
-#: lib/api.php:340 lib/api.php:445 lib/api.php:535 lib/api.php:594
-#: lib/api.php:751 lib/api.php:911
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:952
+#: lib/api.php:1116
 msgid "Permission Denied"
 msgstr "Prístup zamietnutý"
 
-#: lib/Driver.php:436
+#: lib/Driver.php:550
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Práva"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Adresár z Pine"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
-msgstr "Zadajte prosím meno pre nový zoznam:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "Pomenujte prosím nový zoznam kontaktov:"
+
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "Predchádzajúca"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Prosím vyberte adresár:"
-
-#: config/sources.php.dist:399
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Privátny adresár"
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Chybná po¾iadavka: (%s) %s"
@@ -661,15 +800,27 @@
 msgid "Quick Search"
 msgstr "Rýchle hµadanie"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Chyba pri èítaní: (%s) %s"
 
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "Èítanie kontaktov nie je dostupné."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "Naozaj si ¾eláte vymaza» tento kontakt?"
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Zobrazené polo¾ky:"
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "Vymaza» adresár"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Odstráni» ståpec"
@@ -678,19 +829,19 @@
 msgid "Remove from this list"
 msgstr "Odstráni» zo zoznamu"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Prepísa» existujúci adresár importovaným adresárom? <b>Varovanie: toto "
-"vyma¾e v¹etky polo¾ky vo Va¹om aktuálnom adresári.</b>"
+"Prepísa» existujúci adresár importovaným adresárom? <strong>Varovanie: toto "
+"vyma¾e v¹etky polo¾ky vo Va¹om aktuálnom adresári.</strong>"
 
-#: lib/Driver.php:330
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Po¾adovaný objekt nebol nájdený"
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Obnovi» na prednastavené hodnoty"
 
@@ -698,166 +849,209 @@
 msgid "S/MIME Public Certificate"
 msgstr "Verejný S/MIME certifikát"
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
-msgstr "Chyba STARTTLS: (%s) %s"
+msgstr "Chyba pri STARTTLS: (%s) %s"
 
-#: edit.php:57 add.php:46
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Ulo¾i»"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "Ukladanie kontaktov nie je dostupné."
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Hµada»"
 
-#: browse.php:241 minisearch.php:66
-msgid "Search Results"
-msgstr "Výsledok Hµadania"
-
-#: lib/api.php:827
+#: lib/api.php:1029
 msgid "Search failed"
 msgstr "Hµadanie zlyhalo"
 
-#: lib/api.php:920 lib/api.php:926 lib/api.php:935 lib/api.php:948
+#: lib/api.php:1121 lib/api.php:1127 lib/api.php:1136 lib/api.php:1149
 #, php-format
 msgid "Search failed: %s"
 msgstr "Hµadanie zlyhalo: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Nastavenia hµadania"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "Hµadanie nie je dostupné."
 
-#: templates/block/minisearch.inc:24
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Hµadám..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Vyberte adresár"
-
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "Vyberte zoznam"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "Zvoµte adresár, ktorý chcete vymaza»"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "Zvoµte adresár, ktorý chcete upravi»"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Zvoµte adresár, z ktorého chcete exportova»:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Zvoµte adresár, do ktorého chcete importova»:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Zvoµte znakovú sadu zdrojového súboru:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Vyberte formát exportu:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Zvoµte súbor pre import:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Zvoµte formát exportu:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Zvoµte formát zobrazovania mien:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Nastavenie ¹tandardného spôsobu zobrazenia."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr "Nastavenie ¹tandardného spôsobu zobrazenia, triedenia a stránkovania."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Nastavenie polí, ktoré sa budú zobrazova» v zozname adries."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Nastavenie formátu zobrazovania mien."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Vybrané ståpce:"
-
-#: add.php:59
+#: add.php:54
 #, php-format
-msgid "Selected address book '%s'."
-msgstr "Bol vybraný adresár '%s'."
+msgid "Selected address book \"%s\"."
+msgstr "Bol vybraný adresár \"%s\"."
 
-#: config/sources.php.dist:154
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Zdieµaný adresár"
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "Zo_brazi» v¹etko"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Zobrazi»"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "Zobrazi» %s"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Zobrazi» v¹etko"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Zobrazi» kontakty"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Zobrazi» zoznamy"
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "Zobrazi» _kontakty"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "Zobrazi» _zoznamy"
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr "Smer triedenia"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "Zdroje"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr "©pecifikujte, kde sa majú objavi» roz¹írené výsledky hµadania."
 
-#: browse.php:130
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "Pridanie %d kontaktov do zoznamu bolo úspe¹né."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "Pridanie %s do %s bolo úspe¹né"
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Vytvorenie zoznamu kontaktov \"%s\" bolo úspe¹né."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "Vymazanie %d kontaktov bolo úspe¹né."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "Vymazanie %d kontaktov zo zoznamu bolo úspe¹né."
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV (hodnoty oddelené tabulátorom)"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Hodnoty oddelené tabulátorom"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr "Aby ste mohli nahráva» prílohy, musí by» nakonfigurovaný VFS backend."
+
+#: lib/Driver.php:1076
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Adresár \"%s\" neexistuje."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Adresár \"%s\" bol úspe¹ne vytvorený."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Adresár \"%s\" bol úspe¹ne vymazaný."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Adresár \"%s\" bol úspe¹ne aktualizovaný."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Adresár sa nepodarilo vymaza»: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "Po¾adovaný kontakt neexistuje."
 
-#: browse.php:33
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Súbor \"%s\" bol úspe¹ne vymazaný."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "Import sa dá dokonèi» napriek varovaniam."
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "®iadne adresáre nie sú prístupné na prezeranie."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -866,7 +1060,7 @@
 "®iaden z dostupných adresárov neumo¾òuje vkladanie nových polo¾iek. Ak "
 "predpokladáte, ¾e ide o chybu, kontaktujte prosím správcu Vá¹ho systému."
 
-#: add.php:108
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -874,94 +1068,117 @@
 "Nastala chyba pri pridávaní tohto kontaktu. Prosím kontaktujte správcu Vá¹ho "
 "systému."
 
-#: browse.php:185
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "Nastala chyba pri vytváraní nového zoznamu."
 
-#: browse.php:136
+#: addressbooks.php:38
+#, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Nastala chyba pri vytváraní tohto adresára: %s"
+
+#: browse.php:166
 #, php-format
-msgid "There was an error deleting %s from the source address book."
-msgstr "Nastala chyba pri vymazávaní %s zo zdrojového adresára."
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Nastala chyba pri vymazávaní \"%s\" zo zdrojového adresára."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Nastala chyba pri vymazávaní tohto kontaktu: %s."
 
-#: browse.php:68
-msgid "There was an error deleting this object."
-msgstr "Nastala chyba pri vymazávaní tohto objektu."
-
-#: browse.php:273
-msgid "There was an error displaying the select List"
-msgstr "Nastala chyba pri zobrazovaní vybraného zoznamu"
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "Nastala chyba pri zobrazovaní zoznamu"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Nastala chyba pri importe údajov: %s"
 
-#: lib/api.php:352
+#: lib/api.php:509 lib/api.php:779
 msgid "There was an error importing the iCalendar data."
 msgstr "Nastala chyba pri importe údajov iCalendar."
 
-#: browse.php:58
-msgid "There was an error removing this object."
-msgstr "Nastala chyba pri vymazávaní tohto objektu."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Nastala chyba pri vymazávaní tohto adresára: %s."
+
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Nastala chyba pri aktualizácii tohto adresára: %s"
 
-#: edit.php:84
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Nastala chyba pri aktualizácii tejto polo¾ky: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Neexistujú ¾iadne adresáre na export."
 
-#: lib/Driver.php:390 lib/Driver.php:427
-msgid "This address book is read-only"
-msgstr "Tento adresár je nastavený len na èítanie."
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "Adresáre sa zobrazia v tomto poradí:"
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Ståpce sa zobrazia v tomto poradí:"
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Tento formát súboru nie je podporovaný."
 
-#: lib/api.php:939 lib/api.php:952
+#: lib/api.php:1140 lib/api.php:1153
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Táto osoba u¾ má záznam %s v adresári."
 
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+"Toto bude prednastavený adresár pri pridávaní alebo importovaní kontaktov."
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titul"
 
-#: lib/Driver.php:834
+#: lib/Turba.php:449
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr "Nepodarilo sa vytvori» nové zdieµanie. Chýba typ zdroja."
+
+#: lib/Driver.php:1000
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Nemo¾né nahra» definíciu %s."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Zru¹i» zmeny"
 
-#: lib/api.php:487
-msgid "Unsupported Content-Type."
-msgstr "Nepodporovaný typ obsahu (Content-Type)."
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Nepodporovaný typ obsahu (Content-Type): %s"
 
-#: config/sources.php.dist:358
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Adresár Verisign"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
-msgid "View '%s'"
-msgstr "Zobrazi» '%s'"
+msgid "View \"%s\""
+msgstr "Zobrazi» \"%s\""
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
 msgstr "Zobrazi» kontakt"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Prednastavený spôsob zobrazenia:"
 
@@ -991,17 +1208,18 @@
 
 #: config/attributes.php.dist:129
 msgid "Work State/Province"
-msgstr "©tát/provincia (práca)"
+msgstr "©tát/privincia (práca)"
 
 #: config/attributes.php.dist:119
 msgid "Work Street Address"
-msgstr "Ulica (práca)"
+msgstr "Adresa do práce"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "Vytvárate zoznam príjemcov."
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "Nemô¾ete vytvori» viac ako %d kontaktov v \"%s\"."
 
-#: edit.php:44 display.php:58
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Nemáte právo na zobrazenie tohto kontaktu."
 
@@ -1009,7 +1227,11 @@
 msgid "You do not have permission to view this object."
 msgstr "Nemáte právo na zobrazenie tohto objektu."
 
-#: templates/browse/javascript.inc:51
+#: lib/Turba.php:537
+msgid "You do not have permissions to delete this source."
+msgstr "Nemáte právo na vymazanie tohto zdroja."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Musíte vybra» cieµový adresár."
 
@@ -1017,44 +1239,60 @@
 msgid "You must select a target list."
 msgstr "Musíte vybra» cieµový zoznam."
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "Musíte vybra» aspoò jeden kontakt."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Musíte vybra» aspoò jednu polo¾ku."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr "Máte právo iba na zobrazenie tohto kontaktu."
 
-#: browse.php:284
-msgid "Your default addressbook is not browseable."
+#: browse.php:318
+msgid "Your default address book is not browseable."
 msgstr "Vá¹ prednastavený adresár sa nedá prezera»."
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[¾iadna hodnota]"
 
-#: lib/Turba.php:286
-msgid "_Add"
-msgstr "Prid_a»"
-
-#: lib/Turba.php:283
+#: lib/Turba.php:560
 msgid "_Browse"
 msgstr "_Prezera»"
 
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "_Kontakty"
+
 #: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "_Vymaza»"
 
-#: lib/Turba.php:292
+#: lib/Turba.php:569
 msgid "_Import/Export"
 msgstr "_Import/Export"
 
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "_Zoznamy"
+
+#: lib/Turba.php:557
+msgid "_My Address Books"
+msgstr "_Moje adresáre"
+
+#: lib/Turba.php:563
+msgid "_New Contact"
+msgstr "_Nový kontakt"
+
 #: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "Odst_ráni» z tohto zoznamu"
 
-#: lib/Turba.php:288
+#: lib/Turba.php:565
 msgid "_Search"
 msgstr "_Hµada»"
 
@@ -1062,19 +1300,35 @@
 msgid "contact.vcf"
 msgstr "contacts.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contacts.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contacts.tsv"
 
-#: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
-msgstr "do vybraného adresára"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "contacts.vcf"
+
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr "¾iadne formátovanie"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "¾iadne"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "do zoznamu kontaktov"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "do iného adresára"
 
-#: data.php:30 templates/browse/column_headers.inc:7
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/po/es_ES.po
+++ mod/po/es_ES.po
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Turba 2.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2004-12-10 06:34+0100\n"
-"PO-Revision-Date: 2004-12-10 07:00+0100\n"
+"POT-Creation-Date: 2006-02-01 12:06+0100\n"
+"PO-Revision-Date: 2006-02-01 12:06+0100\n"
 "Last-Translator: Manuel P. Ayala <mayala at unex.es>\n"
 "Language-Team: i18n at lists.horde.org\n"
 "MIME-Version: 1.0\n"
@@ -17,551 +17,663 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr " Añadir una Libreta de direcciones IMSP"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr " Eliminar una Libreta de direcciones IMSP"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "\"%s\" ya existe y no se importó."
+
+#: browse.php:140
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "No se copió \"%s\" porque es una lista."
+
+#: browse.php:138
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "No se trasladó \"%s\" porque es una lista."
+
+#: config/.bak/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Nombre Apellidos\"  (p.e. Juan Nadie)"
 
-#: config/prefs.php.dist:110
+#: config/.bak/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Apellidos, Nombre\" (p.e. Nadie, Juan)"
 
-#: add.php:95
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "Se ha añadido %s."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "El archivo %s se ha importado satisfactoriamente"
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "%s al %s de %s"
 
-#: browse.php:146
+#: lib/Turba.php:464
 #, php-format
-msgid "'%s' was not copied because it is a group."
-msgstr "No se copió '%s' porque es un grupo."
+msgid "%s's Address Book"
+msgstr "Libreta de direcciones de %s"
 
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a group."
-msgstr "No se trasladó '%s' porque es un grupo."
-
-#: lib/Block/minisearch.php:45
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr "Hace falta un navegador con soporte de iFrames"
 
-#: config/prefs.php.dist:132
+#: config/.bak/prefs.php.dist:160
 msgid "Above search form"
 msgstr "Sobre el formulario de búsqueda"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Bús_queda avanzada"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "Acceso denegado a %s"
+
+#: add.php:56 templates/browse/actions.inc:29
+msgid "Add"
+msgstr "Añadir a"
+
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "Añadir libreta de direcciones"
+
+#: config/.bak/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "Añadir y eliminar libretas de direcciones IMSP"
 
-#: templates/prefs/columnselect.inc:238
+#: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Añadir columna"
 
-#: templates/browse/actions.inc:33
+#: edit.php:135
+msgid "Add file"
+msgstr "Añadir archivo"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Añadir a"
 
-#: addlink.php:52
-#, php-format
-msgid "Added a %s link to %s."
-msgstr "Añadido un vínculo %s a %s"
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "No se puede añadir contactos."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "Libreta de direcciones"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: browse.php:28 config/.bak/prefs.php.dist:125
 msgid "Address Book Listing"
-msgstr "Listado de libreta de direcciones"
+msgstr "Listado de direcciones"
+
+#: config/.bak/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Libretas de direcciones"
 
-#: add.php:94
+#: add.php:108
 msgid "Address book entry"
 msgstr "Entrada de la libreta de direcciones"
 
-#: lib/Driver.php:492 lib/Source.php:391
-msgid "Address book is read-only."
-msgstr "La libreta de direcciones es de sólo lectura."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Se ha vaciado correctamente la libreta de direcciones."
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "Libreta de direcciones a eliminar "
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "Libretas de direcciones que no se mostrarán:"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: config/attributes.php.dist:64
+#: config/.bak/attributes.php.dist:64
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr "Todo"
 
-#: lib/api.php:372
+#: lib/api.php:554
 msgid "Already Exists"
 msgstr "Ya existe"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "¿Está seguro de que desea eliminar %s?"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "¿Esta seguro de que desea eliminar las entradas seleccionadas?"
 
-#: config/prefs.php.dist:70
+#: config/.bak/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: templates/prefs/columnselect.inc:234
-msgid "Available Columns:"
-msgstr "Columnas disponibles:"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "_Regresar a %s"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "Regresar a %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Bús_queda simple"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Búsqueda simple"
 
-#: config/prefs.php.dist:131
+#: config/.bak/prefs.php.dist:159
 msgid "Below search form"
 msgstr "A continuación del formulario de búsqueda"
 
-#: lib/Driver/ldap.php:75 lib/Driver/ldap.php:78
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Ha fallado el enlazado: (%s) %s"
 
-#: config/attributes.php.dist:168
+#: config/.bak/attributes.php.dist:178
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: config/attributes.php.dist:163
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "Examinar"
+
+#: config/.bak/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Categoría de negocio"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "B_orrar Búsqueda"
-
-#: templates/addlink/contacts.inc:127
-msgid "Cancel"
-msgstr "Cancelar"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "No se puede añadir un grupo a sí mismo."
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Comprobar _Todas/Ninguna"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Elija un directorio por omisión para su libreta de direcciones, su lista de "
-"contactos y sus búsquedas personales."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "Elija un nombre"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Elija una libreta de direcciones."
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr ""
-"Elija el orden de las columnas visualizadas en el listado de direcciones."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "Elija una libreta de direcciones:"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr "Elija qué libretas de direcciones mostrar y en qué orden:"
+
+#: config/.bak/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "Elija la libreta de direcciones que quiera usar."
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "Limpiar búsqueda"
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "Elija qué columnas mostrar y en qué orden:"
 
-#: config/prefs.php.dist:10
+#: config/.bak/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Opciones de columna"
 
-#: templates/data/export.inc:16 templates/data/import.inc:18
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Columnas que no se mostrarán:"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Valores separados por comas"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Valores separados por comas (Outlook de Microsoft)"
 
-#: config/attributes.php.dist:76
+#: config/.bak/attributes.php.dist:76
 msgid "Company"
 msgstr "Compañía"
 
-#: config/attributes.php.dist:134
+#: config/.bak/attributes.php.dist:144
 msgid "Company Address"
 msgstr "Domicilio laboral"
 
-#: lib/api.php:611 lib/api.php:781
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:837
+#: lib/api.php:1024 lib/api.php:1112
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Fallo al conectar: %s"
 
-#: lib/Driver/ldap.php:64
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Fallo al conectar"
 
-#: addlink.php:138 templates/addlink/contacts.inc:59
-msgid "Contact List"
-msgstr "Lista de contactos"
-
-#: browse.php:85
-msgid "Contact removed from list."
-msgstr "Se ha eliminado el contacto de la lista."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Búsqueda de contactos"
 
-#: browse.php:275
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Contactos en la lista: %s"
 
-#: browse.php:297
-#, php-format
-msgid "Contents of %s"
-msgstr "Contenido de %s"
-
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "Copiar"
 
-#: lib/ObjectView.php:134
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Crear"
+
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "Crear libreta de direcciones"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Crear una nueva Lista en:"
+
+#: lib/ObjectView.php:133
 msgid "Created"
 msgstr "Creado"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Aspecto por omisión"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr ""
-"Directorio por omisión para su libreta de direcciones, su lista de contactos "
-"y sus búsquedas personales."
-
-#: config/prefs.php.dist:72
+#: config/.bak/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Sentido de clasificación por omisión:"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Eliminar"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "Eliminar libreta de direcciones"
+
+#: config/.bak/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Confirmación de eliminación"
 
-#: config/prefs.php.dist:36
+#: config/.bak/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Comportamiento del botón Eliminar "
 
-#: lib/Driver/ldap.php:267
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Se ha producido un error al eliminar: (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "No se puede eliminar contactos."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Se ha producido un error al eliminar"
 
-#: config/attributes.php.dist:203
+#: config/.bak/attributes.php.dist:213
 msgid "Department"
 msgstr "Departamento"
 
-#: config/prefs.php.dist:71
+#: config/.bak/prefs.php.dist:97
 msgid "Descending"
 msgstr "Descendente"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Descripción"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Directorio"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/.bak/prefs.php.dist:24
+msgid "Display"
+msgstr "Visualización"
+
+#: config/.bak/prefs.php.dist:9 config/.bak/prefs.php.dist:16
+#: config/.bak/prefs.php.dist:23 config/.bak/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Opciones de Visualización"
 
-#: config/prefs.php.dist:149
+#: config/.bak/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "¿Desea confirmar el borrado de las entradas?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "Descargar vCard"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Modificar"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
-msgid "Edit '%s'"
-msgstr "Modificar '%s'"
+msgid "Edit \"%s\""
+msgstr "Modificar \"%s\""
+
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "Modificar Libretas de direcciones"
 
-#: edit.php:53 edit.php:80
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Modificar entrada de %s"
 
-#: config/attributes.php.dist:58
+#: config/.bak/attributes.php.dist:58
 msgid "Email"
 msgstr "Correo"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+"Se ha actualizado la entrada de %s, pero no se ha podido guardar el archivo "
+"cargado: %s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Se ha actualizado la entrada de %s."
 
-#: templates/miniwindow/menu.inc:1
-msgid "Exit Address Book"
-msgstr "Salir de la libreta de direcciones"
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "Se ha producido un error al añadir %d contacto(s) a la lista."
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr ""
+"Se ha producido un error al añadir %d de %d contacto(s) solicitado(s) a la "
+"lista."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Se produjo un error al eliminar %d contacto(s)."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "Se produjo un error al eliminar %d de %d contacto(s) solicitado(s)."
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "Se produjo un error al eliminar %d contacto(s) de la lista."
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr ""
+"Se produjo un erro al eliminar %d de %d contacto(s) solicitado(s) de la "
+"lista."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "Se produjo un error buscando en la libreta de direcciones: %s"
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportar"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Exportar libreta de direcciones"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Exportar sólo los contactos seleccionados."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Exportar las siguientes libretas de direcciones completas."
 
-#: add.php:71 browse.php:62 browse.php:120 browse.php:135 data.php:110
-#: data.php:228 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Fallo al acceder a la libreta de direcciones: %s"
 
-#: browse.php:154
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Fallo al añadir %s a %s: %s"
 
-#: browse.php:280
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "Fallo al visualizar el listado"
 
-#: browse.php:311
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "Fallo al visualizar el directorio"
 
-#: lib/Driver/ldap.php:305
+#: lib/Driver/ldap.php:309
 #, php-format
-msgid "Failed to change name: (%s) %s, %s"
-msgstr "Fallo al cambiar el nombre: (%s) %s, %s)"
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+"Fallo al cambiar el nombre: (%s) %s; Antiguo DN = %s, Nuevo DN = %s, Raiz = %"
+"s"
 
-#: browse.php:140
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Fallo al localizar el objecto a añadir: %s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "No se puede buscar en la libreta de direcciones"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Fallo al buscar en el directorio: %s"
 
-#: config/attributes.php.dist:157
+#: config/.bak/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72 templates/addlink/contacts.inc:77
+#: edit.php:131 display.php:100
+msgid "Files"
+msgstr "Archivos"
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr "Encontrar"
 
-#: config/attributes.php.dist:48
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "Terminar"
+
+#: config/.bak/attributes.php.dist:48
 msgid "First Name"
 msgstr "Primer nombre"
 
-#: config/attributes.php.dist:192
+#: config/.bak/attributes.php.dist:202
 msgid "Freebusy URL"
 msgstr "URL de tiempo disponible"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "De"
 
-#: config/sources.php.dist:521
+#: config/.bak/sources.php.dist:606
 msgid "Global Address Book"
 msgstr "Libreta de direcciones global"
 
-#: templates/browse/column_headers.inc:10 templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Grupo"
 
-#: templates/addlink/contacts.inc:129 templates/addlink/menu.inc:10
-msgid "Help"
-msgstr "Ayuda"
-
-#: config/attributes.php.dist:82
+#: config/.bak/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: config/attributes.php.dist:88
+#: config/.bak/attributes.php.dist:93
 msgid "Home City"
 msgstr "Ciudad del domicilio"
 
-#: config/attributes.php.dist:103
+#: config/.bak/attributes.php.dist:108
 msgid "Home Country"
 msgstr "Pais del domicilio"
 
-#: config/attributes.php.dist:140
+#: config/.bak/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Teléfono particular"
 
-#: config/attributes.php.dist:98
+#: config/.bak/attributes.php.dist:103
 msgid "Home Postal Code"
 msgstr "Código postal del domicilio"
 
-#: config/attributes.php.dist:93
+#: config/.bak/attributes.php.dist:98
 msgid "Home State/Province"
 msgstr "Estado/Provincia del domicilio"
 
-#: config/sources.php.dist:457
+#: config/.bak/attributes.php.dist:88
+msgid "Home Street Address"
+msgstr "Dirección del domicilio"
+
+#: config/.bak/sources.php.dist:508
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/.bak/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "Administración de libreta de direcciones IMSP"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Importar libreta de direcciones. Paso %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Importar/Exportar libretas de direcciones"
 
-#: lib/api.php:358 lib/api.php:577
-msgid "Invalid Content-Type"
-msgstr "Tipo de contenido no válido."
-
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "ID no válido"
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:852
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1095
 msgid "Invalid address book"
 msgstr "La libreta de direcciones no es válida."
 
-#: lib/api.php:856 lib/api.php:927 lib/api.php:979
+#: lib/api.php:1099 lib/api.php:1172 lib/api.php:1225
 msgid "Invalid email"
 msgstr "La dirección de correo no es válida."
 
-#: lib/api.php:864
+#: lib/api.php:1107
 msgid "Invalid entry"
 msgstr "Entrada no válida."
 
-#: lib/Driver/ldap.php:263
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Se ha indicado una clave no válida."
 
-#: lib/api.php:860
+#: lib/api.php:1103
 msgid "Invalid name"
 msgstr "Nombre no válido"
 
-#: lib/api.php:560
+#: lib/api.php:753
 msgid "Invalid objectId"
 msgstr "ObjectId no válido"
 
-#: lib/Driver/ldap.php:39
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "Se precisa soporte LDAP pero el módulo LDAP no está disponible o cargado."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Última modificación"
 
-#: config/attributes.php.dist:53
+#: config/.bak/attributes.php.dist:53
 msgid "Last Name"
 msgstr "Último nombre"
 
-#: addlink.php:55
-msgid "Link added."
-msgstr "Se ha añadido el vínculo."
-
-#: addlink.php:64
-msgid "Link canceled."
-msgstr "Se ha cancelado el vínculo."
+#: templates/browse/column_headers.inc:16
+msgid "List"
+msgstr "Lista"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "Coincidente"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "Número máximo de Contactos"
+
+#: config/.bak/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Número máximo de páginas"
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Búsqueda reducida"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Lista de menú"
 
-#: lib/Driver/ldap.php:299
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "Falta DN en la configuración origen de LDAP."
 
-#: config/attributes.php.dist:152
+#: config/.bak/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: lib/Driver/ldap.php:327 lib/Driver/ldap.php:344
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Ha fallado la modificación: (%s) %s"
 
-#: lib/api.php:965
+#: lib/api.php:1211
 msgid "More than 1 entry found"
 msgstr "Se ha encontrado más de 1 entrada"
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Trasladar"
 
-#: templates/prefs/columnselect.inc:248
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Desplazar a la izquierda"
 
-#: templates/prefs/columnselect.inc:250
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Desplazar a la derecha"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Libreta de direcciones Mulberry"
 
-#: lib/api.php:886
+#: lib/api.php:1131
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
@@ -569,319 +681,390 @@
 "Varias personas con la dirección [%s] pero todavía no existe ninguna con el "
 "nombre [%s]"
 
-#: config/sources.php.dist:165 config/sources.php.dist:294
-msgid "My Addressbook"
-msgstr "Mi libreta de direcciones"
+#: config/.bak/sources.php.dist:107 config/.bak/sources.php.dist:243
+msgid "My Address Book"
+msgstr "Mi libreta"
+
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr "Mis libretas"
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/.bak/attributes.php.dist:42
 msgid "Name"
 msgstr "Nombre"
 
-#: config/prefs.php.dist:22
+#: config/.bak/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Formato de nombre"
 
-#: config/sources.php.dist:72
+#: config/.bak/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Directorio miembro de Netcenter"
 
-#: add.php:45 add.php:111 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
-msgstr "Nuevo contacto"
+msgstr "Añadir"
 
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "Nueva lista"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Siguiente"
 
-#: config/attributes.php.dist:208
+#: config/.bak/attributes.php.dist:218
 msgid "Nickname"
 msgstr "Apodo"
 
-#: lib/api.php:967 lib/api.php:1016
+#: lib/api.php:1213 lib/api.php:1262
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "No se ha encontrado una entrada %s para %s"
 
-#: lib/api.php:936
+#: lib/api.php:1181
 msgid "No address books found."
 msgstr "No se han encontrado libretas."
 
-#: minisearch.php:85
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr "No se han encontrado contactos"
 
-#: lib/api.php:338
+#: lib/api.php:513 lib/api.php:784
 msgid "No vCard data was found."
 msgstr "No se encontraron datos vCard."
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "Ninguna"
 
-#: config/attributes.php.dist:174
+#: config/.bak/attributes.php.dist:184
 msgid "Notes"
 msgstr "Notas"
 
-#: config/prefs.php.dist:89
+#: config/.bak/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Número de artículos por página"
 
-#: lib/api.php:436
+#: lib/api.php:632 lib/api.php:765
 msgid "Object not found"
 msgstr "No se ha encontrado el objeto."
 
-#: config/attributes.php.dist:213
+#: config/.bak/attributes.php.dist:223
 msgid "Office"
 msgstr "Oficina"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+"Una vez guarde esta página de opciones, la libreta de direcciones se borrará "
+"definitivamente. Si no es lo que desea, debería cambiar la selección a "
+"\"Ninguno\"."
+
+#: lib/api.php:792
+msgid "Only one vcard supported."
+msgstr "Sólo se soporta una vcard."
+
+#: config/.bak/prefs.php.dist:37 config/.bak/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Otras opciones"
 
-#: config/attributes.php.dist:180
+#: config/.bak/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr "Clave PGP pública"
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:870
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:952
+#: lib/api.php:1116
 msgid "Permission Denied"
 msgstr "Permiso denegado"
 
-#: lib/Driver.php:453
+#: lib/Driver.php:550
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Privilegios"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Libreta de direcciones de Pine"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
 msgstr "Introduzca el nombre de la nueva lista:"
 
-#: templates/prefs/columnselect.inc:219
-msgid "Please select a directory:"
-msgstr "Seleccione un directorio:"
-
-#: templates/addlink/contacts.inc:96
-msgid "Please select contact"
-msgstr "Seleccione un contacto"
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "Anterior"
 
-#: config/sources.php.dist:373
+#: config/.bak/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Libreta de direcciones privada"
 
-#: lib/Driver/ldap.php:139
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Ha fallado la consulta: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "Búsqueda rápida"
 
-#: lib/Driver/ldap.php:183 lib/Driver/ldap.php:191 lib/Driver/ldap.php:424
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Ha fallado la lectura: (%s) %s"
 
-#: templates/browse/footer.inc:6
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "No se pueden leer los contactos."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "¿Eliminar realmente este contacto?"
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Registros mostrados:"
 
-#: templates/prefs/columnselect.inc:240
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "Eliminar libreta de direcciones"
+
+#: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Quitar columna"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:3
 msgid "Remove from this list"
 msgstr "Quitar de esta lista"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"¿Sustituir la libreta existente por la importada? <b>Advertencia: Ésto "
-"eliminará todas las entradas de su libreta de direcciones actual.</b>"
+"¿Sustituir la libreta existente por la importada? <strong>Advertencia: Ésto "
+"eliminará todas las entradas de su libreta de direcciones actual.</strong>"
 
-#: lib/Driver.php:343 lib/Source.php:270
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "No se encontró el objeto solicitado."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Restaurar a los valores por omisión"
 
-#: config/attributes.php.dist:186
+#: config/.bak/attributes.php.dist:196
 msgid "S/MIME Public Certificate"
 msgstr "Certificado S/MIME público"
 
-#: add.php:46 edit.php:57
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr "Ha fallado STARTTLS: (%s) %s"
+
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 templates/addlink/contacts.inc:89
-#: config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "No se pueden guardar los contactos."
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/.bak/prefs.php.dist:126
 msgid "Search"
 msgstr "Buscar"
 
-#: browse.php:260 minisearch.php:66
-msgid "Search Results"
-msgstr "Resultados de la búsqueda"
-
-#: lib/api.php:786
+#: lib/api.php:1029
 msgid "Search failed"
 msgstr "Ha fallado la búsqueda"
 
-#: lib/api.php:876 lib/api.php:882 lib/api.php:891 lib/api.php:904
+#: lib/api.php:1121 lib/api.php:1127 lib/api.php:1136 lib/api.php:1149
 #, php-format
 msgid "Search failed: %s"
 msgstr "Ha fallado la búsqueda: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Opciones de búsqueda"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "No se puede realizar búsquedas."
 
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: templates/addlink/contacts.inc:126
-msgid "Select"
-msgstr "Seleccionar"
-
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Seleccionar libreta de direcciones"
-
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "Seleccionar listado"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "Seleccione una libreta de direcciones a eliminar"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "Seleccione una libreta de direcciones a modificar"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Seleccione la libreta de direcciones a exportar:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Seleccione la libreta de direcciones a la que importar:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Seleccione el juego de caracteres del archivo origen:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Seleccione el formato de exportación:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Seleccione el archivo a importar:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Seleccione el formato del archivo origen:"
 
-#: config/prefs.php.dist:109
+#: config/.bak/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Seleccione el formato usado para mostrar los nombres:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Seleccione la vista mostrada por omisión."
+#: config/.bak/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
+"Seleccione la vista mostrada por omisión y las opciones de ordenación y "
+"paginación."
 
-#: config/prefs.php.dist:11
+#: config/.bak/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Seleccione los campos visualizados en el listado de direcciones."
 
-#: config/prefs.php.dist:23
+#: config/.bak/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Seleccione cómo mostrar los nombres."
 
-#: templates/prefs/columnselect.inc:244
-msgid "Selected Columns:"
-msgstr "Columnas seleccionadas:"
-
-#: add.php:59
+#: add.php:54
 #, php-format
-msgid "Selected address book '%s'."
-msgstr "Se ha seleccionado la libreta de direcciones '%s'."
+msgid "Selected address book \"%s\"."
+msgstr "Libreta de direcciones seleccionada \"%s\"."
 
-#: config/sources.php.dist:230
+#: config/.bak/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Directorio compartido"
 
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "Mostrar _todo"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Mostrar"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "Mostrar %s"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Mostrar contactos"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Mostrar listas"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "Mostrar _contactos"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "Mostrar _listas"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr "Sentido de clasificación"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "Orígenes"
 
-#: config/prefs.php.dist:130
+#: config/.bak/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr ""
 "Indique dónde desea que aparezcan los resultados de la búsqueda avanzada."
 
-#: browse.php:156
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "Se ha(n) añadido correctamente %d contacto(s) a la lista."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "Se ha añadido correctamente %s a %s."
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Se ha creado correctamente la lista \"%s\"."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "Se ha(n) eliminado correctamente %d contacto(s)."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "Se ha(n) eliminado correctamente %d contacto(s) de la lista."
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/export.inc:18 templates/data/import.inc:19
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Valores separados por tabuladores"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr "Hay que configurar el motor VFS para permitir la carga de adjuntos."
+
+#: lib/Driver.php:1076
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "La libreta de direcciones \"%s\" no existe."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Se ha creado correctamente la libreta de direcciones \"%s\"."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Se ha eliminado correctamente la libreta de direcciones \"%s\"."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Se ha actualizado correctamente la libreta de direcciones \"%s\"."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "No se pudo vaciar la libreta de direcciones: %s"
 
-#: display.php:23 edit.php:24 vcard.php:22
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "El contacto solicitado no existe."
 
-#: browse.php:58
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "El archivo \"%s\" se ha eliminado correctamente."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "Se puede completar la importación a pesar de los avisos."
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "No hay libretas de direcciones visualizables."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -891,7 +1074,7 @@
 "disponibles está configurada para permitirle añadir entradas en ellas. Si "
 "considera que esto es un error, contacte con el administrador de sistemas."
 
-#: add.php:107
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -899,131 +1082,158 @@
 "Se produjo un error al añadir el contacto. Contacte al administrador de "
 "sistemas para más información."
 
-#: browse.php:212
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "Se produjo un error al crear una lista."
 
-#: browse.php:163
+#: addressbooks.php:38
+#, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Se produjo un error al crear esta libreta de direcciones: %s"
+
+#: browse.php:166
 #, php-format
-msgid "There was an error deleting %s from the source address book."
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr ""
-"Se produjo un error al eliminar %s de la libreta de direcciones origen."
+"Se produjo un error al eliminar \"%s\" de la libreta de direcciones origen."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Se produjo un error al eliminar este contacto: %s"
 
-#: browse.php:93
-msgid "There was an error deleting this object."
-msgstr "Se produjo un error al eliminar este objeto."
-
-#: browse.php:290
-msgid "There was an error displaying the select List"
-msgstr "Se produjo un error al mostrar la lista de selección"
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "Se produjo un error al mostrar la lista"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Se produjo un error al importar los datos: %s"
 
-#: lib/api.php:334
+#: lib/api.php:509 lib/api.php:779
 msgid "There was an error importing the iCalendar data."
 msgstr "Se produjo un error al importar los datos iCalendar."
 
-#: browse.php:83
-msgid "There was an error removing this object."
-msgstr "Se produjo un error al eliminar este objeto."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Se produjo un error al eliminar esta libreta de direcciones: %s"
+
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Se produjo un error al actualizar esta libreta de direcciones: %s"
 
-#: edit.php:84
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Se produjo un error al actualizar la entrada: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "No hubo direcciones a exportar."
 
-#: lib/Driver.php:403 lib/Driver.php:444
-msgid "This address book is read-only"
-msgstr "Esta libreta es de sólo lectura."
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "Estas libretas se mostrarán en este orden:"
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Estas columnas se mostrarán en este orden:"
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Este formato de archivo no está soportado."
 
-#: lib/api.php:895 lib/api.php:908
+#: lib/api.php:1140 lib/api.php:1153
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Esta persona ya tiene una entrada %s en la libreta de direcciones."
 
-#: config/attributes.php.dist:70
+#: config/.bak/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr "Ésta será la libreta por omisión al añadir o importar contactos."
+
+#: config/.bak/attributes.php.dist:70
 msgid "Title"
 msgstr "Título"
 
-#: lib/Driver.php:816
+#: lib/Turba.php:449
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr "No se puede crear un nuevo \"share\". Falta el tipo de origen."
+
+#: lib/Driver.php:1000
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Incapaz de cargar la definición de %s."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Deshacer cambios"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
-msgstr "Tipo de contenido no soportado"
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Tipo de contenido no soportado: %s"
 
-#: config/sources.php.dist:131
+#: config/.bak/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Directorio Verisign"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
-msgid "View '%s'"
-msgstr "Ver '%s'"
+msgid "View \"%s\""
+msgstr "Ver \"%s\""
 
-#: minisearch.php:80
+#: minisearch.php:76
 msgid "View Contact"
 msgstr "Ver contacto"
 
-#: config/prefs.php.dist:98
+#: config/.bak/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Vista mostrada por omisión:"
 
-#: config/attributes.php.dist:198
+#: config/.bak/attributes.php.dist:208
 msgid "Website URL"
 msgstr "URL de sede Web"
 
-#: config/attributes.php.dist:108
+#: config/.bak/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Dirección del trabajo"
 
-#: config/attributes.php.dist:114
+#: config/.bak/attributes.php.dist:124
 msgid "Work City"
 msgstr "Ciudad del trabajo"
 
-#: config/attributes.php.dist:129
+#: config/.bak/attributes.php.dist:139
 msgid "Work Country"
 msgstr "País del trabajo"
 
-#: config/attributes.php.dist:146
+#: config/.bak/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Teléfono del trabajo"
 
-#: config/attributes.php.dist:124
+#: config/.bak/attributes.php.dist:134
 msgid "Work Postal Code"
 msgstr "Código postal del trabajo"
 
-#: config/attributes.php.dist:119
+#: config/.bak/attributes.php.dist:129
 msgid "Work State/Province"
 msgstr "Estado/provincia del trabajo"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "Está creando una lista de distribución."
+#: config/.bak/attributes.php.dist:119
+msgid "Work Street Address"
+msgstr "Dirección del trabajo"
+
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "No dispone de privilegios para crear más de %d contactos en \"%s\"."
 
-#: display.php:48 edit.php:44
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "No dispone de privilegios para ver este contacto."
 
@@ -1031,51 +1241,72 @@
 msgid "You do not have permission to view this object."
 msgstr "No dispone de privilegios para ver este objeto."
 
-#: templates/browse/javascript.inc:41
+#: lib/Turba.php:537
+msgid "You do not have permissions to delete this source."
+msgstr "No dispone de privilegios para eliminar este origen."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Tiene que seleccionar una libreta de direcciones de destino."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
 msgstr "Tiene que seleccionar una lista de destino."
 
-#: templates/addlink/contacts.inc:44
-msgid "You must select an address first."
-msgstr "Primero tiene que seleccionar una dirección."
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "Primero tiene que seleccionar al menos un contacto."
 
-#: templates/browse/javascript.inc:58
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Primero tiene que seleccionar al menos una entrada."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr "Sólo dispone de privilegios para ver este contacto."
 
-#: templates/browse/contactrow.inc:12
+#: browse.php:318
+msgid "Your default address book is not browseable."
+msgstr "La libreta por omisión no se puede hojear."
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[sin valor]"
 
-#: lib/Turba.php:240
-msgid "_Add"
-msgstr "_Añadir"
-
-#: lib/Turba.php:239
+#: lib/Turba.php:560
 msgid "_Browse"
 msgstr "_Examinar"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "_Contactos"
+
+#: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "Eli_minar"
 
-#: lib/Turba.php:245
+#: lib/Turba.php:569
 msgid "_Import/Export"
 msgstr "_Importar/Exportar"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "_Listas"
+
+#: lib/Turba.php:557
+msgid "_My Address Books"
+msgstr "_Mis libretas"
+
+#: lib/Turba.php:563
+msgid "_New Contact"
+msgstr "_Añadir"
+
+#: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "E_liminar de esta lista"
 
-#: lib/Turba.php:241
+#: lib/Turba.php:565
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -1083,23 +1314,35 @@
 msgid "contact.vcf"
 msgstr "contacto.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contactos.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contactos.tsv"
 
-#: templates/addlink/contacts.inc:80
-msgid "from"
-msgstr "de"
-
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
-msgstr "a la libreta de direcciones seleccionada"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "contactos.vcf"
+
+#: config/.bak/prefs.php.dist:138
+msgid "no formatting"
+msgstr "sin formato"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "ninguno"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "una Lista"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "una Libreta de distinta"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/export.inc:20 templates/data/import.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/templates/block/minisearch.inc
+++ mod/templates/block/minisearch.inc
@@ -1,10 +1,7 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 var busyExpanding = false;
-function mini_search(e)
+function mini_search()
 {
-    if (typeof e != 'undefined' && !enter_key_trap(e)) {
-        return false;
-    }
     if (document.busyExpanding) {
         return false;
     }
@@ -14,16 +11,12 @@
 </script>
 
 <form name="turba_minisearch" action="<?php echo Horde::applicationUrl('minisearch.php') ?>" onsubmit="mini_search();" target="turba_minisearch_iframe">
-<?php Util::pformInput(); ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="control"><strong><?php echo _("Quick Search") ?></strong></td></tr>
-<tr><td>
+<?php Util::pformInput() ?>
+<p class="control"><strong><?php echo _("Quick Search") ?></strong></p>
+
 <input name="search" size="35" />
-</td></tr>
-<tr><td>
 <input type="submit" class="button" value="<?php echo _("Search") ?>" />
 <span id="turba_minisearch_searching" class="inProgress"><?php echo _("Searching...") ?></span>
-</td></tr>
-</table>
 </form>
 
-<div><iframe id="turba_minisearch_iframe" name="turba_minisearch_iframe" style="width:100%; height:100px; border:none; display:none" src="<?php echo Horde::applicationUrl('minisearch.php') ?>"></iframe></div>
+<div><iframe id="turba_minisearch_iframe" name="turba_minisearch_iframe" style="width:100%; height:100px; border:none; display:none" frameborder="0" src="<?php echo Horde::applicationUrl('minisearch.php') ?>"></iframe></div>


--- orig/lib/api.php
+++ mod/lib/api.php
@@ -2,7 +2,7 @@
 /**
  * Turba external API interface.
  *
- * $Horde: turba/lib/api.php,v 1.120.2.15 2005/10/05 13:59:43 jan Exp $
+ * $Horde: turba/lib/api.php,v 1.120.2.26 2006/03/06 13:54:04 jan Exp $
  *
  * This file defines Turba's external API interface. Other applications can
  * interact with Turba through this API.
@@ -12,7 +12,7 @@
 
 $_services['perms'] = array(
     'args' => array(),
-    'type' => '{urn:horde}stringArray'
+    'type' => '{urn:horde}hashHash'
 );
 
 $_services['show'] = array(
@@ -20,8 +20,8 @@
 );
 
 $_services['browse'] = array(
-    'args' => array('path' => 'string'),
-    'type' => '{urn:horde}stringArray',
+    'args' => array('path' => 'string', 'properties' => '{urn:horde}stringArray'),
+    'type' => '{urn:horde}hashHash',
 );
 
 $_services['sources'] = array(
@@ -44,6 +44,11 @@
     'type' => '{urn:horde}stringArray',
 );
 
+$_services['getActionTimestamp'] = array(
+    'args' => array('uid' => 'string', 'timestamp' => 'int'),
+    'type' => 'int',
+);
+
 $_services['import'] = array(
     'args' => array('content' => 'string', 'contentType' => 'string', 'source' => 'string'),
     'type' => 'string',
@@ -65,7 +70,9 @@
 );
 
 $_services['search'] = array(
-    'args' => array('sources' => '{urn:horde}stringArray', 'names' => '{urn:horde}stringArray', 'fields' => '{urn:horde}stringArray'),
+    'args' => array('names' => '{urn:horde}stringArray',
+                    'sources' => '{urn:horde}stringArray',
+                    'fields' => '{urn:horde}stringArray'),
     'type' => '{urn:horde}stringArray',
 );
 
@@ -90,7 +97,7 @@
 );
 
 $_services['getField'] = array(
-    'args' => array('address' => 'string', 'field' => 'string', 'sources' => '{urn:horde}stringArray'),
+    'args' => array('address' => 'string', 'field' => 'string', 'sources' => '{urn:horde}stringArray', 'strict' => 'boolean'),
     'type' => '{urn:horde}stringArray',
 );
 
@@ -138,6 +145,45 @@
     'type' => '{urn:horde}stringArray',
 );
 
+$_services['commentCallback'] = array(
+    'args' => array('id' => 'string'),
+    'type' => 'string'
+);
+
+$_services['hasComments'] = array(
+    'args' => array(),
+    'type' => 'boolean'
+);
+
+
+function _turba_commentCallback($id)
+{
+    if (!$GLOBALS['conf']['comments']['allow']) {
+        return false;
+    }
+
+    @define('TURBA_BASE', dirname(__FILE__) . '/..');
+    require_once TURBA_BASE . '/lib/base.php';
+    global $cfgSources;
+
+    list($source, $key) = explode('.', $id, 2);
+    if (isset($cfgSources[$source])) {
+        $driver = &Turba_Driver::singleton($source);
+        if (!is_a($driver, 'PEAR_Error')) {
+            $object = $driver->getObject($key);
+            if (!is_a($object, 'PEAR_Error')) {
+                return $object->getValue('name');
+            }
+        }
+    }
+
+    return false;
+}
+
+function _turba_hasComments()
+{
+    return $GLOBALS['conf']['comments']['allow'];
+}
 
 function _turba_perms()
 {
@@ -148,7 +194,7 @@
 
     @define('TURBA_BASE', dirname(__FILE__) . '/..');
     require_once TURBA_BASE . '/lib/base.php';
-    global $cfgSources;
+    require TURBA_BASE . '/config/sources.php';
 
     $perms['tree']['turba']['sources'] = false;
     $perms['title']['turba:sources'] = _("Sources");
@@ -157,6 +203,9 @@
     foreach ($cfgSources as $source => $curSource) {
         $perms['tree']['turba']['sources'][$source] = false;
         $perms['title']['turba:sources:' . $source] = $curSource['title'];
+        $perms['tree']['turba']['sources'][$source]['max_contacts'] = false;
+        $perms['title']['turba:sources:' . $source . ':max_contacts'] = _("Maximum Number of Contacts");
+        $perms['type']['turba:sources:' . $source . ':max_contacts'] = 'int';
     }
 
     return $perms;
@@ -165,21 +214,13 @@
 function _turba_sources($writeable = false)
 {
     require_once dirname(__FILE__) . '/base.php';
-    global $cfgSources;
 
-    if (!isset($cfgSources) || !is_array($cfgSources) || !count($cfgSources)) {
-        return array();
+    $addressbooks = Turba::getAddressBooks($writeable ? PERMS_EDIT : PERMS_READ);
+    foreach ($addressbooks as $addressbook => $config) {
+        $addressbooks[$addressbook] = $config['title'];
     }
 
-    $sources = array();
-    foreach ($cfgSources as $key => $entry) {
-        if (!$writeable || (!$entry['readonly'] ||
-                            (isset($entry['admin']) && in_array(Auth::getAuth(), $entry['admin'])))) {
-            $sources[$key] = $entry['title'];
-        }
-    }
-
-    return $sources;
+    return $addressbooks;
 }
 
 function _turba_fields($source = '')
@@ -207,15 +248,32 @@
 /**
  * Browses through Turba's object tree.
  *
- * @param string $path  The level of the tree to browse.
+ * @param string $path       The path of the tree to browse.
+ * @param array $properties  The item properties to return. Defaults to 'name',
+ *                           'icon', and 'browseable'.
  *
  * @return array  Content of the specified path.
  */
-function _turba_browse($path = '')
+function _turba_browse($path = '', $properties = array())
 {
+    function _modified($uid)
+    {
+        $modified = _turba_getActionTimestamp($uid, 'modify');
+        if (empty($modified)) {
+            $modified = _turba_getActionTimestamp($uid, 'add');
+        }
+        return $modified;
+    }
+
     require_once dirname(__FILE__) . '/base.php';
     global $registry, $cfgSources;
 
+    // Default properties.
+    if (!$properties) {
+        $properties = array('name', 'icon', 'browseable');
+    }
+
+    // Massage the path into the form we want.
     if (substr($path, 0, 5) == 'turba') {
         $path = substr($path, 5);
     }
@@ -226,26 +284,42 @@
         $path = substr($path, 0, -1);
     }
 
-    $addressbooks = $registry->callByPackage('turba', 'sources');
-    if (is_a($addressbooks, 'PEAR_Error')) {
-        return $addressbooks;
-    }
+    // Get a list of address books.
+    $addressbooks = Turba::getAddressBooks();
 
     if (empty($path)) {
         $results = array();
-        foreach ($addressbooks as $addressbook => $name) {
-            $results['turba/' . $addressbook] =
-                array('name' => $name,
-                      'icon' => $registry->getImageDir() . '/turba.png',
-                      'browseable' => true);
+        foreach ($addressbooks as $addressbook => $info) {
+            if (in_array('name', $properties)) {
+                $results['turba/' . $addressbook]['name'] = $info['title'];
+            }
+            if (in_array('icon', $properties)) {
+                $results['turba/' . $addressbook]['icon'] = $registry->getImageDir() . '/turba.png';
+            }
+            if (in_array('browseable', $properties)) {
+                $results['turba/' . $addressbook]['browseable'] = !empty($cfgSources[$addressbook]['browse']);
+            }
+            if (in_array('contenttype', $properties)) {
+                $results['turba/' . $addressbook]['contenttype'] = 'httpd/unix-directory';
+            }
+            if (in_array('contentlength', $properties)) {
+                $results['turba/' . $addressbook]['contentlength'] = 0;
+            }
+            if (in_array('modified', $properties)) {
+                $results['turba/' . $addressbook]['modified'] = time();
+            }
+            if (in_array('created', $properties)) {
+                $results['turba/' . $addressbook]['created'] = 0;
+            }
         }
         return $results;
     } elseif (isset($addressbooks[$path])) {
-        /* Load the Turba driver. */
-        $driver = &Turba_Driver::singleton($path, $cfgSources[$path]);
+        // Load the Turba driver.
+        $driver = &Turba_Driver::singleton($path);
         if (is_a($driver, 'PEAR_Error')) {
             return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $cfgSources[$path]);
         }
+
         $contacts = $driver->search(array());
         if (is_a($contacts, 'PEAR_Error')) {
             return $contacts;
@@ -254,26 +328,55 @@
         $results = array();
         $contacts->reset();
         while ($contact = $contacts->next()) {
-            $results['turba/' . $contact->getSource() . '/' . $contact->getValue('__key')] =
-                array('name' => Turba::formatName($contact),
-                      'browseable' => false);
+            $key = 'turba/' . $contact->getSource() . '/' . $contact->getValue('__key');
+            if (in_array('name', $properties)) {
+                $results[$key]['name'] = Turba::formatName($contact);
+            }
+            if (in_array('icon', $properties)) {
+                $results[$key]['icon'] = $registry->getImageDir('horde') . '/mime/vcard.png';
+            }
+            if (in_array('browseable', $properties)) {
+                $results[$key]['browseable'] = false;
+            }
+            if (in_array('contenttype', $properties)) {
+                $results[$key]['contenttype'] = 'text/x-vcard';
+            }
+            if (in_array('contentlength', $properties)) {
+                $data = _turba_export($contact->getValue('__uid'), 'text/x-vcard', $contact->getSource());
+                if (is_a($data, 'PEAR_Error')) {
+                    $data = '';
+                }
+                $results[$key]['contentlength'] = strlen($data);
+            }
+            if (in_array('modified', $properties)) {
+                $results[$key]['modified'] = _modified($contact->getValue('__uid'));
+            }
+            if (in_array('created', $properties)) {
+                $results[$key]['created'] = _turba_getActionTimestamp($contact->getValue('__uid'), 'add');
+            }
         }
         return $results;
     } else {
-        $path = explode('/', $path);
-        if (count($path) == 2 && isset($addressbooks[$path[0]])) {
+        $parts = explode('/', $path);
+        if (count($parts) == 2 && isset($addressbooks[$parts[0]])) {
             // Load the Turba driver.
-            $driver = &Turba_Driver::singleton($path[0], $cfgSources[$path[0]]);
+            $driver = &Turba_Driver::singleton($parts[0]);
             if (is_a($driver, 'PEAR_Error')) {
-                return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $cfgSources[$path]);
+                return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $cfgSources[$parts]);
             }
-            
-            $contact = &$driver->getObject($path[1]);
+
+            $contact = &$driver->getObject($parts[1]);
             if (is_a($contact, 'PEAR_Error')) {
                 return $contact;
             }
 
-            $data = _turba_export($contact->getValue('__uid'), 'text/x-vcard', $contact->getSource());
+            $result = array('data' => _turba_export($contact->getValue('__uid'), 'text/x-vcard', $contact->getSource()),
+                            'mimetype' => 'text/x-vcard');
+            $modified = _modified($contact->getValue('__uid'));
+            if (!empty($modified)) {
+                $result['mtime'] = $modified;
+            }
+            return $result;
         }
     }
 
@@ -286,8 +389,38 @@
  *
  * @return array  An array of UIDs for all contacts the user can access.
  */
-function _turba_list()
+function _turba_list($source = '')
 {
+    require_once dirname(__FILE__) . '/base.php';
+
+    global $cfgSources;
+
+    // Get default address book from user preferences.
+    if (empty($source)) {
+        $source = $GLOBALS['prefs']->getValue('default_dir');
+    }
+
+    if (empty($source) || !isset($cfgSources[$source])) {
+        return PEAR::raiseError(_("Invalid address book"), 'horde.error', null, null, $source);
+    }
+
+    $storage = &Turba_Driver::singleton($source);
+    if (is_a($storage, 'PEAR_Error')) {
+        return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
+    }
+
+    $results = $storage->search(array());
+
+    if (is_a($results, 'PEAR_Error')) {
+        return PEAR::raiseError(sprintf(_("Error searching the address book: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
+    }
+
+    $r = array();
+    foreach ($results->objects as $o) {
+        $r[] = $o->getValue('__uid');
+    }
+
+    return $r;
 }
 
 /**
@@ -296,21 +429,59 @@
  *
  * @param string  $action     The action to check for - add, modify, or delete.
  * @param integer $timestamp  The time to start the search.
+ * @param string  $source     The source for which to retrieve the history.
  *
  * @return array  An array of UIDs matching the action and time criteria.
  */
-function &_turba_listBy($action, $timestamp)
+function _turba_listBy($action, $timestamp, $source = '')
 {
+    global $prefs;
     require_once dirname(__FILE__) . '/base.php';
-    require_once 'Horde/History.php';
+
+    // Get default address book from user preferences.
+    if (empty($source)) {
+        $source = $prefs->getValue('default_dir');
+    }
+
+    if (empty($source) || !isset($cfgSources[$source])) {
+        return PEAR::raiseError(_("Invalid address book"), 'horde.error', null, null, $source);
+    }
 
     $history = &Horde_History::singleton();
-    $histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'turba');
+    $histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'turba:' . $source);
     if (is_a($histories, 'PEAR_Error')) {
         return $histories;
     }
 
-    return array_keys($histories);
+    // Strip leading turba:username:.
+    return preg_replace('/^([^:]*:){2}/', '', array_keys($histories));
+}
+
+/**
+ * Returns the timestamp of an operation for a given uid an action.
+ *
+ * @param string $uid     The uid to look for.
+ * @param string $action  The action to check for - add, modify, or delete.
+ * @param string $source  The source for which to retrieve the history.
+ *
+ * @return integer  The timestamp for this action.
+ */
+function _turba_getActionTimestamp($uid, $action, $source = '')
+{
+    global $prefs;
+    require_once dirname(__FILE__) . '/base.php';
+    $history = &Horde_History::singleton();
+
+    // Get default address book from user preferences.
+    if (empty($source)) {
+        $source = $prefs->getValue('default_dir');
+    }
+
+    if (empty($source) || !isset($cfgSources[$source])) {
+        return PEAR::raiseError(_("Invalid address book"), 'horde.error', null, null, $source);
+    }
+
+    return $history->getActionTimestamp('turba:' . $source . ':' . $uid, $action);
 }
 
 /**
@@ -319,7 +490,7 @@
  * @param string $content      The content of the contact.
  * @param string $contentType  What format is the data in? Currently supports
  *                             array and text/x-vcard.
- * @param string $sourcet      The source into which the contact will be
+ * @param string $source       The source into which the contact will be
  *                             imported.
  *
  * @return string  The new UID, or false on failure.
@@ -327,16 +498,24 @@
 function _turba_import($content, $contentType = 'array', $source = '')
 {
     require_once dirname(__FILE__) . '/base.php';
-    global $cfgSources;
+    global $cfgSources, $prefs;
 
-    /* Check existance of and permissions on the specified source. */
-    if (!isset($cfgSources) || !is_array($cfgSources) || !count($cfgSources) || !isset($cfgSources[$source])) {
+    // Get default address book from user preferences.
+    if (empty($source)) {
+        $source = $prefs->getValue('default_dir');
+    }
+
+    // Check existance of and permissions on the specified source.
+    if (!isset($cfgSources[$source])) {
         return PEAR::raiseError(_("Invalid address book"), 'horde.warning');
     }
 
-    if ($cfgSources[$source]['readonly']
-        && (!isset($cfgSources[$source]['admin'])
-        || !in_array(Auth::getAuth(), $cfgSources[$source]['admin']))) {
+    $driver = &Turba_Driver::singleton($source);
+    if (is_a($driver, 'PEAR_Error')) {
+        return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
+    }
+
+    if (!$driver->hasPermission(PERMS_EDIT)) {
         return PEAR::raiseError(_("Permission Denied"), 'horde.error', null, null, $source);
     }
 
@@ -362,8 +541,15 @@
             default:
                 $ids = array();
                 foreach ($iCal->getComponents() as $c) {
-                    if (is_a($content, 'Horde_iCalendar_vcard')) {
-                        $result = _turba_import($content, $contentType, $source);
+                    if (is_a($c, 'Horde_iCalendar_vcard')) {
+                        $content = $driver->toHash($c);
+                        $result = $driver->search($content);
+                        if (is_a($result, 'PEAR_Error')) {
+                            return $result;
+                        } elseif ($result->count() > 0) {
+                            continue;
+                        }
+                        $result = $driver->add($content);
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
@@ -375,15 +561,10 @@
             break;
 
         default:
-            return PEAR::raiseError(_("Invalid Content-Type"));
+            return PEAR::raiseError(sprintf(_("Unsupported Content-Type: %s"), $contentType));
         }
     }
 
-    $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
-    if (is_a($driver, 'PEAR_Error')) {
-        return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
-    }
-
     if (is_a($content, 'Horde_iCalendar_vcard')) {
         $content = $driver->toHash($content);
     }
@@ -401,59 +582,72 @@
     }
 
     $object = &$driver->getObject($result);
-    return $object->getValue('__uid');
+    return is_a($object, 'PEAR_Error') ? $object : $object->getValue('__uid');
 }
 
 /**
  * Export a contact, identified by UID, in the requested contentType.
  *
- * @param string $uid          Identify the contact to export.
- * @param string $contentType  What format should the data be in? Currently
- *                             supports text/x-vcard.
+ * @param string $uid         Identify the contact to export.
+ * @param mixed $contentType  What format should the data be in?
+ *                            Either a string with one of:
+ *                            <pre>
+ *                             text/x-vcard
+ *                            </pre>
+ *                            or an array with options:
+ *                            <pre>
+ *                             'ContentType':  as above
+ *                             'ENCODING': (optional) character encoding
+ *                                         for strings fields
+ *                             'CHARSET':  (optional) charset. Like UTF-8
+ *                             'VERSION':  (optional) Format version (ex. iCalendar 2.0, vCalendar 1.0).
+ *                            </pre>
  *
  * @return string  The requested data.
  */
-function _turba_export($uid, $contentType)
+function _turba_export($uid, $contentType, $source = '')
 {
     require_once dirname(__FILE__) . '/base.php';
-    global $cfgSources;
+    global $cfgSources, $prefs;
 
+    $version = '2.1';
     if (is_array($contentType)) {
         $options = $contentType;
         $contentType = $options['ContentType'];
         unset($options['ContentType']);
+        if (isset($options['VERSION'])) {
+            $version = $options['VERSION'];
+            unset($options['VERSION']);
+        }
     } else {
         $options = array();
     }
 
-    // Need to reference some sort of mapping here to turn the UID
-    // into a source id and contact id:
-    //
-    // $source = $uid['addressbook'];
-    // $objectId = $uid['contactId'];
-    return PEAR::raiseError('Turba needs a UID map');
+    // Get default address book from user preferences.
+    if (empty($source)) {
+        $source = $prefs->getValue('default_dir');
+    }
 
     if (empty($source) || !isset($cfgSources[$source])) {
         return PEAR::raiseError(_("Invalid address book"), 'horde.error', null, null, $source);
     }
 
-    if (empty($objectId)) {
+    if (empty($uid)) {
         return PEAR::raiseError(_("Invalid ID"), 'horde.error', null, null, $source);
     }
 
-    if ($cfgSources[$source]['readonly']
-        && (!isset($cfgSources[$source]['admin'])
-            || !in_array(Auth::getAuth(), $cfgSources[$source]['admin']))) {
+    $driver = &Turba_Driver::singleton($source);
+    if (is_a($driver, 'PEAR_Error')) {
+        return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
+    }
+
+    if (!$driver->hasPermission(PERMS_EDIT)) {
         return PEAR::raiseError(_("Permission Denied"), 'horde.error', null, null, $source);
     }
 
     // If the objectId isn't in $source in the first place, just return
     // true. Otherwise, try to delete it and return success or failure.
-    $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
-    if (is_a($driver, 'PEAR_Error')) {
-        return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
-    }
-    $result = $driver->search(array('__key' => $objectId));
+    $result = $driver->search(array('__uid' => $uid));
     if (is_a($result, 'PEAR_Error')) {
         return $result;
     } elseif ($result->count() == 0) {
@@ -486,7 +680,7 @@
         return $export;
 
     default:
-        return PEAR::raiseError(_("Unsupported Content-Type."));
+        return PEAR::raiseError(sprintf(_("Unsupported Content-Type: %s"), $contentType));
     }
 }
 
@@ -498,13 +692,13 @@
  *
  * @return boolean  Success or failure.
  */
-function _turba_delete($uid)
+function _turba_delete($uid, $source = '')
 {
-    // Handle an arrray of UIDs for convenience of deleting multiple contacts
+    // Handle an array of UIDs for convenience of deleting multiple contacts
     // at once.
     if (is_array($uid)) {
         foreach ($uid as $g) {
-            $result = _turba_delete($uid);
+            $result = _turba_delete($uid, $source);
             if (is_a($result, 'PEAR_Error')) {
                 return $result;
             }
@@ -514,42 +708,41 @@
     }
 
     require_once dirname(__FILE__) . '/base.php';
-    global $cfgSources;
+    global $cfgSources, $prefs;
 
-    // Need to reference some sort of mapping here to turn the UID into a
-    // source id and contact id:
-    //
-    // $source = $uid['addressbook'];
-    // $objectId = $uid['contactId'];
-    return PEAR::raiseError('Turba needs a UID map');
+    // Get default address book from user preferences.
+    if (empty($source)) {
+        $source = $prefs->getValue('default_dir');
+    }
 
     if (empty($source) || !isset($cfgSources[$source])) {
         return PEAR::raiseError(_("Invalid address book"), 'horde.error', null, null, $source);
     }
 
-    if (empty($objectId)) {
+    if (empty($uid)) {
         return PEAR::raiseError(_("Invalid ID"), 'horde.error', null, null, $source);
     }
 
-    if ($cfgSources[$source]['readonly']
-        && (!isset($cfgSources[$source]['admin'])
-            || !in_array(Auth::getAuth(), $cfgSources[$source]['admin']))) {
+    $driver = &Turba_Driver::singleton($source);
+    if (is_a($driver, 'PEAR_Error')) {
+        return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
+    }
+
+    if (!$driver->hasPermission(PERMS_EDIT)) {
         return PEAR::raiseError(_("Permission Denied"), 'horde.error', null, null, $source);
     }
 
     // If the objectId isn't in $source in the first place, just return
     // true. Otherwise, try to delete it and return success or failure.
-    $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
-    if (is_a($driver, 'PEAR_Error')) {
-        return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
-    }
-    $result = $driver->search(array('__key' => $objectId));
+    $result = $driver->search(array('__uid' => $uid));
     if (is_a($result, 'PEAR_Error')) {
         return $result;
     } elseif ($result->count() == 0) {
         return true;
     } else {
-        return $driver->delete($objectId);
+        // We need to delete by uid rather than by key, so use _delete instead
+        // of delete.
+        return $driver->_delete($driver->toDriver('__uid'), $uid);
     }
 }
 
@@ -564,44 +757,66 @@
  *
  * @return boolean  Success or failure.
  */
-function _turba_replace($uid, $content, $contentType)
+function _turba_replace($uid, $content, $contentType, $source = '')
 {
     require_once dirname(__FILE__) . '/base.php';
-    global $cfgSources;
+    global $cfgSources, $prefs;
 
-    // Need to reference some sort of mapping here to turn the UID into a
-    // source id and contact id:
-    //
-    // $source = $uid['addressbook'];
-    // $objectId = $uid['contactId'];
-    return PEAR::raiseError('Turba needs a UID map');
+    // Get default address book from user preferences.
+    if (empty($source)) {
+        $source = $prefs->getValue('default_dir');
+    }
 
     if (!isset($cfgSources) || !is_array($cfgSources) || !count($cfgSources) || !isset($cfgSources[$source])) {
         return PEAR::raiseError(_("Invalid address book"), 'horde.warning');
     }
 
-    if (empty($objectId)) {
+    if (empty($uid)) {
         return PEAR::raiseError(_("Invalid objectId"), 'horde.error', null, null, $source);
     }
 
-    /* Check permissions. */
-    $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+    // Check permissions.
+    $driver = &Turba_Driver::singleton($source);
     if (is_a($driver, 'PEAR_Error')) {
         return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
     }
-    $object = $driver->getObject($objectId);
-    if (is_a($object, 'PEAR_Error')) {
-        return $object;
-    } elseif (!Turba::hasPermission($object, 'object', PERMS_EDIT)) {
-        return PEAR::raiseError(_("Permission Denied"), 'horde.warning');
+    $result = $driver->search(array('__uid' => $uid));
+    if (is_a($result, 'PEAR_Error')) {
+        return $result;
+    } elseif (!$result->count()) {
+        return PEAR::raiseError(_("Object not found"), 'horde.error', null, null, $source);
+    } elseif ($result->count() > 1) {
+        return PEAR::raiseError("Internal Horde Error: multiple turba objects with same objectId.", 'horde.error', null, null, $source);
     }
+    $object = $result->objects[0];
 
     switch ($contentType) {
     case 'array':
         break;
 
+    case 'text/x-vcard':
+        require_once 'Horde/iCalendar.php';
+        $iCal = &new Horde_iCalendar();
+        if (!$iCal->parsevCalendar($content)) {
+            return PEAR::raiseError(_("There was an error importing the iCalendar data."));
+        }
+
+        switch ($iCal->getComponentCount()) {
+        case 0:
+            return PEAR::raiseError(_("No vCard data was found."));
+
+        case 1:
+            $content = $iCal->getComponent(0);
+            $content = $driver->toHash($content);
+            break;
+
+        default:
+            return PEAR::raiseError(_("Only one vcard supported."));
+        }
+        break;
+
     default:
-        return PEAR::raiseError(_("Invalid Content-Type"));
+        return PEAR::raiseError(sprintf(_("Unsupported Content-Type: %s"), $contentType));
     }
 
     foreach ($content as $attribute => $value) {
@@ -616,27 +831,46 @@
 function _turba_search($names = array(), $sources = array(), $fields = array())
 {
     require_once dirname(__FILE__) . '/base.php';
-    global $cfgSources, $attributes;
+    global $cfgSources, $attributes, $prefs;
 
     if (!isset($cfgSources) || !is_array($cfgSources) || !count($cfgSources)) {
         return array();
     }
 
-    if (count($sources) == 0) {
+    if (!count($sources)) {
         $sources = array(key($cfgSources));
     }
 
+    // Read the columns to display from the preferences.
+    $sort_columns = Turba::getColumns();
+
     $results = array();
     $seen = array();
     foreach ($sources as $source) {
+        // Skip invalid sources.
         if (!isset($cfgSources[$source])) {
             continue;
         }
 
-        $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+        // Skip sources that aren't browseable if the search is empty.
+        if (!count($names) && empty($cfgSources[$source]['browse'])) {
+            continue;
+        }
+
+        $driver = &Turba_Driver::singleton($source);
         if (is_a($driver, 'PEAR_Error')) {
             return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
         }
+ 
+        // Determine the name of the column to sort by.
+        $columns = isset($sort_columns[$source])
+            ? $sort_columns[$source] : array();
+        $sortcolumn = ($prefs->getValue('sortby') == 0 ||
+                       !isset($sort_columns[$prefs->getValue('sortby') - 1]))
+            ? (($prefs->getValue('name_format') == 'first_last')
+               ? 'name'
+               : 'lastname')
+            : $sort_columns[$prefs->getValue('sortby') - 1];
 
         foreach ($names as $name) {
             $criteria = array();
@@ -648,7 +882,7 @@
             if (count($criteria) == 0) {
                 $criteria['name'] = trim($name);
             }
-            $res = $driver->search($criteria, 'lastname', 'OR');
+            $res = $driver->search($criteria, $sortcolumn, 'OR');
 
             if (!is_a($res, 'Turba_List')) {
                 continue;
@@ -677,7 +911,7 @@
                             }
                             $results[$name][] = array_merge($att,
                                                     array('id' => $att['__key'],
-                                                          'name' => $ob->getValue('name'),
+                                                          'name' => Turba::formatName($ob),
                                                           'email' => $email[$i],
                                                           '__type' => 'Object',
                                                           'source' => $source));
@@ -688,7 +922,7 @@
                         }
                         $results[$name][] = array_merge($att,
                                                 array('id' => $att['__key'],
-                                                      'name' => $ob->getValue('name'),
+                                                      'name' => Turba::formatName($ob),
                                                       'email' => null,
                                                       '__type' => 'Object',
                                                       'source' => $source));
@@ -717,7 +951,7 @@
                                     }
                                 }
                             }
-                                $results[$name][] = array('name' => $listatt['name'], 'email' => implode(', ', $emails), 'id' => $listatt['__key'], 'source' => $source);
+                            $results[$name][] = array('name' => $listatt['name'], 'email' => implode(', ', $emails), 'id' => $listatt['__key'], 'source' => $source);
                         }
                     }
                 }
@@ -738,7 +972,7 @@
     }
 
     if (isset($cfgSources[$source])) {
-        $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+        $driver = &Turba_Driver::singleton($source);
         if (is_a($driver, 'PEAR_Error')) {
             return $driver;
         }
@@ -749,7 +983,7 @@
         }
 
         /* Check permissions. */
-        if (!Turba::hasPermission($object, 'object', PERMS_READ)) {
+        if (!$object->hasPermission(PERMS_READ)) {
             return PEAR::raiseError(_("Permission Denied"), 'horde.error', null, null, $source);
         }
 
@@ -777,7 +1011,7 @@
     }
 
     if (isset($cfgSources[$source])) {
-        $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+        $driver = &Turba_Driver::singleton($source);
         if (is_a($driver, 'PEAR_Error')) {
             return $driver;
         }
@@ -789,7 +1023,7 @@
 
         foreach ($objects as $object) {
             /* Check permissions on this object. */
-            if (!Turba::hasPermission($object, 'object', PERMS_READ)) {
+            if (!$object->hasPermission(PERMS_READ)) {
                 continue;
             }
 
@@ -820,10 +1054,11 @@
     $results = array();
     foreach ($sources as $source) {
         if (isset($cfgSources[$source])) {
-            $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+            $driver = &Turba_Driver::singleton($source);
             if (is_a($driver, 'PEAR_Error')) {
                 return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
             }
+
             $res = $driver->search(array());
             if (!is_a($res, 'Turba_List')) {
                 return PEAR::raiseError(_("Search failed"), 'horde.error', null, null, $source);
@@ -907,16 +1142,15 @@
         return PEAR::raiseError(_("Invalid entry"), 'horde.error', null, null, $source);
     }
 
-    if ($cfgSources[$source]['readonly']
-        && (!isset($cfgSources[$source]['admin'])
-            || !in_array(Auth::getAuth(), $cfgSources[$source]['admin']))) {
-        return PEAR::raiseError(_("Permission Denied"), 'horde.error', null, null, $source);
-    }
-
-    $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+    $driver = &Turba_Driver::singleton($source);
     if (is_a($driver, 'PEAR_Error')) {
         return PEAR::raiseError(sprintf(_("Connection failed: %s"), $driver->getMessage()), 'horde.error', null, null, $source);
     }
+
+    if (!$driver->hasPermission(PERMS_EDIT)) {
+        return PEAR::raiseError(_("Permission Denied"), 'horde.error', null, null, $source);
+    }
+
     $res = $driver->search(array('email' => trim($address)), null, 'AND');
     if (is_a($res, 'PEAR_Error')) {
         return PEAR::raiseError(sprintf(_("Search failed: %s"), $res->getMessage()), 'horde.message', null, null, $source);
@@ -964,7 +1198,8 @@
     return;
 }
 
-function _turba_getField($address = '', $field = '', $sources = array())
+function _turba_getField($address = '', $field = '', $sources = array(),
+                         $strict = false)
 {
     require_once dirname(__FILE__) . '/base.php';
     global $cfgSources;
@@ -990,12 +1225,12 @@
             continue;
         }
 
-        $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+        $driver = &Turba_Driver::singleton($source);
         if (is_a($driver, 'PEAR_Error')) {
             continue;
         }
 
-        $list = $driver->search(array('email' => $address));
+        $list = $driver->search(array('email' => $address), null, 'AND', 0, array(), $strict ? array('email') : array());
         if (!is_a($list, 'Turba_List')) {
             continue;
         }
@@ -1038,7 +1273,7 @@
 
     foreach ($sources as $source) {
         if (isset($cfgSources[$source])) {
-            $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+            $driver = &Turba_Driver::singleton($source);
             if (is_a($driver, 'PEAR_Error')) {
                 continue;
             }


--- orig/po/lv_LV.po
+++ mod/po/lv_LV.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 1.1\n"
-"POT-Creation-Date: 2002-11-29 12:14+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-11-29 16:00+0200\n"
 "Last-Translator: Kaspars Kapenieks <kaspars at rcc.lv>\n"
 "Language-Team: Latvian <i18n at lists.horde.org>\n"
@@ -12,375 +13,1366 @@
 "Content-Type: text/plain; charset=CP1257\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "fails %s veiksmîgi ielâdçts"
 
-msgid "Add Contact ..."
-msgstr "Pievienot ..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "Pievienot jaunu"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Adresu grâmatu saraksts"
 
-msgid "Add failed"
-msgstr "Pievienot neizdevâs"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
+
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
 
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Pievienot"
 
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Nederîga adresu grâmata."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Nav rediìçjamu adresu grâmatu."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "pievienot kolonnu"
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "Pievienot neizdevâs"
+
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "Pievienot"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Adresu grâmatu saraksts"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Adresu grâmatu saraksts"
 
-msgid "Addressbook is read-only."
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Adresu grâmatu saraksts"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
 msgstr "Adresu grâmata pieejama tikai lasîðanai."
 
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "fails %s veiksmîgi ielâdçts"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Adresu grâmata pieejama tikai lasîðanai."
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Sareþìîtâ meklçðana"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Saîsinâjums"
 
-msgid "An illegal value was specified."
-msgstr "Norâdîta nederîga vçrtîba"
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
 
-msgid "Available Columns:"
-msgstr "Pieejamâs kolonnas:"
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
+
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "Meklçðana"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
 
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Pârlûkot"
 
-msgid "Cancel"
-msgstr "Atcelt"
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "Mobilais tâlrunis"
+#: data.php:49
+msgid "CSV"
+msgstr ""
 
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Izvçlieties kâdâ kârtîbâ kolonnas tiks parâdîtas adresu sarakstâ."
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
-msgid "Clear Search"
-msgstr "Notîrît"
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "Ðeit nav pârlûkojamu adresu grâmatu."
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Ðeit nav pârlûkojamu adresu grâmatu."
 
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr "Izvçlieties kâdâ kârtîbâ kolonnas tiks parâdîtas adresu sarakstâ."
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Kolonnu opcijas"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Organizâcija"
 
-#, c-format
-msgid "Contents of %s"
-msgstr "%s saturs"
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Mâjas adrese"
 
-msgid "Default Display"
-msgstr "Noklusçtais ekrâns"
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Izdzçst neizdevâs"
 
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "Izdzçst neizdevâs"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "Organizâcija"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Eksportçt adresu grâmatu"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
+
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Dzçst"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Eksportçt adresu grâmatu"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Izdzçst neizdevâs"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Izdzçst neizdevâs"
 
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "Lietotâja opcijas"
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Katalogs"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Ekrâna opcijas"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Ekrâna opcijas"
 
-#, c-format
-msgid "Edit '%s'"
-msgstr "Rediìçt '%s'"
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
 
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Rediìçt"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Rediìçt '%s'"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Eksportçt adresu grâmatu"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "E-pasts"
 
-msgid "Error"
-msgstr "Kïûda"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Export Addressbook"
-msgstr "Eksportçt adresu grâmatu"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "fails %s veiksmîgi ielâdçts"
 
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Nav rediìçjamu adresu grâmatu."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Eksportçt"
 
-msgid "Failed to access the specified address book."
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "Eksportçt adresu grâmatu"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
 msgstr "Neizdevâs piekïût norâdîtajai adresu grâmatai."
 
-#, c-format
-msgid "Failed to browse %s."
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
 msgstr "Neizdevâs %s pârlûkoðana."
 
-msgid "Failed to connect to the specified directory."
-msgstr "Neizdevâs pieslçgties norâdîtajam katalogam."
+#: browse.php:272
+#, fuzzy
+msgid "Failed to browse list"
+msgstr "Neizdevâs %s pârlûkoðana."
+
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
+msgstr "Neizdevâs meklçðana katalogâ: %s"
 
-#, c-format
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "Neizdevâs meklçðana katalogâ: %s"
+
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Neizdevâs piekïût norâdîtajai adresu grâmatai."
+
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Neizdevâs meklçðana katalogâ: %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fakss"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Virsraksts"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Meklçt"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Meklçt"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "No"
 
-msgid "Help"
-msgstr "Palîdzîba"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Eksportçt adresu grâmatu"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
 
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Mâjas adrese"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "Mâjas telefons"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Mâjas telefons"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "Vai importçjamajos CSV failos pirmâ rinda satur lauku nosaukumus?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Mâjas telefons"
 
-msgid "Illegal or malformed form data."
-msgstr "Nederîgi formas dati."
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "Mâjas telefons"
 
-msgid "Import Addressbook"
-msgstr "Importçt adresu grâmatu"
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Mâjas adrese"
+
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
+
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Adresu grâmatu saraksts"
 
-msgid "Import"
-msgstr "Importçt"
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Importçt adresu grâmatu"
 
-msgid "Import/Export Addressbooks"
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "Importçt/Eksportçt adresu grâmatas"
 
-msgid "Import/Export"
-msgstr "Importçt/Eksportçt"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Nederîgs vârds."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "Nederîga adresu grâmata."
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "Nederîga e-pasta adrese."
 
-msgid "Invalid name."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
 msgstr "Nederîgs vârds."
 
-msgid "Language"
-msgstr "Valoda"
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "Norâdîta nederîga vçrtîba"
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "Nederîgs vârds."
+
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "Nederîgs vârds."
 
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Vârds"
+
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Saraksts"
 
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Atbilstoðs"
 
-msgid "Message"
-msgstr "Vçstule"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Saraksts"
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "Meklçðana"
 
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Mâjas telefons"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "pârvietot pa kreisi"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "pârvietot pa labi"
+
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "Eksportçt adresu grâmatu"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Adresu grâmatu saraksts"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Adresu grâmatu saraksts"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Vârds"
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+#: config/prefs.php.dist:31
+msgid "Name Format"
 msgstr ""
-"Nevienâ no norâdîtajâm adresu grâmatâm nav iespçjams pievienot ierakstus."
 
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "Pievienot jaunu"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Vârds"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
+
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "Adresu grâmata pieejama tikai lasîðanai."
+
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "Piezîmes"
+
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Piezîmes"
 
-msgid "Options"
-msgstr "Opcijas"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
 
-msgid "Please choose an address book to add a contact to."
-msgstr "Lûdzu izvçlieties adresu grâmatu, kurai pievienot ierakstus."
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
+
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
-msgid "Please select a directory:"
-msgstr "Lûdzu izvçvieties katalogu:"
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
 
-msgid "Problem?"
-msgstr "Problçma?"
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "Lietotâja opcijas"
 
-msgid "Reset"
-msgstr "Dzçst visus"
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
 
-msgid "Save Changes"
-msgstr "Saglabât izmaiòas"
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "Adresu grâmatu saraksts"
+
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
+
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
+
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Eksportçt adresu grâmatu"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Meklçðana"
 
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Importçt adresu grâmatu"
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "izdzçst kolonnu"
+
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Saglabât"
 
-msgid "Search Results"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "Meklçðana"
+
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Meklçðanas rezultâti"
 
-msgid "Search"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
 msgstr "Meklçðana"
 
-msgid "Search&nbsp;Results"
-msgstr "Meklçðanas&nbsp;rezultâti"
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
 
-msgid "Select the destination to import to:"
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "Meklçðana"
+
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Lûdzu izvçlieties adresu grâmatu, kurai pievienot ierakstus."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Lûdzu izvçlieties adresu grâmatu, kurai pievienot ierakstus."
+
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Izvçlieties avotu, no kura importçt:"
+
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "Izvçlieties kur importçt:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Izvçlieties avotu, no kura importçt:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "Izvçlieties avotu, no kura importçt:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Izvçlieties failu, ko importçt:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "Izvçlieties kâdâ formâtâ eksportçt:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "Izvçlieties kâdâ formâtâ importçt:"
 
-msgid "Select the source to export from:"
-msgstr "Izvçlieties avotu, no kura importçt:"
-
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Izvçlieties skatu, ko parâdît noklusçti."
 
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Izvçlieties kurus laukus râdît adresu sarakstos."
 
-msgid "Select your preferred language:"
-msgstr "Izvçlieties valodu:"
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "Izvçlieties kurus laukus râdît adresu sarakstos."
 
-msgid "Selected Columns:"
-msgstr "Izvçlieties kolonnas:"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "Nederîga adresu grâmata."
+
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Katalogs"
+
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
+
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr ""
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "Nosûtît pastu uz %s"
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr ""
 
-msgid "Set your preferred display language."
-msgstr "Izvçlieties ekrâna valodu."
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Trûkst daþi no Turbas konfigurâcijas failiem:"
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "Katalogs"
 
-msgid "Success"
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
 msgstr "Veiksme"
 
-msgid "The data got lost"
-msgstr "Dati tika zaudçti"
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
 
-msgid "The data got lost."
-msgstr "Dati tika zaudçti."
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
 
-msgid "The file contained no data."
-msgstr "Failâ nebija datu."
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
 
-msgid "There are no browseable address books."
-msgstr "Ðeit nav pârlûkojamu adresu grâmatu."
+#: data.php:50
+msgid "TSV"
+msgstr ""
 
-#, c-format
-msgid "There are no entries in %s."
-msgstr "%s nav ierakstu."
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
 
-msgid "There are no writeable address books."
-msgstr "Nav rediìçjamu adresu grâmatu."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
+
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
 msgstr ""
-"Problçma ar faila ielâdi. Iespçjams, ka fails ir lielâks par maksimâli pieïaujamo "
-"izmçru."
 
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "fails %s veiksmîgi ielâdçts"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
+msgid "There are no browseable address books."
+msgstr "Ðeit nav pârlûkojamu adresu grâmatu."
+
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
-msgstr "Kïûda pievienojot objektu. Sazinieties ar sistçmas administratoru."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
+msgstr ""
+"Nevienâ no norâdîtajâm adresu grâmatâm nav iespçjams pievienot ierakstus."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error deleting this object. Contact your system administrator "
+"There was an error adding the new contact. Contact your system administrator "
 "for further help."
-msgstr "Kïûda dzçðot objektu. Sazinieties ar sistçmas administratoru."
+msgstr "Kïûda pievienojot objektu. Sazinieties ar sistçmas administratoru."
+
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Kïûda importçjot datus."
 
-msgid "There was an error importing the data."
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
 msgstr "Kïûda importçjot datus."
 
-msgid "There was an error importing the uploaded file"
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
 msgstr "Kïûda importçjot ielâdçto failu"
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
-msgstr "Ðis fails kontrolç noklusçtos iestatîjumus"
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Kïûda importçjot ielâdçto failu"
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr "Ðis fails kontrolç stilus."
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Kïûda importçjot datus."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
-msgstr "Ðis fails definç globâlos atribûtu vârdus."
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "Kïûda importçjot datus."
+
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "Kïûda importçjot datus."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "Ðis fails definç pieejamos avotus."
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "Kïûda importçjot datus."
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
-msgstr "Ðis ir galvenais konfigurâcijas fails."
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "Kïûda importçjot datus."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Kïûda importçjot datus."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Kïûda importçjot ielâdçto failu"
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Kïûda importçjot ielâdçto failu"
+
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "Kïûda importçjot datus."
+
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Nav rediìçjamu adresu grâmatu."
 
-msgid "This number must be at least one."
-msgstr "Ðim skaitlim jâbût vismaz viens"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
 
-msgid "This person is already in your addressbook."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
+
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "Ðî persona jau ir jûsu adresu grâmatâ."
 
-msgid "This value must be a number."
-msgstr "Ðai vçrtîbai ir jâbut skaitlim."
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Virsraksts"
 
-msgid "Turba is not properly configured"
-msgstr "Turba nav korekti nokonfigurçta"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Nevar ielâdçt %s definîciju."
 
-msgid "User Options"
-msgstr "Lietotâja opcijas"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "Saglabât izmaiòas"
+
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Katalogs"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "Pievienot jaunu"
 
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Skatîjums, ko parâdît pçc noklusçðanas:"
 
-msgid "Warning"
-msgstr "Brîdinâjums"
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
 
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Darba adrese"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "Darba telefons"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Darba telefons"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Darba telefons"
+
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "Darba telefons"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Darba adrese"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
 msgstr ""
-"Nav norâdîta importçtâ faila lauku atbilstîba adresu grâmatas laukiem."
 
-msgid "Your Information"
-msgstr "Jûsu informâcija"
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Jûsu opcijas ir saglabâtas."
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
 
-msgid "[Edit]"
-msgstr "[Rediìçt]"
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
 
-msgid "add column"
-msgstr "pievienot kolonnu"
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
 
-msgid "move left"
-msgstr "pârvietot pa kreisi"
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
 
-msgid "move right"
-msgstr "pârvietot pa labi"
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
 
-msgid "remove column"
-msgstr "izdzçst kolonnu"
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "Pârlûkot"
+
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "Dzçst"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "Importçt/Eksportçt"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Saraksts"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Adresu grâmatu saraksts"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Pievienot jaunu"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "Meklçðana"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "Eksportçt adresu grâmatu"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/templates/browse/header.inc
+++ mod/templates/browse/header.inc
@@ -1 +1,3 @@
-<div class="header"><?php echo htmlspecialchars($title) ?></div>
+<h1 class="header">
+ <?php echo htmlspecialchars($title) ?>
+</h1>


--- orig/docs/UPGRADING
+++ mod/docs/UPGRADING
@@ -1,12 +1,56 @@
 ========================
- Upgrading to Turba 2.0
+ Upgrading to Turba 2.x
 ========================
 
-:Last update:   $Date: 2005/04/13 15:21:47 $
-:Revision:      $Revision: 1.3.6.1 $
+:Last update:   $Date: 2005/10/18 12:50:04 $
+:Revision:      $Revision: 1.3.6.2 $
 :Contact:       turba at lists.horde.org
 
 
+Upgrading to Turba 2.1
+======================
+
+
+These are notes on upgrading from Turba 2.0.x to Turba 2.1.
+
+.. Important:: These upgrade instructions assume that you are upgrading from
+               at least Turba 2.0.  If you have an older version of Turba,
+               follow the 'upgrade steps'_ described in Turba 1.2, 2.0 or
+               higher first.
+
+
+New Hook Parameters
+-------------------
+
+The _turba_hook_encode_{attribute} and _turba_hook_decode_{attribute}
+functions are now passed an additional parameter - the object that is
+being loaded/saved. This enables you to create more powerful custom
+hooks that build a field from several other field's values (the
+opposite of composite fields), or otherwise modify a value based on
+other properties of the object.
+
+
+Horde_Share Support
+-------------------
+
+Horde_Share support has been added to Turba.  This allows the sharing, adding,
+and deleting of addressbooks for those sources that support it.  Currently,
+this is supported by the SQL driver.  With this change, the 'public' attribute
+of the params array has been removed in favor of the 'use_share' attribute.
+If you are currently using a SQL source as a public source, you must run the
+upgrade script scripts/upgrades/public_to_horde_share.php.  Be sure to read
+the script comments and backup all data before conversion.  This script will
+create a new Horde_Share that is viewable by all users.  If you choose not to
+use Horde_Share, set the 'use_shares' attribute to 'false' and the SQL driver
+will behave as in previous versions, that is, a seperate, private addressbook
+for each user.
+
+
+
+Upgrading to Turba 2.0
+======================
+
+
 These are instructions to upgrade from Turba 1.2.x to Turba 2.0.  Please
 backup your existing data before running any of the steps described below.
 You can't use the updated data with your old Turba version anymore.
@@ -20,7 +64,7 @@
 
 
 SQL Backends
-============
+------------
 
 Four new fields have been added to the default SQL table layout, one being
 mandatory.  The new ``object_uid`` field provides a global unique ID to
@@ -33,7 +77,7 @@
 
 
 History
-=======
+-------
 
 The contacts history is now being maintained by the global Horde History
 backend.  To create default history entries execute the provided PHP script::


--- orig/po/cs_CZ.po
+++ mod/po/cs_CZ.po
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba 2.0-cvs\n"
+"Project-Id-Version: Turba 2.0.2\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2004-12-22 10:04-0800\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date:  2001-07-26 14:56-0700\n"
-"Last-Translator: Pavel Chytil <pavel at chytil.tk>\n"
+"Last-Translator: Milos Wimmer <wimmer at zcu.cz>\n"
 "Language-Team: Czech <dev at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -17,299 +17,384 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Pine adresáø"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "do vybraného adresáøe"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, fuzzy, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "'%s' nebyl zkopírován, proto¾e je to seznam."
+
+#: browse.php:124
+#, fuzzy, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "'%s' nebyl pøesunut, proto¾e je to seznam."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
-msgstr "\"Jmìno Pøíjmení\" (napø. Josef Novák)"
+msgstr "\"Jméno pøíjmení\" (napø. Josef Novák)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
-msgstr "\"Pøíjmení, Jmìno\" (napø. Novák, Josef) "
+msgstr "\"Pøíjmení, jméno\" (napø. Novák, Josef) "
 
-#: add.php:95
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s pøidán."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "%s soubor byl úspì¹nì importován"
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "%s a¾ %s z %s"
 
-#: browse.php:146
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s' nebyl zkopírován, jeliko¾ je to seznam."
-
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s' nebyl pøesunut jeliko¾ je to seznam."
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Pine adresáø"
 
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
-msgstr "Je nutné pou¾ití prohlí¾eèe podporující iFrames."
+msgstr "Je nutné pou¾ít prohlí¾eè podporující iFrames."
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
 msgstr "Vý¹e uvedený formuláø pro vyhledávání"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Hl_edat Dùkladnìji"
+#: view.php:52
+#, fuzzy, php-format
+msgid "Access denied to %s"
+msgstr "Úspì¹nì pøidáno %s do %s"
+
+#: add.php:56 templates/browse/actions.inc:22
+msgid "Add"
+msgstr "Pøidat"
+
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Neplatný adresáø"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Vybraný adresáø '%s'."
 
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Pøidat sloupec"
 
-#: templates/browse/actions.inc:33
+#: edit.php:128
+msgid "Add file"
+msgstr ""
+
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "Pøidat do"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Pine adresáø"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
-msgstr "Výpis Kontaktù"
+msgstr "Výpis adresáøe"
 
-#: add.php:94
-msgid "Address book entry"
-msgstr "Polo¾ka Kontaktù"
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Pine adresáø"
 
-#: lib/Driver.php:494
-msgid "Address book is read-only."
-msgstr "Kontakty je pouze ke ètení."
+#: add.php:108
+msgid "Address book entry"
+msgstr "Polo¾ka adresáøe"
 
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
-msgstr "Kontakty byli úspì¹nì vyèistìny."
+msgstr "Adresáø byl úspì¹nì vyèistìný."
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Polo¾ka adresáøe"
+
+#: templates/prefs/addressbookselect.inc:170
+#, fuzzy
+msgid "Address books that will not be displayed:"
+msgstr "Nelze vyèistit adresáø: %s"
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
-msgstr "Hledat Dùkladnìji"
+msgstr "Pokroèilé vyhledávání"
 
 #: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "V¹e"
 
-#: lib/api.php:372
+#: lib/api.php:552
 msgid "Already Exists"
-msgstr "Ji¾ Existuje"
+msgstr "Ji¾ existuje"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Jste si jistí, ¾e chcete smazat %s?"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
-msgstr "Jste si jistí, ¾e chcete smazat vybráné polo¾ky?"
+msgstr "Jste si jistí, ¾e chcete smazat vybrané polo¾ky?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Vzestupnì"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Mo¾né Sloupce:"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Zpì_t na %s"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "Zpìt na %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Vyhl_edat"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
 msgstr "Vyhledat"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
-msgstr "Pod formuláøem pro hledání"
+msgstr "Pod formuláøem pro vyhledávání"
 
-#: lib/Driver/ldap.php:75 lib/Driver/ldap.php:78
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Spojení selhalo: (%s) %s"
 
-#: config/attributes.php.dist:168
+#: config/attributes.php.dist:178
 msgid "Birthday"
 msgstr "Narozeniny"
 
-#: config/attributes.php.dist:163
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "_Prohlí¾et"
+
+#: config/attributes.php.dist:173
 msgid "Business Category"
-msgstr "Obchodní Kategorie"
+msgstr "Obchodní kategorie"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "V_yèistit Vyhledané Polo¾ky"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
-msgstr "Vybrat _V¹e/®ádné"
+msgstr "Vybrat _v¹e/¾ádné"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Vyberte implicitní adresáø pro osobní kontakty, seznamy kontaktù a "
-"vyhledávání."
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "Vyberte adresáø"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
-msgstr "Vyberte kontakty"
+msgstr "Vyberte adresáø"
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Vyberte adresáø"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "Vyberte adresáø"
 
 #: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
 msgstr "Vyberte jak zobrazovat sloupce v seznamu adres."
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "Vyèistit Vyhledané Polo¾ky"
-
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
-msgstr "Mo¾nosti Sloupce"
+msgstr "Mo¾nosti sloupce"
+
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
 
-#: templates/data/export.inc:16 templates/data/import.inc:18
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Èárkou oddìlené hodnoty"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
-msgstr "Comma separated values (Microsoft Outlook)"
+msgstr "Èárkou oddìlené hodnoty (Microsoft Outlook)"
 
 #: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Firma"
 
-#: config/attributes.php.dist:134
+#: config/attributes.php.dist:144
 msgid "Company Address"
-msgstr "Adresa Firmy"
+msgstr "Adresa firmy"
 
-#: lib/api.php:611 lib/api.php:797
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Spojení selhalo: %s"
 
-#: lib/Driver/ldap.php:64
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
-msgstr "Spojení selhalo."
+msgstr "Spojení selhalo"
+
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "Kontakt byl odstranìn ze seznamu."
 
-#: browse.php:85
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "Kontakt byl odstranìn ze seznamu."
 
-#: browse.php:275
+#: browse.php:266
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Kontakty v seznamu: %s"
 
-#: browse.php:297
-#, php-format
-msgid "Contents of %s"
-msgstr "Obsahuje %s"
-
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:12
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: lib/ObjectView.php:134
-msgid "Created"
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
 msgstr "Vytvoøeno"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Implicintí Zobrazení"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Osobní adresáø"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
 msgstr ""
-"Implicitní adresáø pro osobní kontakty, seznamy kontaktù a vyhledávání."
 
-#: config/prefs.php.dist:72
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "Vytvoøeno"
+
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Implicitní smìr tøídìní:"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Smazat"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Vybrat adresáø"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
-msgstr "Potvrzení Smazání"
+msgstr "Potvrzení smazání"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Vlastnosti tlaèítka pro smazání"
 
-#: lib/Driver/ldap.php:267
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Smazaní selhalo: (%s) %s"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Smazaní selhalo"
 
-#: config/attributes.php.dist:203
+#: config/attributes.php.dist:213
 msgid "Department"
 msgstr "Oddìlìní"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Sestupnì"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
-msgstr "Kontakty"
+msgstr "Adresáø"
+
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Zobrazit mo¾nosti"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
-msgstr "Zobrazit Mo¾nosti"
+msgstr "Zobrazit mo¾nosti"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
 msgstr "Chcete potvrdit smazání polo¾ek?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
+msgstr "Stahnout vCard"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
-msgstr "Download vCard"
+msgstr "Stahnout vCard"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Upravit"
 
-#: templates/browse/contactrow.inc:33
-#, php-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "Upravit '%s'"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Exportovat adresáø"
+
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Upravit polo¾ku pro %s"
@@ -318,540 +403,651 @@
 msgid "Email"
 msgstr "Email"
 
-#: edit.php:79
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
-msgstr "Polo¾ky pro %s byli aktualizovány."
+msgstr "Polo¾ky pro %s byly aktualizovány."
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s soubor byl úspì¹nì importován"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Nelze pøistoupit k adresáøi: %s"
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportovat"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
-msgstr "Exportovat Kontakty"
+msgstr "Exportovat adresáø"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Exportovat pouze vybrané kontakty."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
-msgstr "Exportovat v¹echny kontakty."
+msgstr "Kompletnì exportovat následující adresáø."
 
-#: browse.php:62 browse.php:120 browse.php:135 add.php:71 data.php:110
-#: data.php:228 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
-msgstr "Nelze pøistoupit ke kontaktùm: %s"
+msgstr "Nelze pøistoupit k adresáøi: %s"
 
-#: browse.php:154
+#: browse.php:139
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Selhalo pøidání %s do %s: %s"
 
-#: browse.php:280
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "Nelze prohlédnout seznam"
 
-#: browse.php:311
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "Nelze prohlédnout adresáø"
 
-#: lib/Driver/ldap.php:305
+#: lib/Driver/ldap.php:309
 #, php-format
-msgid "Failed to change name: (%s) %s, %s"
-msgstr "Selhala zmìna jména: (%s) %s, %s"
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr "Selhala zmìna jména: (%s) %s; staré DN = %s, nové DN = %s, Root = %s"
 
-#: browse.php:140
+#: browse.php:120
 #, php-format
 msgid "Failed to find object to be added: %s"
-msgstr "Nelze nalést objekt k pøidání: %s"
+msgstr "Nelze nalézt objekt k pøidání: %s"
+
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Nelze pøistoupit k adresáøi: %s"
 
-#: data.php:124 search.php:85
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
-msgstr "Nemù¾e prohledat kontakty: %s"
+msgstr "Nelze prohledat kontakty: %s"
 
-#: config/attributes.php.dist:157
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Titul"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Hledat"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Hledat"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Jméno"
 
-#: config/attributes.php.dist:192
+#: config/attributes.php.dist:202
 msgid "Freebusy URL"
 msgstr "Free/Busy URL"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Od"
 
-#: config/sources.php.dist:521
+#: config/sources.php.dist:604
 msgid "Global Address Book"
-msgstr "Globální Kontakty"
+msgstr "Globální adresáø"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Skupina"
 
 #: config/attributes.php.dist:82
 msgid "Home Address"
-msgstr "Adresa Domù"
+msgstr "Adresa domù"
 
-#: config/attributes.php.dist:88
+#: config/attributes.php.dist:93
 msgid "Home City"
-msgstr "Domácí Mìsto"
+msgstr "Mìsto adresy domù"
 
-#: config/attributes.php.dist:103
+#: config/attributes.php.dist:108
 msgid "Home Country"
-msgstr "Domácí Zemì"
+msgstr "Zemì adresy domù"
 
-#: config/attributes.php.dist:140
+#: config/attributes.php.dist:150
 msgid "Home Phone"
-msgstr "Telefon Domù"
+msgstr "Telefon domù"
 
-#: config/attributes.php.dist:98
+#: config/attributes.php.dist:103
 msgid "Home Postal Code"
-msgstr "Smìrovací Èíslo Domù"
+msgstr "PSÈ domù"
 
-#: config/attributes.php.dist:93
+#: config/attributes.php.dist:98
 msgid "Home State/Province"
-msgstr "Stát/Provincie Domù"
+msgstr "Stát/provincie adresy domù"
+
+#: config/attributes.php.dist:88
+msgid "Home Street Address"
+msgstr "Ulice adresy domù"
 
-#: config/sources.php.dist:457
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Výpis adresáøe"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
-msgstr "Importovat Kontakty, Krok %d"
+msgstr "Importovat adresáø, krok %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
-msgstr "Importovat/Exportovat Kontakty"
-
-#: lib/api.php:358 lib/api.php:577
-msgid "Invalid Content-Type"
-msgstr "Neplatný Typ Obsahu (Content-Type)"
+msgstr "Importovat/exportovat adresáøe"
 
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:596 lib/api.php:683
 msgid "Invalid ID"
 msgstr "Neplatné ID"
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:868
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
-msgstr "Neplatné kontakty"
+msgstr "Neplatný adresáø"
 
-#: lib/api.php:872 lib/api.php:943 lib/api.php:995
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
 msgstr "Neplatný email"
 
-#: lib/api.php:880
+#: lib/api.php:1089
 msgid "Invalid entry"
 msgstr "Neplatná polo¾ka"
 
-#: lib/Driver/ldap.php:263
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Byl poskytnut neplatný klíè."
 
-#: lib/api.php:876
+#: lib/api.php:1085
 msgid "Invalid name"
 msgstr "Neplatné jméno"
 
-#: lib/api.php:560
+#: lib/api.php:735
 msgid "Invalid objectId"
 msgstr "Neplatné ID objektu"
 
-#: lib/Driver/ldap.php:39
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
-msgstr "Je potøeba LDAPu, ale tento modul není dostupný nebo instalovaný."
+msgstr "Je vy¾adován LDAP, ale tento modul není dostupný nebo instalovaný."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
-msgstr "Naposledy Zmìnìno"
+msgstr "Naposledy zmìnìno"
 
 #: config/attributes.php.dist:53
 msgid "Last Name"
 msgstr "Pøíjmení"
 
-#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Seznam"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Shodující se s"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "Maximální poèet stránek"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
-msgstr "Maximální poèet stran"
+msgstr "Maximální poèet stránek"
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Nový seznam"
 
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
-msgstr "Malé Vyhledávání"
+msgstr "Malé vyhledávání"
 
-#: lib/Driver/ldap.php:299
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "Chybìjící DN u konfigurace zdroje LDAP."
 
-#: config/attributes.php.dist:152
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
-msgstr "Mobilní Telefon"
+msgstr "Mobilní telefon"
 
-#: lib/Driver/ldap.php:327 lib/Driver/ldap.php:344
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Selhala úprava: (%s) %s"
 
-#: lib/api.php:981
+#: lib/api.php:1193
 msgid "More than 1 entry found"
 msgstr "Byla nalezena více ne¾ 1 polo¾ka"
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:11
 msgid "Move"
-msgstr "Posunout"
+msgstr "Pøesunout"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
-msgstr "Posunout vlevo"
+msgstr "Pøesunout vlevo"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
-msgstr "Posunout vpravo"
+msgstr "Pøesunout vpravo"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
-msgstr "Mulberry Kontakty"
+msgstr "Mulberry adresáø"
 
-#: lib/api.php:902
+#: lib/api.php:1113
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
-msgstr "Více osob s adresou [%s], ale nikdo neexistuje se jménem [%s]"
+msgstr "Více osob s adresou [%s], ale se jménem [%s] neexistuje nikdo"
 
-#: config/sources.php.dist:165 config/sources.php.dist:294
-msgid "My Addressbook"
-msgstr "Kontakty"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Adresáø"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Adresáø"
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Jméno"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Formát jména"
 
-#: config/sources.php.dist:72
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter Member Directory"
 
-#: add.php:45 add.php:111 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
-msgstr "Nový Kontakt"
-
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "Nový Seznam"
+msgstr "Nový kontakt"
 
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
 msgstr "Dal¹í"
 
-#: config/attributes.php.dist:208
+#: config/attributes.php.dist:218
 msgid "Nickname"
-msgstr "Pøezdívka/Alias"
+msgstr "Pøezdívka/alias"
 
-#: lib/api.php:983 lib/api.php:1032
+#: lib/api.php:1195 lib/api.php:1244
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "®ádná polo¾ka %s nebyla nalezena pro %s"
 
-#: lib/api.php:952
+#: lib/api.php:1163
 msgid "No address books found."
-msgstr "Nebyly nalezeny ¾ádné kontakty."
+msgstr "Nebyl nalezen ¾ádný adresáø."
 
-#: minisearch.php:85
+#: minisearch.php:83
 msgid "No contacts found"
 msgstr "Nebyly nalezeny ¾ádné kontakty."
 
-#: lib/api.php:338
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
-msgstr "Nebyly nalezeny ¾ádné vCard data."
+msgstr "Nebyly nalezeny ¾ádná vCard data."
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "®ádný"
 
-#: config/attributes.php.dist:174
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Poznámka"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Poèet polo¾ek na stránku"
 
-#: lib/api.php:436
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
 msgstr "Objekt nebyl nalezen"
 
-#: config/attributes.php.dist:213
+#: config/attributes.php.dist:223
 msgid "Office"
 msgstr "Kanceláø"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
-msgstr "Dal¹í Mo¾nosti"
+msgstr "Dal¹í mo¾nosti"
 
-#: config/attributes.php.dist:180
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
-msgstr "Veøejný PGP Klíè"
+msgstr "Veøejný PGP klíè"
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:725 lib/api.php:886
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
-msgstr "Nepovolený Pøístup"
+msgstr "Nepovolený pøístup"
 
-#: lib/Driver.php:452
+#: lib/Driver.php:543
 msgid "Permission denied"
 msgstr "Nepovolený pøístup"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "Nepovolený pøístup"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
-msgstr "Pine Kontakty"
+msgstr "Pine adresáø"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
 msgstr "Prosím zadejte jméno nového seznamu:"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Prosim vyberte adresáø:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-#: config/sources.php.dist:373
+#: config/sources.php.dist:416
 msgid "Private Address Book"
-msgstr "Osobní Kontakty"
+msgstr "Osobní adresáø"
 
-#: lib/Driver/ldap.php:139
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
-msgstr "Vyhledání selhalo: (%s) %s"
+msgstr "Vyhledávání selhalo: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
-msgstr "Rychlé Vyhledávání"
+msgstr "Rychlé vyhledávání"
 
-#: lib/Driver/ldap.php:183 lib/Driver/ldap.php:191 lib/Driver/ldap.php:424
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Ètení selhalo: (%s) %s"
 
-#: templates/browse/footer.inc:6
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Zobrazené záznamy:"
 
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Vyberte adresáø"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
-msgstr "Odstranit Sloupec"
+msgstr "Odstranit sloupec"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "Odstranit ze seznamu"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
+#, fuzzy
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Nahratit existující Kontakty importovanýma? <b>Upozornìní: Tato operace "
-"sma¾e v¹echny dosavadní polo¾ky v Kontaktech."
+"Nahratit existující adresáø importovaným? <b>Upozornìní: Tato operace sma¾e "
+"v¹echny dosavadní polo¾ky v adresáøi.</b>"
 
-#: lib/Driver.php:342
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Po¾adovaný objekt nebyl nalezen."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
-msgstr "Zpìt na Implicitní Nastavení"
+msgstr "Nastavit výchozí implicitní hodnoty"
 
-#: config/attributes.php.dist:186
+#: config/attributes.php.dist:196
 msgid "S/MIME Public Certificate"
-msgstr "S/MIME Veøejný Certifikát"
+msgstr "S/MIME veøejný certifikát"
 
-#: add.php:46 edit.php:57
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr "STARTTLS selhalo: (%s) %s"
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Ulo¾it"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Hledat"
 
-#: browse.php:260 minisearch.php:66
-msgid "Search Results"
-msgstr "Výsledky Hledání"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
+msgstr "Výsledky hledání"
 
-#: lib/api.php:802
+#: lib/api.php:1011
 msgid "Search failed"
 msgstr "Hledání selhalo"
 
-#: lib/api.php:892 lib/api.php:898 lib/api.php:907 lib/api.php:920
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
 msgstr "Hledání selhalo: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Mo¾nosti Hledání"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Vyhledávám..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Vybrat Kontakty"
-
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "Vybrat Seznam"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Vyberte adresáø, ze kterého budete exportovat:"
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Vyberte adresáø, do kterého se bude importovat:"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
-msgstr "Vyberte Kontakty, z kterých budete exportovat:"
+msgstr "Vyberte adresáø, ze kterého budete exportovat:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
-msgstr "Vyberte kam se bude importovat:"
+msgstr "Vyberte adresáø, do kterého se bude importovat:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Vyberte formát zdrojového souboru:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Veberte formát exportu:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Vyberte soubor k importování:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Vyberte formát zdrojového souboru:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Vyberte formát zobrazení jmen:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Vyberte implicitní zobrazení."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
+msgstr "Volba implicitního zobrazení."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
-msgstr "Vyberte, které pole mají být zobrazena v seznamu adres."
+msgstr "Volba polí, která mají být zobrazena v seznamu adres."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
-msgstr "Vyberte formát zobrazení jmen."
+msgstr "Volba formátu zobrazení jmen."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Vybrané Sloupce:"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "Vybraný adresáø '%s'."
 
-#: add.php:59
-#, php-format
-msgid "Selected address book '%s'."
-msgstr "Vybrané Kontakty '%s'."
-
-#: config/sources.php.dist:230
+#: config/sources.php.dist:173
 msgid "Shared Directory"
-msgstr "Sdílený Adresáø"
-
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "Zobr_azit V¹e"
+msgstr "Sdílený adresáø"
 
-#: templates/browse/select.inc:11
-msgid "Show"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
 msgstr "Zobrazit"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:41
 msgid "Show All"
-msgstr "Zobrazit V¹e"
+msgstr "Zobrazit v¹e"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
-msgstr "Zobrazit Kontakty"
+msgstr "Zobrazit kontakty"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
-msgstr "Zobrzit Seznamy"
-
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "Zobrazit _Kontakty"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "Zobrazit _Seznamy"
+msgstr "Zobrazit seznamy"
 
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
-msgstr "Smìr Tøídìní"
+msgstr "Smìr tøídìní"
 
-#: lib/api.php:154
+#: lib/api.php:198
 msgid "Sources"
 msgstr "Zdroje"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
-msgstr "Urèete kde si pøejete zobrazit výsledky dùkladnìj¹ího hledání."
+msgstr "Urèete kam si pøejete zobrazit výsledky pokroèilého vyhledávání."
 
-#: browse.php:156
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
-msgstr "Úspì¹nì pøidáno %s do %s."
+msgstr "Úspì¹nì pøidáno %s do %s"
 
-#: data.php:29
+#: browse.php:222
+#, fuzzy, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Úspì¹nì pøidáno %s do %s"
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/export.inc:18 templates/data/import.inc:19
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tab oddìlené hodnoty"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Nelze vyèistit adresáø: %s"
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Adresáø byl úspì¹nì vyèistìný."
+
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Adresáø byl úspì¹nì vyèistìný."
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Adresáø byl úspì¹nì vyèistìný."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
-msgstr "Nelze vyèisti kontakty: %s"
+msgstr "Nelze vyèistit adresáø: %s"
 
-#: display.php:23 edit.php:24 vcard.php:22
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
-msgstr "Po¾adovaný Kontakt neexistuje."
+msgstr "Po¾adovaný kontakt neexistuje."
 
-#: browse.php:58
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s soubor byl úspì¹nì importován"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
-msgstr "Nejsou dostupné ¾adné Kontakty k prohlí¾ení."
+msgstr "Nejsou dostupné ¾adné adresáøe k prohlí¾ení."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
 "is an error, please contact your system administrator."
 msgstr ""
-"Nejsou zde ¾ádné Kontakty s mo¾ností zápisu. ®ádné Kontakty nejsou "
-"nakonfigurovány pro zápis nových kontaktù. Pokud si myslíte, ¾e je to chyba, "
+"Nejsou zde ¾ádné adresáøe s mo¾ností zápisu. ®ádné adresáøe nejsou "
+"nakonfigurovány pro zápis nových polo¾ek. Pokud si myslíte, ¾e je to chyba, "
 "prosím kontaktujte svého systémového administrátora."
 
-#: add.php:107
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -859,178 +1055,246 @@
 "Nastala chyba pøi vkládání nového kontaktu. Kontaktujte Va¹eho systémového "
 "administrátora."
 
-#: browse.php:212
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Nastala chyba pøi mazání tohoto objektu."
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "Nastala chyba pøi vytváøení nového seznamu."
 
-#: browse.php:163
-#, php-format
-msgid "There was an error deleting %s from the source address book."
-msgstr "Nastala chyba pøi smázávání %s ze zdrojovách kontaktù."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Nastala chyba pøi aktualizaci této polo¾ky: %s"
 
-#: delete.php:31
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Nastala chyba pøi mazání %s ze zdrojového adresáøe."
+
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
-msgstr "Nastala chyba pøi smázávání toho to kontaktu: %s"
+msgstr "Nastala chyba pøi mazání tohoto kontaktu: %s"
 
-#: browse.php:93
+#: browse.php:72
 msgid "There was an error deleting this object."
-msgstr "Nastala chyba pøi smázávání tohoto objektu."
+msgstr "Nastala chyba pøi mazání tohoto objektu."
 
-#: browse.php:290
-msgid "There was an error displaying the select List"
-msgstr "Nastala chyba pøi zobrazování vybraného Seznamu"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "Nastala chyba pøi zobrazování vybraného seznamu"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
-msgstr "Nastala chyba pøi importování dat: %s."
+msgstr "Nastala chyba pøi importování dat: %s"
 
-#: lib/api.php:334
+#: lib/api.php:507 lib/api.php:761
 msgid "There was an error importing the iCalendar data."
 msgstr "Pøi importování iCalendar dat do¹lo k chybì."
 
-#: browse.php:83
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Nastala chyba pøi vytváøení nového seznamu."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Nastala chyba pøi odstraòování tohoto objektu."
 
-#: edit.php:84
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Nastala chyba pøi aktualizaci této polo¾ky: %s"
+
+#: edit.php:158
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Nastala chyba pøi aktualizaci této polo¾ky: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "®ádné kontakty pro exportování."
 
-#: lib/Driver.php:402 lib/Driver.php:443
-msgid "This address book is read-only"
-msgstr "Kontakty jsou pouze ke ètení"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Tento formát souboru nelze pou¾ít."
 
-#: lib/api.php:911 lib/api.php:924
+#: lib/api.php:1122 lib/api.php:1135
 #, php-format
 msgid "This person already has a %s entry in the address book"
-msgstr "Tato osoba se ji¾ nachází ve Va¹ich Kontaktech jako %s."
+msgstr "Tato osoba se ji¾ nachází ve Va¹em adresáøi jako %s."
+
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titul"
 
-#: lib/Driver.php:821
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Nelze dosáhnout definici %s."
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
-msgstr "Storno Zmìny"
+msgstr "Storno zmìn"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
-msgstr "Nepodporovaný Typ Obsahu (Content-Type)."
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, fuzzy, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Nepodporovaný typ obsahu (Content-Type)."
 
-#: config/sources.php.dist:131
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign Directory"
 
-#: templates/browse/contactrow.inc:27
-#, php-format
-msgid "View '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
 msgstr "Zobrazit '%s'"
 
-#: minisearch.php:80
+#: minisearch.php:78
 msgid "View Contact"
-msgstr "Zobrazit Kontakt"
+msgstr "Zobrazit kontakt"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Implicitní zobrazení:"
 
-#: config/attributes.php.dist:198
+#: config/attributes.php.dist:208
 msgid "Website URL"
-msgstr "URL Webstránky"
+msgstr "URL www stránky"
 
-#: config/attributes.php.dist:108
+#: config/attributes.php.dist:113
 msgid "Work Address"
-msgstr "Pracovní Adresa"
+msgstr "Adresa do zamìstnání"
 
-#: config/attributes.php.dist:114
+#: config/attributes.php.dist:124
 msgid "Work City"
-msgstr "Pracovní Mìsto"
+msgstr "Mìsto adresy do zamìstnání"
 
-#: config/attributes.php.dist:129
+#: config/attributes.php.dist:139
 msgid "Work Country"
-msgstr "Pracovní Zemì"
+msgstr "Zemì adresy do zamìstnání"
 
-#: config/attributes.php.dist:146
+#: config/attributes.php.dist:156
 msgid "Work Phone"
-msgstr "Telefon do práce"
+msgstr "Telefon do zamìstnání"
 
-#: config/attributes.php.dist:124
+#: config/attributes.php.dist:134
 msgid "Work Postal Code"
-msgstr "Pracovní Smìrovací Èíslo"
+msgstr "PSÈ do zamìstnání"
 
-#: config/attributes.php.dist:119
+#: config/attributes.php.dist:129
 msgid "Work State/Province"
-msgstr "Pracovní Stát/Provincie"
+msgstr "Stát/provincie adresy do zamìstnání"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "Vytváøíte distribuèní seznam."
+#: config/attributes.php.dist:119
+msgid "Work Street Address"
+msgstr "Ulice adresy do zamìstnání"
 
-#: display.php:48 edit.php:44
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
+
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Nedostateèná práva pro prohlí¾ení tohoto kontaktu."
 
 #: vcard.php:40
 msgid "You do not have permission to view this object."
-msgstr "Nedostateèná práva pro prohlí¾ení toho to objektu."
+msgstr "Nedostateèná práva pro prohlí¾ení tohoto objektu."
 
-#: templates/browse/javascript.inc:41
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
-msgstr "Musíte nejdøíve vybrat cílové kontakty."
+msgstr "Musíte nejdøíve vybrat cílový adresáø."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
-msgstr "Musíte nejdøíve vybrat cíloví seznam."
+msgstr "Musíte nejdøíve vybrat cílový seznam."
+
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "Musíte nejdøíve vybrat alespoò jednu polo¾ku."
 
-#: templates/browse/javascript.inc:58
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
-msgstr "Musíte nejdøíve vybrat nejménì jednu polo¾ku."
+msgstr "Musíte nejdøíve vybrat alespoò jednu polo¾ku."
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
-msgstr "Va¹e práva dovolují pouze prohlí¾ení toho to kontaktu."
+msgstr "Va¹e práva dovolují pouze prohlí¾ení tohoto kontaktu."
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[¾ádná hodnota]"
 
-#: lib/Turba.php:240
-msgid "_Add"
-msgstr "_Vlo¾it"
-
-#: lib/Turba.php:239
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "_Prohlí¾et"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "Zobrazit _kontakty"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
 msgstr "_Smazat"
 
-#: lib/Turba.php:245
+#: lib/Turba.php:493
 msgid "_Import/Export"
-msgstr "_Importovat/Exportovat"
+msgstr "_Importovat/exportovat"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Seznam"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Adresáø"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Nový kontakt"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
-msgstr "_Odstranit z toho to seznamu"
+msgstr "_Odstranit z tohoto seznamu"
 
-#: lib/Turba.php:241
+#: lib/Turba.php:489
 msgid "_Search"
 msgstr "_Vyhledat"
 
@@ -1038,19 +1302,35 @@
 msgid "contact.vcf"
 msgstr "kontakty.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "kontakty.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "kontakty.tsv"
 
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
-msgstr "so Vybraných Kontaktù:"
+#: data.php:219
+#, fuzzy
+msgid "contacts.vcf"
+msgstr "kontakty.vcf"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "®ádný"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "Zobrazit kontakty"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "do vybraného adresáøe"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/export.inc:20 templates/data/import.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/po/it_IT.po
+++ mod/po/it_IT.po
@@ -6,830 +6,1043 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 0.0.3\n"
-"POT-Creation-Date: 2004-09-06 22:35+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2005-02-23 17:40+0100\n"
-"Last-Translator: jacopo <poedit at goracci.com>\n"
 "Last-Translator: Marco Pirovano <marco.pirovano at unibocconi.it>\n"
 "Language-Team: Italian <dev at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Rubrica Pine"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "alla Rubrica Selezionata"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Nome Cognome\" (es. Mario Rossi)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Cognome, Nome\" (es. Rossi, Mario)"
 
-#: add.php:96
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s aggiunto."
 
-#: data.php:210
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "File %s importato con successo"
 
-#: templates/browse/footer.inc:10
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "%s a %s di %s"
 
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Rubrica Pine"
+
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
 msgstr "E' necessario un browser che supporti iFrames"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
-msgstr "Sopra il modulo di ricerca"
+msgstr ""
+
+#: view.php:52
+#, fuzzy, php-format
+msgid "Access denied to %s"
+msgstr "Aggiunto con successo %s a %s"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Ri_cerca Avanzata"
+#: add.php:56 templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add"
+msgstr "_Aggiungi"
 
-#: templates/prefs/columnselect.inc:238
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Rubrica non valida."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Seleziona rubrica '%s'."
+
+#: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Aggiungi colonna"
 
-#: templates/browse/actions.inc:26
+#: edit.php:128
+msgid "Add file"
+msgstr ""
+
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "Aggiungi a"
 
-#: addlink.php:52
-#, php-format
-msgid "Added a %s link to %s."
-msgstr "Aggiunto un %s link a %s."
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Rubrica Pine"
 
-#: browse.php:31 config/prefs.php.dist:99
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Lista Rubrica."
 
-#: add.php:95
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Esci dalla Rubrica"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Inserimento scheda nella rubrica"
 
-#: lib/Source.php:403
-msgid "Address book is read-only."
-msgstr "La rubrica è in sola lettura."
-
-#: data.php:188
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Rubrica svuotata con successo."
 
-#: search.php:95 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Inserimento scheda nella rubrica"
+
+#: templates/prefs/addressbookselect.inc:170
+#, fuzzy
+msgid "Address books that will not be displayed:"
+msgstr "Non era possibile sostituire la firma."
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Ricerca Avanzata"
 
-#: config/attributes.php.dist:62
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "Tutti"
 
-#: lib/api.php:330
+#: lib/api.php:552
 msgid "Already Exists"
 msgstr "Gia' esistente"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Sei sicuro di voler cancellare %s?"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Sei sicuro di voler eliminare questo articolo?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: templates/prefs/columnselect.inc:234
-msgid "Available Columns:"
-msgstr "Colonne disponibili:"
-
-#: templates/browse/actions.inc:48
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "To_rna a %s"
-
-#: templates/browse/actions.inc:48
-#, php-format
-msgid "Back to %s"
-msgstr "Torna a %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Ricer_ca Semplice"
-
-#: search.php:92 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
 msgstr "Ricerca Semplice"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
-msgstr "Sotto il modulo di ricerca"
+msgstr ""
 
-#: lib/Driver/ldap.php:73 lib/Driver/ldap.php:76
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Link fallito. (%s) %s"
 
-#: config/attributes.php.dist:155
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "_Sfoglia"
+
+#: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Categoria Affari"
 
-#: data.php:29
+#: data.php:49
 msgid "CSV"
 msgstr "SCV"
 
-#: templates/browse/actions.inc:52
-msgid "C_lear Search"
-msgstr "A_nnulla Ricerca"
-
-#: templates/addlink/contacts.inc:127
-msgid "Cancel"
-msgstr "Cancella"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
 msgstr ""
-"Seleziona una cartella di default per la tua rubrica personale, le tue "
-"contact list e ricerche."
 
-#: add.php:54
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "Scegli una rubrica"
+
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Scegli una rubrica"
 
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Scegli una rubrica"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "Scegli una rubrica"
+
 #: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
 msgstr "Scegli l'ordine delle colonne da mostrare nella lista indirizzi."
 
-#: templates/browse/actions.inc:52
-msgid "Clear Search"
-msgstr "Annulla Ricerca"
-
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Opzioni Colonne"
 
-#: templates/data/export.inc:16 templates/data/import.inc:18
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Valori separati da virgole"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Valori separati da virgole (Microsoft Outlook)"
 
-#: config/attributes.php.dist:72
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Azienda"
 
-#: config/attributes.php.dist:129
+#: config/attributes.php.dist:144
 msgid "Company Address"
 msgstr "Indirizzo Lavoro"
 
-#: lib/api.php:559 lib/api.php:724 lib/api.php:937
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Connessione fallita: %s"
 
-#: lib/Driver/ldap.php:62
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Connessione fallita"
 
-#: addlink.php:138 templates/addlink/contacts.inc:59
-msgid "Contact List"
-msgstr "Lista Contatto"
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "Contatti rimossi dalla lista."
 
-#: browse.php:86
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "Contatti rimossi dalla lista."
 
-#: browse.php:269
+#: browse.php:266
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Contatti nella lista: %s"
 
-#: browse.php:291
-#, php-format
-msgid "Contents of %s"
-msgstr "Contenuti di %s"
-
-#: templates/browse/actions.inc:13
+#: templates/browse/actions.inc:12
 msgid "Copy"
 msgstr "Copia"
 
-#: lib/ObjectView.php:114
-msgid "Created"
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
 msgstr "Creato"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Visualizzazione di default"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Rubrica Personale"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
 msgstr ""
-"Cartella di Default per la tua rubrica personale, le tue liste e le ricerche."
 
-#: config/prefs.php.dist:72
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "Creato"
+
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Ordine di default:"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:47
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Cancella"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Seleziona Rubrica"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Conferma di cancellazione"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Elimina Valore Opzione"
 
-#: lib/Driver/ldap.php:345
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Eliminazione fallita: (%s) %s"
 
-#: delete.php:35
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Eliminazione Fallita"
 
-#: config/attributes.php.dist:188
+#: config/attributes.php.dist:213
 msgid "Department"
 msgstr "Dipartimento"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Discendente"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Cartella"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Opzioni di Visualizzazione"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Opzioni di Visualizzazione"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
 msgstr "Sicuro di voler cancellare PERMANENTEMENTE questi messaggi?"
 
-#: templates/browse/contactrow.inc:29
-msgid "Download VCard"
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
 msgstr "Scarica VCard"
 
-#: templates/browse/contactrow.inc:29
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "Scarica cCard"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:37
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Modifica"
 
-#: templates/browse/contactrow.inc:37
-#, php-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "Modifica '%s'"
 
-#: edit.php:54 edit.php:81
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Esci dalla Rubrica"
+
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Modifica scheda per %s"
 
-#: config/attributes.php.dist:57
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "Email"
 
-#: edit.php:80
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Aggiornata la scheda per %s."
 
-#: templates/miniwindow/menu.inc:1
-msgid "Exit Address Book"
-msgstr "Esci dalla Rubrica"
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "File %s importato con successo"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Seleziona rubrica '%s'."
 
-#: templates/data/export.inc:34
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Esporta"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Esporta Rubrica"
 
-#: browse.php:63 browse.php:122 browse.php:137
-#, php-format
-msgid "Failed to access the specified address book: %s"
+#: templates/data/export.inc:21
+#, fuzzy
+msgid "Export only the selected contacts."
+msgstr "Seleziona un contatto"
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
 msgstr "Connessione falita alla rubrica indicata: %s"
 
-#: browse.php:147
+#: browse.php:139
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Aggiungimento del %s a %s falita: %s"
 
-#: browse.php:274
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "Impossibile esaminare la lista"
 
-#: browse.php:305
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "Impossibile passare in rassegna la directory"
 
-#: lib/Driver/ldap.php:382
-#, php-format
-msgid "Failed to change name: (%s) %s, %s"
+#: lib/Driver/ldap.php:309
+#, fuzzy, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr "Modifica fallita del nome: (%s) %s, %s"
 
-#: add.php:72 data.php:92 data.php:183 search.php:52
-msgid "Failed to connect to the specified directory."
-msgstr "Connessione alla directory indicata non riuscita."
-
-#: browse.php:142
+#: browse.php:120
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Ricerca di oggetti da aggiungere falita: %s"
 
-#: data.php:95 search.php:86
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Ricerca nella directory falita: %s"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Ricerca nella directory falita: %s"
 
-#: config/attributes.php.dist:150
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72 templates/addlink/contacts.inc:77
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Titolo"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Trova"
 
-#: config/attributes.php.dist:47
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Trova"
+
+#: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Nome"
 
-#: config/attributes.php.dist:178
+#: config/attributes.php.dist:202
 msgid "Freebusy URL"
 msgstr "URL libero/occupato"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Da"
 
-#: config/sources.php.dist:498
+#: config/sources.php.dist:604
 msgid "Global Address Book"
 msgstr "Rubrica globale"
 
-#: templates/browse/column_headers.inc:10 templates/browse/contactrow.inc:47
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Gruppo"
 
-#: templates/addlink/menu.inc:23
-msgid "Help"
-msgstr "Aiuto"
-
-#: config/attributes.php.dist:77
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Indirizzo Abitazione"
 
-#: config/attributes.php.dist:83
+#: config/attributes.php.dist:93
 msgid "Home City"
 msgstr "Città"
 
-#: config/attributes.php.dist:98
+#: config/attributes.php.dist:108
 msgid "Home Country"
 msgstr "Paese"
 
-#: config/attributes.php.dist:135
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Telefono Abitazione"
 
-#: config/attributes.php.dist:93
+#: config/attributes.php.dist:103
 msgid "Home Postal Code"
 msgstr "CAP"
 
-#: config/attributes.php.dist:88
+#: config/attributes.php.dist:98
 msgid "Home State/Province"
 msgstr "Provincia o Stato"
 
-#: config/sources.php.dist:439
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Indirizzo Abitazione"
+
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Lista Rubrica."
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Importazione Rubrica, step %d"
 
-#: data.php:228
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Importa/Esporta Rubriche"
 
-#: lib/api.php:316 lib/api.php:524
-msgid "Invalid Content-Type"
-msgstr "Dato non valido."
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Chiave invalida"
 
-#: lib/api.php:205 lib/api.php:274 lib/api.php:368 lib/api.php:454
-#: lib/api.php:503 lib/api.php:796
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
 msgstr "Rubrica non valida."
 
-#: lib/api.php:800 lib/api.php:872 lib/api.php:922
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
 msgstr "Indirizzo e-mail non valido."
 
-#: lib/api.php:808
+#: lib/api.php:1089
 msgid "Invalid entry"
 msgstr "Dato non valido."
 
-#: lib/api.php:372 lib/api.php:458 lib/api.php:507
-msgid "Invalid key"
-msgstr "Chiave invalida"
-
-#: lib/Driver/ldap.php:341
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Chiave invalida specificata."
 
-#: lib/api.php:804
+#: lib/api.php:1085
 msgid "Invalid name"
 msgstr "Nome non valido."
 
-#: lib/ObjectView.php:119
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "Dato non valido."
+
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Ultima Modifica"
 
-#: config/attributes.php.dist:52
+#: config/attributes.php.dist:53
 msgid "Last Name"
 msgstr "Cognome"
 
-#: addlink.php:55
-msgid "Link added."
-msgstr "Link aggiunto."
-
-#: addlink.php:64
-msgid "Link canceled."
-msgstr "Link annullato."
+#: templates/browse/column_headers.inc:16
+#, fuzzy
+msgid "List"
+msgstr "Nuova Lista"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Corrispondente"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "Il numero massimo di pagine e' gia' presente."
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Il numero massimo di pagine e' gia' presente."
 
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Nuova Lista"
+
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
 msgstr "Ricerca Veloce"
 
-#: lib/api.php:963
-msgid "Missing information"
-msgstr "Informazioni mancante"
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
 
-#: config/attributes.php.dist:145
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: lib/Driver/ldap.php:404 lib/Driver/ldap.php:421
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Modifica fallita: (%s) %s"
 
-#: lib/api.php:907 lib/api.php:943
+#: lib/api.php:1193
 msgid "More than 1 entry found"
 msgstr "Risulta pi&ugrave; di un dato."
 
-#: templates/browse/actions.inc:12
+#: templates/browse/actions.inc:11
 msgid "Move"
 msgstr "Sposta"
 
-#: templates/prefs/columnselect.inc:248
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Sposta a sinistra"
 
-#: templates/prefs/columnselect.inc:250
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Sposta a destra"
 
-#: data.php:32 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Rubrica Mulberry"
 
-#: lib/api.php:830
+#: lib/api.php:1113
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
 "Diverse persone con indirizzo [%s], ma nessuna con nome [%s] nella rubrica."
 
-#: config/sources.php.dist:157 config/sources.php.dist:284
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
 msgstr "Rubrica Personale"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Rubrica Personale"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nome"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Formato Nome"
 
-#: add.php:46 lib/Block/minisearch.php:27
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Nuovo Contatto"
 
-#: templates/browse/actions.inc:30
-msgid "New List"
-msgstr "Nuova Lista"
-
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
 msgstr "Successivo"
 
-#: config/attributes.php.dist:193
+#: config/attributes.php.dist:218
 msgid "Nickname"
 msgstr "nome"
 
-#: lib/api.php:909 lib/api.php:951
+#: lib/api.php:1195 lib/api.php:1244
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Nessun dato %s trovato per %s."
 
-#: minisearch.php:86
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "La rubrica è in sola lettura."
+
+#: minisearch.php:83
 msgid "No contacts found"
 msgstr "Nessun contatto trovato"
 
-#: lib/api.php:296
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
 msgstr "Nessun compleanno trovato."
 
-#: templates/browse/footer.inc:12
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "Nessuno"
 
-#: config/attributes.php.dist:160
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Note"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Numero di caratteri"
 
-#: lib/api.php:389
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
 msgstr "Oggetto non trovato"
 
-#: config/attributes.php.dist:198
+#: config/attributes.php.dist:223
 msgid "Office"
 msgstr "Ufficio"
 
-#: templates/addlink/menu.inc:13
-msgid "Options"
-msgstr "Opzioni"
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
 
-#: config/prefs.php.dist:34
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Altre Opzioni"
 
-#: config/attributes.php.dist:166
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr "Chiave PGP pubblica"
 
-#: lib/api.php:280 lib/api.php:378 lib/api.php:464 lib/api.php:516
-#: lib/api.php:814
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
 msgstr "Permesso Negato"
 
-#: data.php:33 templates/data/import.inc:22
+#: lib/Driver.php:543
+#, fuzzy
+msgid "Permission denied"
+msgstr "Permesso Negato"
+
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "Permesso Negato"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Rubrica Pine"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
 msgstr "Inserisci il nome della nuova cartella:"
 
-#: templates/prefs/columnselect.inc:219
-msgid "Please select a directory:"
-msgstr "Seleziona una directory:"
-
-#: templates/addlink/contacts.inc:96
-msgid "Please select contact"
-msgstr "Seleziona un contatto"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-#: config/sources.php.dist:362
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Rubrica Personale"
 
-#: templates/menu/menu.inc:28 templates/addlink/menu.inc:18
-msgid "Problem"
-msgstr "Problema"
-
-#: lib/Driver/ldap.php:135
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Query fallita: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "Ricerca Veloce"
 
-#: lib/Driver/ldap.php:218 lib/Driver/ldap.php:226 lib/Driver/ldap.php:243
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Lettura fallita: (%s) %s"
 
-#: templates/browse/footer.inc:7
+#: lib/Renderer.php:49
+#, fuzzy
+msgid "Really delete this contact?"
+msgstr "Seleziona un contatto"
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Si ripete ogni giorno"
 
-#: templates/prefs/columnselect.inc:240
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Scegli una rubrica"
+
+#: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Rimuovi colonna"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "Elimina da questa lista"
 
-#: lib/Source.php:282
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Oggetto richiesto non trovato."
 
-#: config/attributes.php.dist:172
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
 msgid "S/MIME Public Certificate"
 msgstr "Certificato Pubblico S/MIME"
 
-#: add.php:47 display.php:35 edit.php:58
+#: lib/Driver/ldap.php:69
+#, fuzzy, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr "Lettura fallita: (%s) %s"
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Salva"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 templates/addlink/contacts.inc:89
-#: config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Cerca"
 
-#: browse.php:254 minisearch.php:67
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Risultati della Ricerca"
 
-#: lib/api.php:729
+#: lib/api.php:1011
 msgid "Search failed"
 msgstr "Ricerca fallita"
 
-#: lib/api.php:820 lib/api.php:826 lib/api.php:835 lib/api.php:848
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
 msgstr "Ricerca fallita: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Opzioni Ricerca"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Ricerca in corso..."
 
-#: templates/addlink/contacts.inc:126
-msgid "Select"
-msgstr "Seleziona"
-
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Seleziona Rubrica"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Seleziona la fonte da cui esportare:"
 
-#: templates/browse/actions.inc:28
-msgid "Select List"
-msgstr "Seleziona Lista"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Seleziona il calendario verso cui importare:"
 
-#: templates/data/export.inc:25
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Seleziona la fonte da cui esportare:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Seleziona il calendario verso cui importare:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Seleziona il formato in cui esportare:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Seleziona il formato per esportare"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Seleziona il file da importare:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Seleziona il formato in cui esportare:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Seleziona il formato utilizzato per mostrare i nomi:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Seleziona la vista da mostrare di default."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Seleziona quali campi mostrare nella lista indirizzi."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Seleziona in quale formato visualizzare i nomi."
 
-#: templates/prefs/columnselect.inc:244
-msgid "Selected Columns:"
-msgstr "Seleziona Colonne:"
-
-#: add.php:60
-#, php-format
-msgid "Selected address book '%s'."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
 msgstr "Seleziona rubrica '%s'."
 
-#: config/sources.php.dist:221
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Directory Condivisa"
 
-#: templates/browse/actions.inc:46
-msgid "Sho_w All"
-msgstr "Mostra Tutto"
-
-#: templates/browse/select.inc:11
-msgid "Show"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
 msgstr "Mostra"
 
-#: templates/browse/actions.inc:46
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "Mostra Tutto"
 
-#: templates/browse/actions.inc:45
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "Mostra Contatti"
 
-#: templates/browse/actions.inc:44
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "Mostra Liste"
 
-#: templates/browse/actions.inc:45
-msgid "Show _Contacts"
-msgstr "Mostra _Contatti"
-
-#: templates/browse/actions.inc:44
-msgid "Show _Lists"
-msgstr "Mostra _Liste"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "Direzione di ordinamento"
 
-#: lib/api.php:169
+#: lib/api.php:198
 msgid "Sources"
 msgstr "URL Notizia"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
-msgstr "Specificare dove far apparire i risultati della ricerca"
+msgstr ""
 
-#: browse.php:149
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "Aggiunto con successo %s a %s"
 
-#: data.php:30
+#: browse.php:222
+#, fuzzy, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Aggiunto con successo %s a %s"
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/export.inc:18 templates/data/import.inc:19
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Valori separati da Tab"
 
-#: data.php:190
-msgid "The address book could not be purged."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Non era possibile sostituire la firma."
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Rubrica svuotata con successo."
+
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Rubrica svuotata con successo."
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Rubrica svuotata con successo."
+
+#: data.php:303
+#, fuzzy, php-format
+msgid "The address book could not be purged: %s"
 msgstr "Non era possibile sostituire la firma."
 
-#: display.php:26 edit.php:25 vcard.php:23
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "L'oggetto richiesto non esiste."
 
-#: browse.php:59
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "File %s importato con successo"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Non ci sono rubriche esaminabili."
 
-#: add.php:39
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -839,7 +1052,7 @@
 "diaggiungere nuove entrate. Se pensi sia un errore, per favore contatta il "
 "tuo amministratore di sistema."
 
-#: add.php:107
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -847,202 +1060,286 @@
 "C'&egrave; stato un errore aggiungendo questo oggetto. Contatta il tuo "
 "amministratore di sistema per ulteriore aiuto."
 
-#: browse.php:206
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Errore nella cancellazione dell'oggetto."
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "Errore nella creazione di una nuova lista."
 
-#: browse.php:156
-#, php-format
-msgid "There was an error deleting %s from the source address book."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Si e' verificato un errore nell'aggiornamento di questo oggetto: %s"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr ""
 "Si e' verificato un errore nell'eliminazione di %s dalla fonte della rubrica."
 
-#: delete.php:33
-msgid ""
-"There was an error deleting this contact. Ask your system administrator for "
-"further help."
-msgstr ""
-"Si e' verificato un errore nell'eliminazione di questo oggetto. Contatta "
-"l'amministratore di sistema per ulteriore aiuto."
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Errore nella cancellazione dell'oggetto."
 
-#: browse.php:94
+#: browse.php:72
 msgid "There was an error deleting this object."
 msgstr "Errore nella cancellazione dell'oggetto."
 
-#: browse.php:284
-msgid "There was an error displaying the select List"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
 msgstr "Errore nella visualizzazione della lista Selezionata"
 
-#: data.php:203
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Errore nell'importazione dei dati: %s"
 
-#: browse.php:84
-msgid "There was an error removing this object."
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "Errore nell'importazione dei dati: %s"
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Errore nella creazione di una nuova lista."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Errore nella rimozione dell'oggetto."
 
-#: edit.php:85
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Si e' verificato un errore nell'aggiornamento di questo oggetto: %s"
+
+#: edit.php:158
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Si e' verificato un errore nell'aggiornamento di questo oggetto: %s"
 
-#: data.php:121
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Non ci sono indirizzi da esportare."
 
-#: data.php:166
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "QUesto formato di file non &egrave; supportato."
 
-#: lib/api.php:839 lib/api.php:852
+#: lib/api.php:1122 lib/api.php:1135
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Questa persona ha gia' una %s scheda nella rubrica."
 
-#: config/attributes.php.dist:67
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titolo"
 
-#: lib/Driver.php:172
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Impossibile caricare le definizioni di %s."
 
-#: edit.php:58
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
 msgstr "Indietro"
 
-#: lib/api.php:419
-msgid "Unsupported Content-Type."
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, fuzzy, php-format
+msgid "Unsupported Content-Type: %s"
 msgstr "Estensione Non Supportata"
 
-#: config/sources.php.dist:123
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Directory Verisign"
 
-#: templates/browse/contactrow.inc:31
-#, php-format
-msgid "View '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
 msgstr "Visualizza '%s'"
 
-#: minisearch.php:81
+#: minisearch.php:78
 msgid "View Contact"
 msgstr "Visualizza Contatto"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Vista da mostrare di default:"
 
-#: config/attributes.php.dist:183
+#: config/attributes.php.dist:208
 msgid "Website URL"
 msgstr "URL di base"
 
-#: config/attributes.php.dist:103
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Indirizzo di Lavoro"
 
 #: config/attributes.php.dist:124
+#, fuzzy
+msgid "Work City"
+msgstr "Paese"
+
+#: config/attributes.php.dist:139
 msgid "Work Country"
 msgstr "Paese"
 
-#: config/attributes.php.dist:140
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Telefono di lavoro"
 
-#: config/attributes.php.dist:119
+#: config/attributes.php.dist:134
 msgid "Work Postal Code"
 msgstr "CAP"
 
-#: config/attributes.php.dist:114
+#: config/attributes.php.dist:129
 msgid "Work State/Province"
 msgstr "Provincia o Stato"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "Stai creando una lista di distribuzione."
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Indirizzo di Lavoro"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-#: display.php:52 edit.php:45
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Non hai il permesso di visualizzare l'oggetto."
 
-#: vcard.php:41
+#: vcard.php:40
 msgid "You do not have permission to view this object."
 msgstr "Non hai il permesso di visualizzare l'oggetto."
 
-#: templates/browse/javascript.inc:41
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Devi prima selezionare un indirizzo."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
 msgstr "Devi prima selezionare una casella di destinazione."
 
-#: templates/addlink/contacts.inc:44
-msgid "You must select an address first."
-msgstr "Devi prima selezionare un indirizzo."
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "Devi prima specificare almeno un messaggio."
 
-#: templates/browse/javascript.inc:58
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Devi prima specificare almeno un messaggio."
 
-#: edit.php:49
+#: edit.php:73
 msgid "You only have permission to view this contact."
 msgstr "Hai solo il permesso di visualizzare l'oggetto."
 
-#: templates/menu/menu.inc:7
-msgid "_Add"
-msgstr "_Aggiungi"
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
 
-#: templates/menu/menu.inc:6
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "_Sfoglia"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "Mostra _Contatti"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
 msgstr "_Elimina"
 
-#: templates/menu/menu.inc:33
-msgid "_Help"
-msgstr "_Aiuto"
-
-#: templates/menu/menu.inc:12
+#: lib/Turba.php:493
 msgid "_Import/Export"
 msgstr "_Importa/Esporta"
 
-#: templates/menu/menu.inc:23
-msgid "_Options"
-msgstr "_Opzioni"
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Mostra _Liste"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Rubrica Personale"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Nuovo Contatto"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
 msgstr "_Elimina da questa lista"
 
-#: templates/menu/menu.inc:8
+#: lib/Turba.php:489
 msgid "_Search"
 msgstr "_Cerca"
 
-#: vcard.php:47
+#: vcard.php:46
 msgid "contact.vcf"
 msgstr "contatti.csv"
 
-#: data.php:128 data.php:133 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contatti.csv"
 
-#: data.php:138
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contatti.tsv"
 
-#: templates/addlink/contacts.inc:80
-msgid "from"
-msgstr "da"
+#: data.php:219
+#, fuzzy
+msgid "contacts.vcf"
+msgstr "contatti.csv"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "Nessuno"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "Lista Contatto"
 
-#: templates/browse/actions.inc:15
-msgid "to Selected Address Book"
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
 msgstr "alla Rubrica Selezionata"
 
-#: data.php:31 templates/browse/column_headers.inc:9
-#: templates/data/export.inc:20 templates/data/import.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/lib/Driver/sql.php
+++ mod/lib/Driver/sql.php
@@ -3,10 +3,9 @@
  * Turba directory driver implementation for PHP's PEAR database abstraction
  * layer.
  *
- * $Horde: turba/lib/Driver/sql.php,v 1.59.10.10 2005/08/11 18:44:26 selsky Exp $
+ * $Horde: turba/lib/Driver/sql.php,v 1.59.10.15 2006/01/18 19:50:25 ben Exp $
  *
  * @author  Jon Parise <jon at csh.rit.edu>
- * @since   Turba 0.0.1
  * @package Turba
  */
 class Turba_Driver_sql extends Turba_Driver {
@@ -16,7 +15,10 @@
      *
      * @var array
      */
-    var $_capabilities = array('delete_all' => true);
+    var $_capabilities = array(
+        'delete_all' => true,
+        'delete_addressbook' => true
+    );
 
     /**
      * Handle for the database connection.
@@ -34,7 +36,14 @@
             return $this->_db;
         }
 
-        $this->_db->setOption('portability', DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_ERRORS);
+        // Set DB portability options.
+        switch ($this->_db->phptype) {
+        case 'mssql':
+            $this->_db->setOption('portability', DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_ERRORS | DB_PORTABILITY_RTRIM);
+            break;
+        default:
+            $this->_db->setOption('portability', DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_ERRORS);
+        }
 
         if ($this->_params['phptype'] == 'oci8') {
             $this->_db->query('ALTER SESSION SET NLS_DATE_FORMAT = \'YYYY-MM-DD\'');
@@ -44,6 +53,32 @@
     }
 
     /**
+     * Returns the number of contacts of the current user in this address book.
+     *
+     * @return integer  The number of contacts that the user owns.
+     */
+    function countContacts()
+    {
+        static $count;
+
+        if (!isset($count)) {
+            /* Build up the full query. */
+            $query = 'SELECT COUNT(*) FROM ' . $this->_params['table'] .
+                     ' WHERE ' . $this->toDriver('__owner') . ' = ?';
+            $values = array(Auth::getAuth());
+
+            /* Log the query at a DEBUG log level. */
+            Horde::logMessage('SQL query by Turba_Driver_sql::countContacts(): ' . $query,
+                              __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+            /* Run query. */
+            $count = $this->_db->getOne($query, $values);
+        }
+
+        return $count;
+    }
+
+    /**
      * Searches the SQL database with the given criteria and returns a
      * filtered list of results. If the criteria parameter is an empty array,
      * all records will be returned.
@@ -58,7 +93,7 @@
         /* Build the WHERE clause. */
         $where = '';
         $values = array();
-        if (count($criteria)) {
+        if (count($criteria) || !empty($this->_params['filter'])) {
             foreach ($criteria as $key => $vals) {
                 if ($key == 'OR' || $key == 'AND') {
                     if (!empty($where)) {
@@ -70,6 +105,12 @@
                 }
             }
             $where = ' WHERE ' . $where;
+            if (count($criteria) && !empty($this->_params['filter'])) {
+                $where .= ' AND ';
+            }
+            if (!empty($this->_params['filter'])) {
+                $where .= $this->_params['filter'];
+            }
         }
 
         /* Build up the full query. */
@@ -108,7 +149,7 @@
     }
 
     /**
-     * Read the given data from the SQL database and returns the result's
+     * Reads the given data from the SQL database and returns the result's
      * fields.
      *
      * @param array $criteria  Search criteria.
@@ -136,6 +177,9 @@
             $where = $criteria . ' = ?';
             $values[] = $this->_convertToDriver($id);
         }
+        if (!empty($this->_params['filter'])) {
+            $where .= ' AND ' . $this->_params['filter'];
+        }
 
         $query  = 'SELECT ' . implode(', ', $fields) . ' ';
         $query .= 'FROM ' . $this->_params['table'] . ' WHERE ' . $where;
@@ -198,6 +242,10 @@
                  ' WHERE ' . $object_key . ' = ?';
         $values = array($object_id);
 
+        /* Log the query at a DEBUG log level. */
+        Horde::logMessage('SQL query by Turba_Driver_sql::_delete(): ' . $query,
+                          __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
         $result = $this->_db->query($query, $values);
         if (is_a($result, 'PEAR_Error')) {
             Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
@@ -208,18 +256,30 @@
     }
 
     /**
-     * Deletes all contacts from the address book.
+     * Deletes all contacts from a specific address book.
+     *
+     * @param string  $sourceName  The owner_id of the address book to
+     *                             delete.  If omitted, the user's default
+     *                             address book will be cleared.
      *
      * @return boolean  True if the operation worked.
      */
-    function _deleteAll()
+    function _deleteAll($sourceName = '')
     {
         if (!Auth::getAuth()) {
             return PEAR::raiseError('permission denied');
         }
 
         $query = 'DELETE FROM ' . $this->_params['table'] . ' WHERE owner_id = ?';
-        $values = array(Auth::getAuth());
+
+        if (!$sourceName) {
+            $values = array(Auth::getAuth());
+        } else {
+            $values = array($sourceName);
+        }
+        /* Log the query at a DEBUG log level. */
+        Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query,
+                          __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
         return $this->_db->query($query, $values);
     }


--- orig/themes/screen.css
+++ mod/themes/screen.css
@@ -1,13 +1,8 @@
 /**
- * $Horde: turba/themes/screen.css,v 1.2 2004/12/04 23:46:03 chuck Exp $
+ * $Horde: turba/themes/screen.css,v 1.2.4.1 2005/10/18 12:50:19 jan Exp $
  */
 
-.old td {
-    background-color: #ddd;
-}
-.text:hover td {
-    background-color: #ccf;
-}
-.old:hover td {
-    background-color: #aac;
+/* Menu bottom margin, added for BC. */
+#menu {
+    margin-bottom: 8px;
 }


--- orig/po/sv_SE.po
+++ mod/po/sv_SE.po
@@ -1,95 +1,152 @@
-# Swedish translations for Turba package.
-# Copyright (C) 2005 Horde Project
+# Turba Swedish translation
+# Copyright (C) 2002-2006 Horde Project
 # This file is distributed under the same license as the Turba package.
-# Andreas Dahlen <andreas at dahlen.ws>, 2004-2005.
+# Joaquim Homrighausen <joho at webbplatsen.se>, 2006.
+# Andreas Dahlén <andreas at dahlen.ws>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba 2.0.3-cvs\n"
+"Project-Id-Version: Turba 2.1\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-30 14:24+0200\n"
-"PO-Revision-Date: 2004-12-02 22:15+0100\n"
-"Last-Translator: Andreas Dahlén <andreas at dahlen.ws>\n"
+"POT-Creation-Date: 2006-02-15 10:07+0100\n"
+"PO-Revision-Date: 2006-02-15 11:15+0100\n"
+"Last-Translator: Joaquim Homrighausen <joho at webbplatsen.se>\n"
 "Language-Team: Swedish <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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr " Lägg till en IMSP-adressbok"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr " Radera IMSP-adressbok"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "'%s' finns redan och importerades inte."
+
+#: browse.php:140
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "'%s' kopierades inte eftersom det är en lista."
+
+#: browse.php:138
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "'%s' flyttades inte eftersom det är en lista."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
-msgstr "\"Förnamn Efternamn\"  (ie. John Doe)"
+msgstr "\"Förnamn Efternamn\"  (John Doe)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
-msgstr "\"Efternamn, Förnamn\" (ie. Doe, John)"
+msgstr "\"Efternamn, Förnamn\" (Doe, John)"
 
-#: add.php:96
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s lades till."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
-msgstr "%s filen är importerad"
+msgstr "%s-filen är importerad"
 
 #: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "%s till %s av %s"
 
-#: browse.php:146
+#: lib/Turba.php:458
 #, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s' kopierades inte eftersom det är en lista."
+msgid "%s's Address Book"
+msgstr "%ss adressbok"
 
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s' flyttades inte eftersom det är en lista."
-
-#: lib/Block/minisearch.php:45
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr "En webläsare som stödjer iFrames krävs"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "Ovanför sökformulär"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "A_vancerad sökning"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "Åtkomst nekades till %s"
 
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "Lägg till"
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "Ny adressbok"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "Lägg till och radera IMSP-adressböcker"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Lägg till kolumn"
 
-#: templates/browse/actions.inc:22
+#: edit.php:135
+msgid "Add file"
+msgstr "Lägg till fil"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Lägg till"
 
-#: browse.php:30 config/prefs.php.dist:99
-msgid "Address Book Listing"
+#: addlink.php:52
+#, php-format
+msgid "Added a %s link to %s."
+msgstr "Lade till en %s-länk till %s."
+
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "Det går inte att lägga till kontakter."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
 msgstr "Adressbok"
 
-#: add.php:95
+#: browse.php:28 config/prefs.php.dist:125
+msgid "Address Book Listing"
+msgstr "Adressbokslista"
+
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Adressböcker"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Adressbokspost"
 
-#: lib/Driver.php:496
+#: lib/Source.php:413
 msgid "Address book is read-only."
 msgstr "Adressbok kan endast läsas."
 
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Adressbooken är tömd."
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "Adressbok som skall raderas "
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "Adressböcker som inte visas:"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
@@ -97,55 +154,37 @@
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr "Alla"
 
-#: lib/api.php:377
+#: lib/api.php:554
 msgid "Already Exists"
-msgstr "Existerar redan"
+msgstr "Finns redan"
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Är det säkert att du vill radera %s?"
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
-msgstr "Är du säker att du vill radera vald post?"
+msgstr "Är du säker på att du vill radera markerade poster?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Stigande"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Tillgängliga kolumner:"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Till_baka till %s"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "Tillbaka till %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "_Sökning"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Sökning"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "Nedanför sökformuläret"
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Bind misslyckades: (%s) %s"
@@ -154,50 +193,67 @@
 msgid "Birthday"
 msgstr "Födelsedag"
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "Lista"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Affärskategori"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "_Rensa sökning"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "Kan inte lägga till grupp till sig själv."
+
+#: templates/addlink/contacts.inc:127
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Markera _Alla/Ingen"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Ange förvald katalog för personlig adressbok, kontaktlistor och sökningar."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "Välj ett namn"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Välj en adressbok"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Välj sorteringsordning på de kolumner som visas i adresslistan,"
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "Välj en adressbok:"
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "Rensa sökning"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr "Välj adressböcker som skall visas och i vilken ordning:"
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "Välj adressböcker som skall användas."
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "Välj kolumner som visas och i vilken ordning:"
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
-msgstr "Kolumn inställningar"
+msgstr "Kolumninställningar"
+
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Kolumner som inte visas:"
 
-#: templates/data/export.inc:16 templates/data/import.inc:18
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Kommaseparerade värden"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Kommaseparerade värden (Microsoft Outlook)"
 
@@ -209,69 +265,81 @@
 msgid "Company Address"
 msgstr "Adress, företag"
 
-#: lib/api.php:246 lib/api.php:366 lib/api.php:436 lib/api.php:526
-#: lib/api.php:572 lib/api.php:620 lib/api.php:807 lib/api.php:900
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:840
+#: lib/api.php:1037 lib/api.php:1125
 #, php-format
 msgid "Connection failed: %s"
-msgstr "Förbindelse till server misslyckades: %s"
+msgstr "Anslutning till server misslyckades: %s"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
-msgstr "Förbindelse till server misslyckades"
+msgstr "Anslutning till server misslyckades"
 
-#: browse.php:85
-msgid "Contact removed from list."
-msgstr "Kontakt raderas från listan."
+#: addlink.php:138 templates/addlink/contacts.inc:59
+msgid "Contact List"
+msgstr "Kontaktlista"
 
-#: browse.php:282
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Sök kontakt"
+
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Kontakter i listan: %s"
 
-#: browse.php:304
-#, php-format
-msgid "Contents of %s"
-msgstr "Innehåll i %s"
-
-#: templates/browse/actions.inc:12
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "Kopiera"
 
-#: lib/ObjectView.php:134
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Skapa"
+
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "Skapa adressbok"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Skapa ny kontaktlista i:"
+
+#: lib/ObjectView.php:133
 msgid "Created"
 msgstr "Skapad"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Förvald visning"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "Förvald katalog för personlig adressbok, kontaktlistor och sökningar."
-
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Förvald sorteringsriktning:"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Radera"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "Radera adressbok"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Radera bekräftelse"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Funktion för knappen Radera"
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Radering misslyckades: (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "Funktionen radera kontakter är inte tillgänglig."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Radering misslyckades"
 
@@ -279,38 +347,55 @@
 msgid "Department"
 msgstr "Avdelning"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Fallande"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Beskrivning"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Katalog"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Visa"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Visningsinställningar"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "Vill du bekräfta radering av poster?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Hämta"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
-msgstr "Ladda ner vCard"
+msgstr "Ladda ned vCard"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Ändra"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
-msgid "Edit '%s'"
+msgid "Edit \"%s\""
 msgstr "Ändra '%s'"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "Redigera adressböcker"
+
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Ändra post för %s"
@@ -319,59 +404,108 @@
 msgid "Email"
 msgstr "E-post"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+"Posten för '%s' uppdaterades, men den uppladdade filen kunde inte sparas: %s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Posten för %s uppdaterad."
 
-#: templates/data/export.inc:46 templates/browse/actions.inc:6
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "Det gick inte att lägga till %d kontakt(er) till listan."
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr "Det gick inte att lägga till %d av %d begärda kontakter till listan."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Fel vid radering av %d kontakt(er)."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "Fel vid radering av %d av %d begärda kontakter."
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "Fel vid radering av %d kontakt(er) från listan."
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr "Fel vid radering av %d av %d kontakter från listan."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "Fel vid sökning i adressboken: %s"
+
+#: templates/miniwindow/menu.inc:1
+msgid "Exit Address Book"
+msgstr "Lämna adressbok"
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportera"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Exportera adressbok"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
-msgstr "Exportera enbart markerade kontakteri."
+msgstr "Exportera endast markerade kontakter."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Exportera alla kontakter i adressboken."
 
-#: add.php:72 browse.php:62 browse.php:120 browse.php:135 data.php:110
-#: data.php:228 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Fel vid åtkomst av adressboken: %s"
 
-#: browse.php:154
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Misslyckades att lägga till %s till %s: %s"
 
-#: browse.php:287
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "Misslyckades att visa listan"
 
-#: browse.php:318
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "Misslyckades att visa katalogen"
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 "Misslyckades att ändra namn: (%s) %s; Gammalt DN = %s, Nytt DN = %s, Root = %"
 "s"
 
-#: browse.php:140
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Hittade inte objekt som skulle läggas till: %s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "Fel vid sökning i adressboken"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Misslyckades att söka i katalogen: %s"
@@ -380,30 +514,42 @@
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72
+#: edit.php:131 display.php:100
+msgid "Files"
+msgstr "Filer"
+
+#: templates/addlink/contacts.inc:77 templates/browse/search.inc:71
 msgid "Find"
 msgstr "Sök"
 
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "Slutför"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Förnamn"
 
 #: config/attributes.php.dist:202
 msgid "Freebusy URL"
-msgstr "Freebusy URL"
+msgstr "Ledig/upptagen-URL"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "Från"
 
-#: config/sources.php.dist:543
+#: config/sources.php.dist:606
 msgid "Global Address Book"
 msgstr "Global adressbok"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Grupp"
 
+#: templates/addlink/menu.inc:23
+msgid "Help"
+msgstr "Hjälp"
+
 #: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Adress, hem"
@@ -432,58 +578,58 @@
 msgid "Home Street Address"
 msgstr "Gatuadress, hem"
 
-#: config/sources.php.dist:479
+#: config/sources.php.dist:508
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "Administration av IMSP-adressbok"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
-msgstr "Import adressbok, steg %d"
+msgstr "Importera adressbok, steg %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Importera/Exportera adressböcker"
 
-#: lib/api.php:360 lib/api.php:586
-msgid "Invalid Content-Type"
-msgstr "Felaktig Content-Type"
-
-#: lib/api.php:423 lib/api.php:513
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "Felaktigt ID"
 
-#: lib/api.php:191 lib/api.php:318 lib/api.php:419 lib/api.php:509
-#: lib/api.php:562 lib/api.php:877
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1108
 msgid "Invalid address book"
 msgstr "Felaktig adressbok"
 
-#: lib/api.php:881 lib/api.php:955 lib/api.php:1008
+#: lib/api.php:1112 lib/api.php:1185 lib/api.php:1238
 msgid "Invalid email"
-msgstr "Felaktig e-post"
+msgstr "Ogiltig e-postadress"
 
-#: lib/api.php:889
+#: lib/api.php:1120
 msgid "Invalid entry"
 msgstr "Felaktigt värde"
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Felaktig nyckel angiven."
 
-#: lib/api.php:885
+#: lib/api.php:1116
 msgid "Invalid name"
 msgstr "Felaktigt namn"
 
-#: lib/api.php:566
+#: lib/api.php:753
 msgid "Invalid objectId"
 msgstr "Felaktigt objektId"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr "LDAP-stöd krävs, men LDAP-modulen är inte tillgänglig eller laddad."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Senast ändrad"
 
@@ -491,23 +637,35 @@
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: templates/browse/column_headers.inc:8
+#: addlink.php:55
+msgid "Link added."
+msgstr "Länk lades till."
+
+#: addlink.php:64
+msgid "Link canceled."
+msgstr "Länk avbruten."
+
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Lista"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "Matchar"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "Maximalt antal kontakter"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Maximalt antal sidor"
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Mini sök"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Menylista"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "Saknar DN i LDAP-konfigurationen."
 
@@ -515,62 +673,64 @@
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Ändring misslyckades: (%s) %s"
 
-#: lib/api.php:994
+#: lib/api.php:1224
 msgid "More than 1 entry found"
-msgstr "Mer än 1 värde returnerades"
+msgstr "Mer än 1 post hittades"
 
-#: templates/browse/actions.inc:11
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Flytta"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Flytta vänster"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Flytta höger"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry"
 
-#: lib/api.php:914
+#: lib/api.php:1144
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr "Flera personer med adressen [%s], men ingen med namnet [%s] existerar"
 
-#: config/sources.php.dist:183 config/sources.php.dist:314
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+msgid "My Address Book"
 msgstr "Min adressbok"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr "Mina adressböcker"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Namn"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Namnformatering"
 
-#: config/sources.php.dist:84
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter medlemskatalog"
 
-#: add.php:45 add.php:112 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "Ny lista"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Nästa"
 
@@ -578,36 +738,36 @@
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: lib/api.php:996 lib/api.php:1045
+#: lib/api.php:1226 lib/api.php:1275
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Post %s saknas för %s"
 
-#: lib/api.php:964
+#: lib/api.php:1194
 msgid "No address books found."
-msgstr "Ingen dressbok hittades."
+msgstr "Ingen adressbok hittades."
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr "Inga kontakter hittades."
 
-#: lib/api.php:340
+#: lib/api.php:513 lib/api.php:784
 msgid "No vCard data was found."
-msgstr "Ingen information om vCard hittades."
+msgstr "Ingen vCard-information hittades."
 
 #: templates/browse/footer.inc:7
 msgid "None"
-msgstr "Ingen"
+msgstr "Inga"
 
 #: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Anteckningar"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Antal poster per sida"
 
-#: lib/api.php:442
+#: lib/api.php:632 lib/api.php:765
 msgid "Object not found"
 msgstr "Objektet hittades inte"
 
@@ -615,7 +775,25 @@
 msgid "Office"
 msgstr "Kontor"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+"När du sparar denna sida med inställningar, så kommer adressboken att "
+"raderas. Om detta inte är vad du vill åstakomma så måste du ändra ditt val "
+"till 'Ingen'."
+
+#: lib/api.php:792
+msgid "Only one vcard supported."
+msgstr "Endast ett vCard stöds."
+
+#: templates/addlink/menu.inc:13
+msgid "Options"
+msgstr "Inställningar"
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Andra inställningar"
 
@@ -623,49 +801,73 @@
 msgid "PGP Public Key"
 msgstr "Publik PGP-nyckel"
 
-#: lib/api.php:324 lib/api.php:429 lib/api.php:519 lib/api.php:578
-#: lib/api.php:735 lib/api.php:895
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:965
+#: lib/api.php:1129
 msgid "Permission Denied"
-msgstr "Behörighet nekades"
+msgstr "Åtkomst nekad"
 
-#: lib/Driver.php:454
+#: lib/Driver.php:550
 msgid "Permission denied"
-msgstr "Behörighet nekades"
+msgstr "Åtkomst nekad"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Behörigheter"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
-msgstr "Pine"
+msgstr "Pine adressbok"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
-msgstr "Ange namnet på den nya listan:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "Skriv in ett namn på den nya kontaktlistan:"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Var god ange en katalogen:"
+#: templates/addlink/contacts.inc:96
+msgid "Please select contact"
+msgstr "Var god välj kontakt"
 
-#: config/sources.php.dist:395
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "Föregående"
+
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Privat adressbok"
 
-#: lib/Driver/ldap.php:155
+#: templates/addlink/menu.inc:18
+msgid "Problem"
+msgstr "Problem"
+
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Sökning misslyckades: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "Snabbsök"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:441
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Läsning misslyckades: (%s) %s"
 
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "Funktionen att läsa kontakter är inte tillgänglig."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "Radera den här kontakten?"
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Poster visade:"
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "Radera adressbok"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Ta bort kolumn"
@@ -674,19 +876,19 @@
 msgid "Remove from this list"
 msgstr "Ta bort från aktuell lista"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Ersätt befintlig adressbok med den importerade? <b>Varning: Alla poster i "
-"aktuell adressbok kommer att raderas.</b>"
+"Ersätt befintlig adressbok med den importerade? <strong>Varning: Alla poster "
+"i aktuell adressbok kommer att raderas.</strong>"
 
-#: lib/Driver.php:344
+#: lib/Source.php:282 lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Efterfrågat objekt saknas."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Återställ till grundinställningar"
 
@@ -694,166 +896,222 @@
 msgid "S/MIME Public Certificate"
 msgstr "Publikt S/MIME-certifikat"
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr "STARTTLS misslyckades: (%s) %s"
 
-#: add.php:46 edit.php:57
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Spara"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "Funktionen att spara kontakter är inte tillgänglig."
+
+#: templates/addlink/contacts.inc:89 templates/browse/search.inc:97
+#: templates/browse/search.inc:113 templates/block/minisearch.inc:21
+#: lib/Block/tree_menu.php:49 config/prefs.php.dist:126
 msgid "Search"
 msgstr "Sök"
 
-#: browse.php:267 minisearch.php:66
-msgid "Search Results"
-msgstr "Sökresultat"
-
-#: lib/api.php:811
+#: lib/api.php:1042
 msgid "Search failed"
 msgstr "Sökning misslyckades"
 
-#: lib/api.php:904 lib/api.php:910 lib/api.php:919 lib/api.php:932
+#: lib/api.php:1134 lib/api.php:1140 lib/api.php:1149 lib/api.php:1162
 #, php-format
 msgid "Search failed: %s"
 msgstr "Sökning misslyckades: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Sökinställningar"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "Funktionen att söka är inte tillgänglig."
 
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Söker..."
 
+#: templates/addlink/contacts.inc:126
+msgid "Select"
+msgstr "Välj"
+
 #: templates/browse/select.inc:9
 msgid "Select Address Book"
 msgstr "Välj adressbok"
 
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "Välj lista"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "Välj adressbok som skall raderas"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "Välj adressbok att redigera"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Välj adressbok att exportera från:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Välj adressbok att importera till:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Välj teckenuppsättning på importfilen:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Välj exportformat:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Välj fil som skall importeras:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
-msgstr "Ange format på importfilen:"
+msgstr "Välj format på importfilen:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Välj format för visning av namn:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Välj vy som skall visas som default."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr "Välj standardvy, sorterings- och sidinställningar."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Välj vilka fält som visas i adresslistan."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Välj hur namn visas."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Valda kolumner:"
-
-#: add.php:59
+#: add.php:54
 #, php-format
-msgid "Selected address book '%s'."
+msgid "Selected address book \"%s\"."
 msgstr "Vald adressbok '%s'."
 
-#: config/sources.php.dist:248
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Delad katalog"
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "_Visa alla"
-
 #: templates/browse/select.inc:11
 msgid "Show"
 msgstr "Visa"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "Visa %s"
+
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Visa alla"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Visa kontakter"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Visa listor"
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "Visa _kontakter"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "Visa _listor"
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr "Sorteringsriktning"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "Källor"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr "Ange var resultat från avancerad sökning skall visas."
 
-#: browse.php:156
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "Lade till %d kontakt(er) till listan."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s lades till i %s"
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Skapade kontaktlistan '%s'."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "Raderade %d kontakt(er)."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "Raderade %d kontakt(er) från listan."
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/export.inc:18 templates/data/import.inc:19
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tabseparerade värden"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+"VFS-backend behöver konfigureras för att aktivera uppladdning av bilagor."
+
+#: lib/Driver.php:1076
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Adressbok '%s' finns inte."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Adressboken '%s' skapades."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Adressboken '%s' raderades."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Adressboken '%s' uppdaterades."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Adressboken kunde inte tömmas: %s"
 
-#: display.php:23 edit.php:24 vcard.php:22
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
-msgstr "Kontakten du söker existerar inte."
+msgstr "Kontakten du söker finns inte."
 
-#: browse.php:58
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Filen '%s' raderades."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "Importen kan avslutas trots varningar."
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Det finns inga adressböcker att visa."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -863,7 +1121,7 @@
 "till kontakter i dem, Om du tror att det är ett fel, kontakta din system "
 "administratör."
 
-#: add.php:108
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -871,100 +1129,121 @@
 "Det uppstod problem  när kontakten skulle läggas till. Kontakta din "
 "systemadministratör för ytterligare hjälp."
 
-#: browse.php:212
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "Det uppstod fel vid skapande av ny lista."
 
-#: browse.php:163
+#: addressbooks.php:38
 #, php-format
-msgid "There was an error deleting %s from the source address book."
+msgid "There was an error creating this address book: %s"
+msgstr "Fel uppstod när adressboken '%s' skulle skapas."
+
+#: browse.php:166
+#, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "Det uppstod fel vid radering av %s från adressboken."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Det uppstod fel vid radering av kontakten: %s"
 
-#: browse.php:93
-msgid "There was an error deleting this object."
-msgstr "Det uppstod fel vid radering av objektet."
-
-#: browse.php:297
-msgid "There was an error displaying the select List"
-msgstr "Det uppstod fel vid visning av den valda listan."
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "Det uppstod fel vid visning av listan"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Det uppstod fel vid import av data: %s."
 
-#: lib/api.php:336
+#: lib/api.php:509 lib/api.php:779
 msgid "There was an error importing the iCalendar data."
-msgstr "Fel vid import av iCalendar data."
+msgstr "Fel vid import av iCalendar-data."
 
-#: browse.php:83
-msgid "There was an error removing this object."
-msgstr "Det uppstod fel vid radering av objektet."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Det uppstod fel vid radering av adressboken: %s"
 
-#: edit.php:84
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Det uppstod fel vid uppdatering av adressboken: %s."
+
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Det uppstod fel vid uppdatering av posten: %s."
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Inga adresser att exportera."
 
-#: lib/Driver.php:404 lib/Driver.php:445
-msgid "This address book is read-only"
-msgstr "Adressbok kan endast läsas"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "Adressböckerna visas i den här ordningen:"
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Kolumnerna visas i den här ordningen:"
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Filformatet stöds inte."
 
-#: lib/api.php:923 lib/api.php:936
+#: lib/api.php:1153 lib/api.php:1166
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Personen har redan ett värde för %s i adressboken"
 
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr "Förvald adressbok för nya och importerade kontakter."
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titel"
 
-#: lib/Driver.php:825
+#: lib/Turba.php:443
+msgid "Unable to create new share. Missing source type."
+msgstr "Kan inte skapa ny utdelning. Källtyp saknas."
+
+#: lib/Driver.php:1000
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Kan inte ladda definitionen av %s."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Ångra ändringar"
 
-#: lib/api.php:471
-msgid "Unsupported Content-Type."
-msgstr "Content-Type stöds inte."
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Content-Type stöds inte: %s"
 
-#: config/sources.php.dist:147
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign katalog"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
-msgid "View '%s'"
+msgid "View \"%s\""
 msgstr "Visa '%s'"
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
 msgstr "Visa kontakt"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Vy som skall visas som default:"
 
 #: config/attributes.php.dist:208
 msgid "Website URL"
-msgstr "Websideadress"
+msgstr "Webbadress"
 
 #: config/attributes.php.dist:113
 msgid "Work Address"
@@ -994,11 +1273,12 @@
 msgid "Work Street Address"
 msgstr "Gatuadress, arbete"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "Du skapar en distributionslista."
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "Du har inte behörighet skapa mer än %d kontakter i '%s'."
 
-#: display.php:58 edit.php:44
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Du har inte behörig att visa aktuell kontakt."
 
@@ -1006,7 +1286,11 @@
 msgid "You do not have permission to view this object."
 msgstr "Du har inte behörighet att visa objektet."
 
-#: templates/browse/javascript.inc:51
+#: lib/Turba.php:531
+msgid "You do not have permissions to delete this source."
+msgstr "Du har inte behörighet att radera denna källa."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Du måste välja en adressbok."
 
@@ -1014,40 +1298,64 @@
 msgid "You must select a target list."
 msgstr "Du måste välja en lista."
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: templates/addlink/contacts.inc:44
+msgid "You must select an address first."
+msgstr "Du måste ange en adress först."
+
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "Välj minst en kontakt först."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Välj minst en post först."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr "Du har enbart behörighet att visa aktuell kontakt."
 
-#: templates/browse/contactrow.inc:12
+#: browse.php:318
+msgid "Your default address book is not browseable."
+msgstr "Din förvalda adressbok är inte läsbar."
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[Inget värde]"
 
-#: lib/Turba.php:275
-msgid "_Add"
-msgstr "Lägg _till"
-
-#: lib/Turba.php:274
+#: lib/Turba.php:554
 msgid "_Browse"
 msgstr "_Lista"
 
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "_Kontakter"
+
 #: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "_Radera"
 
-#: lib/Turba.php:280
+#: lib/Turba.php:563
 msgid "_Import/Export"
-msgstr "_Importera/Exportera"
+msgstr "_Import/Export"
+
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "_Listor"
+
+#: lib/Turba.php:551
+msgid "_My Address Books"
+msgstr "Adressböcker"
+
+#: lib/Turba.php:557
+msgid "_New Contact"
+msgstr "_Ny kontakt"
 
 #: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "_Radera från listan."
 
-#: lib/Turba.php:276
+#: lib/Turba.php:559
 msgid "_Search"
 msgstr "_Sök"
 
@@ -1055,19 +1363,39 @@
 msgid "contact.vcf"
 msgstr "kontakt.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "kontakter.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "kontakter.tsv"
 
-#: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
-msgstr "till vald adressbok"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "kontakter.vcf"
+
+#: templates/addlink/contacts.inc:80
+msgid "from"
+msgstr "från"
+
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr "ingen formatering"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "ingen"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "till kontaktlista"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "till annan adressbok"
 
-#: data.php:30 templates/data/export.inc:20 templates/data/import.inc:20
-#: templates/browse/column_headers.inc:7
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/lib/Driver.php
+++ mod/lib/Driver.php
@@ -1,17 +1,13 @@
 <?php
-
-require_once 'Horde/History.php';
-
 /**
  * The Turba_Driver:: class provides a common abstracted interface to the
  * various directory search drivers.  It includes functions for searching,
  * adding, removing, and modifying directory entries.
  *
- * $Horde: turba/lib/Driver.php,v 1.57.2.12 2005/10/13 21:10:31 selsky Exp $
+ * $Horde: turba/lib/Driver.php,v 1.57.2.22 2006/03/03 16:45:54 jan Exp $
  *
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @author  Jon Parise <jon at csh.rit.edu>
- * @since   Turba 0.0.1
  * @package Turba
  */
 class Turba_Driver {
@@ -61,27 +57,14 @@
     var $strict = array();
 
     /**
-     * Whether this source is publicly searchable.
+     * Whether this source stores one address book, or multiple private address
+     * books.
      *
      * @var boolean
      */
     var $public = false;
 
     /**
-     * Whether this source is read-only (not editable).
-     *
-     * @var boolean
-     */
-    var $readonly = true;
-
-    /**
-     * Any admins for this source.
-     *
-     * @var array
-     */
-    var $admin = array();
-
-    /**
      * Hash holding the driver's additional parameters.
      *
      * @var array
@@ -96,6 +79,20 @@
     var $_capabilities = array();
 
     /**
+     * Horde_Share object for this source.
+     *
+     * @var Horde_Share
+     */
+     var $share;
+
+     /**
+      * Are Horde_Shares enabled for this source?
+      *
+      * @var boolean
+      */
+     var $usingShares;
+
+    /**
      * Constructs a new Turba_Driver object.
      *
      * @param array $params  Hash containing additional configuration
@@ -164,22 +161,89 @@
     {
         $search = array();
         $strict_search = array();
+        $search_terms = array();
+        $subsearch = array();
+        $temp = '';
+        $lastChar = '\"';
+        $glue = '';
+
         foreach ($criteria as $key => $val) {
             if (isset($this->map[$key])) {
                 if (is_array($this->map[$key])) {
-                    $subsearch = array();
+                    /* Composite field, break out the search terms. */
+                    $parts = explode(' ', $val);
+                    if (count($parts) > 1) {
+                        /* Only parse if there was more than 1 search term and
+                         * 'AND' the cumulitive subsearches. */
+                        for ($i = 0; $i < count($parts); $i++) {
+                            $term = $parts[$i];
+                            $firstChar = substr($term, 0, 1);
+                            if ($firstChar =="\"") {
+                                $temp = substr($term, 1, strlen($term) - 1);
+                                $done = false;
+                                while (!$done && $i < count($parts) - 1) {
+                                    $lastChar = substr($parts[$i + 1], -1);
+                                    if ($lastChar =="\"") {
+                                        $temp .= ' ' . substr($parts[$i + 1], 0, -1);
+                                        $done = true;
+                                        $i++;
+                                    } else {
+                                        $temp .= ' ' . $parts[$i + 1];
+                                        $i++;
+                                    }
+                                }
+                                $search_terms[] = $temp;
+                            } else {
+                                $search_terms[] = $term;
+                            }
+                        }
+                        $glue = 'AND';
+                    } else {
+                        /* If only one search term, use original input and
+                           'OR' the searces since we're only looking for 1
+                           term in any of the composite fields. */
+                        $search_terms[0] = $val;
+                        $glue = 'OR';
+                    }
                     foreach ($this->map[$key]['fields'] as $field) {
                         $field = $this->toDriver($field);
                         if (!empty($strict[$field])) {
-                            $strict_search[] = array('field' => $field, 'op' => '=', 'test' => $val);
+                            /* For strict matches, use the original search
+                             * vals. */
+                            $strict_search[] = array('field' => $field,
+                                                     'op' => '=',
+                                                     'test' => $val);
                         } else {
-                            $subsearch[] = array('field' => $field, 'op' => 'LIKE', 'test' => $val);
+                            /* Create a subsearch for each individual search
+                             * term. */
+                            if (count($search_terms) > 1) {
+                                /* Build the 'OR' search for each search term
+                                 * on this field. */
+                                $atomsearch = array();
+                                for ($i = 0; $i < count($search_terms); $i++) {
+                                    $atomsearch[] = array('field' => $field,
+                                                          'op' => 'LIKE',
+                                                          'test' => $search_terms[$i]);
+                                }
+                                $subsearch[] = array('OR' => $atomsearch);
+                                unset($atomsearch);
+                                $glue = 'AND';
+                            } else {
+                                /* $parts may have more than one element, but
+                                 * if they are all quoted we will only have 1
+                                 * $subsearch. */
+                                $subsearch[] = array('field' => $field,
+                                                     'op' => 'LIKE',
+                                                     'test' => $search_terms[0]);
+                                $glue = 'OR';
+                            }
                         }
                     }
                     if (count($subsearch)) {
-                        $search[] = array('OR' => $subsearch);
+                        $search[] = array($glue => $subsearch);
                     }
                 } else {
+                    /* Not a composite field. */
                     if (!empty($strict[$this->map[$key]])) {
                         $strict_search[] = array('field' => $this->map[$key],
                                                  'op' => '=',
@@ -216,7 +280,15 @@
      */
     function toDriver($attribute)
     {
-        return isset($this->map[$attribute]) && !is_array($this->map[$attribute]) ? $this->map[$attribute] : null;
+        if (!isset($this->map[$attribute])) {
+            return null;
+        }
+
+        if (is_array($this->map[$attribute])) {
+            return $this->map[$attribute]['fields'];
+        } else {
+            return $this->map[$attribute];
+        }
     }
 
     /**
@@ -251,60 +323,97 @@
     /**
      * Searches the source based on the provided criteria.
      *
-     * TODO: Allow $criteria to contain the comparison operator (<, =, >,
+     * @todo Allow $criteria to contain the comparison operator (<, =, >,
      *       'like') and modify the drivers accordingly.
      *
-     * @param $search_criteria   Hash containing the search criteria.
-     * @param $sort_criteria     The requested sort order which is passed to
-     *                           Turba_List::sort().
-     * @param string $search_type  (optional) Do an AND or an OR search (defaults to AND).
+     * @param array $search_criteria  Hash containing the search criteria.
+     * @param string $sort_criteria   The requested sort order which is passed
+     *                                to Turba_List::sort().
+     * @param string $search_type     Do an AND or an OR search (defaults to
+     *                                AND).
+     * @param array $return_fields    A list of fields to return; defaults to
+     *                                all fields.
+     * @param array $custom_strict    A list of fields that must match exactly.
      *
-     * @return                   The sorted, filtered list of search results.
+     * @return  The sorted, filtered list of search results.
      */
     function &search($search_criteria, $sort_criteria = 'lastname',
-                     $search_type = 'AND', $sort_direction = 0)
+                     $search_type = 'AND', $sort_direction = 0,
+                     $return_fields = array(), $custom_strict = array())
     {
         require_once TURBA_BASE . '/lib/List.php';
         require_once TURBA_BASE . '/lib/Object.php';
 
-        /* If this is not a public source, enforce the requirement
-         * that the source's owner must be equal to the current
-         * user. */
+        /* If we are not using Horde_Share, enfore the requirement that the
+           current user must be the owner of the addressbook. */
         $strict_fields = array();
-        if (!$this->public && !in_array(Auth::getAuth(), $this->admin)) {
-            $search_criteria['__owner'] = Auth::getAuth();
-            $strict_fields = array($this->toDriver('__owner') => true);
+        if ($this->usingShares) {
+            $user = $this->share->get('uid');
+        } else {
+            $user = Auth::getAuth();
         }
+        $search_criteria['__owner'] = $user;
+        $strict_fields = array($this->toDriver('__owner') => true);
 
-        /* Add any fields that much match exactly for this source to
-         * the $strict_fields array. */
+        /* Add any fields that must match exactly for this source to the
+         * $strict_fields array. */
         foreach ($this->strict as $strict_field) {
             $strict_fields[$strict_field] = true;
         }
+        foreach ($custom_strict as $strict_field) {
+            $strict_fields[$this->map[$strict_field]] = true;
+        }
 
-        /* Translate the Turba attributes to a driver-specific search
-         * array. */
+        /* Translate the Turba attributes to driver-specific attributes. */
         $fields = $this->makeSearch($search_criteria, $search_type, $strict_fields);
+        if (count($return_fields)) {
+            $return_fields_pre = array_unique(array_merge(array('__key', '__type', '__owner', 'name'), $return_fields));
+            $return_fields = array();
+            foreach ($return_fields_pre as $field) {
+                $result = $this->toDriver($field);
+                if (is_array($result)) {
+                    foreach ($result as $composite_field) {
+                        $composite_result = $this->toDriver($composite_field);
+                        if ($composite_result) {
+                            $return_fields[] = $composite_result;
+                        }
+                    }
+                } elseif ($result) {
+                    $return_fields[] = $result;
+                }
+            }
+        } else {
+            $return_fields = array_values($this->fields);
+        }
 
         /* Retrieve the search results from the driver. */
-        $results = $this->_search($fields, array_values($this->fields));
+        $objects = $this->_search($fields, $return_fields);
+        if (is_a($objects, 'PEAR_Error')) {
+            return $objects;
+        }
 
         /* Translate the driver-specific fields in the result back to the more
          * generalized common Turba attributes using the map. */
-        $results = $this->toTurbaKeys($results);
-        if (is_a($results, 'PEAR_Error')) {
-            return $results;
-        }
+        $objects = $this->toTurbaKeys($objects);
 
         require_once TURBA_BASE . '/lib/Object.php';
-        require_once TURBA_BASE . '/lib/Group.php';
         $list = &new Turba_List();
-        foreach ($results as $attributes) {
-            if (!empty($attributes['__type']) &&
-                $attributes['__type'] == 'Group') {
-                $list->insert(new Turba_Group($this, $attributes));
-            } else {
-                $list->insert(new Turba_Object($this, $attributes));
+        foreach ($objects as $object) {
+            $done = false;
+            if (!empty($object['__type']) && ucwords($object['__type']) != 'Object') {
+                $type = ucwords($object['__type']);
+                $class = 'Turba_Object_' . $type;
+                if (!class_exists($class)) {
+                    require_once TURBA_BASE . '/lib/Object/' . $type . '.php';
+                }
+
+                if (class_exists($class)) {
+                    $list->insert(new $class($this, $object));
+                    $done = true;
+                }
+            }
+            if (!$done) {
+                $list->insert(new Turba_Object($this, $object));
             }
         }
         $list->sort($sort_criteria, $sort_direction);
@@ -318,7 +427,7 @@
      *
      * @param array $objectIds  The unique ids of the objects to retrieve.
      *
-     * @return array  The array of retrieved objects (Turba_AbstractObjects).
+     * @return array  The array of retrieved objects (Turba_Objects).
      */
     function &getObjects($objectIds)
     {
@@ -327,18 +436,19 @@
 
         $objects = $this->_read($criteria, $objectIds, array_values($this->fields));
         if (!is_array($objects)) {
-            return $result = PEAR::raiseError(_("Requested object not found."));
+            $result = PEAR::raiseError(_("Requested object not found."));
+            return $result;
         }
 
         $results = array();
         $objects = $this->toTurbaKeys($objects);
         foreach ($objects as $object) {
             $done = false;
-            if (!empty($object['__type'])) {
+            if (!empty($object['__type']) && ucwords($object['__type']) != 'Object') {
                 $type = ucwords($object['__type']);
-                $class = 'Turba_' . $type;
+                $class = 'Turba_Object_' . $type;
                 if (!class_exists($class)) {
-                    @require_once TURBA_BASE . '/lib/' . $type . '.php';
+                    require_once TURBA_BASE . '/lib/Object/' . $type . '.php';
                 }
 
                 if (class_exists($class)) {
@@ -359,21 +469,23 @@
      *
      * @param string $objectId  The unique id of the object to retrieve.
      *
-     * @return Turba_AbstractObject  The retrieved object.
+     * @return Turba_Object  The retrieved object.
      */
     function &getObject($objectId)
     {
         $result = &$this->getObjects(array($objectId));
         if (is_a($result, 'PEAR_Error')) {
-            return $result;
+            // Fall through.
         } elseif (empty($result[0])) {
-            return $result = PEAR::raiseError('No results');
+            $result = PEAR::raiseError('No results');
         } else {
+            $result = $result[0];
             if (!isset($this->map['__owner'])) {
-                $result[0]->attributes['__owner'] = Auth::getAuth();
+                $result->attributes['__owner'] = Auth::getAuth();
             }
-            return $result[0];
         }
+
+        return $result;
     }
 
     /**
@@ -386,15 +498,22 @@
      */
     function add($attributes)
     {
-        if ($this->readonly) {
-            return PEAR::raiseError(_("This address book is read-only"));
-        }
-
+        /* Only set __type and __owner if they are not already set. */
         if (!isset($attributes['__type'])) {
             $attributes['__type'] = 'Object';
         }
-        if (isset($this->map['__owner'])) {
-            $attributes['__owner'] = Auth::getAuth();
+        if (isset($this->map['__owner']) && !isset($attributes['__owner'])) {
+            if (strpos($this->name , ':')) {
+                 list($source, $attributes['__owner']) = explode(':', $this->name, 2);
+            } else {
+                $attributes['__owner'] = Auth::getAuth();
+            }
+        }
+
+        /* Get field values before we translate keys so we can use
+         * them in the history log. */
+        if (isset($attributes['__owner'])) {
+            $turbaOwner = $attributes['__owner'];
         }
         if (!isset($attributes['__uid'])) {
             $attributes['__uid'] = $this->generateUID();
@@ -411,7 +530,7 @@
 
         /* Log the creation of this item in the history log. */
         $history = &Horde_History::singleton();
-        $history->log('turba:' . (!empty($attributes['__owner']) ? $attributes['__owner'] : Auth::getAuth()) . ':' . $uid, array('action' => 'add'), true);
+        $history->log('turba:' . (!empty($turbaOwner) ? $turbaOwner : Auth::getAuth()) . ':' . $uid, array('action' => 'add'), true);
 
         return $key;
     }
@@ -423,16 +542,12 @@
      */
     function delete($object_id)
     {
-        if ($this->readonly) {
-            return PEAR::raiseError(_("This address book is read-only"));
-        }
-
         $object = &$this->getObject($object_id);
         if (is_a($object, 'PEAR_Error')) {
             return $object;
         }
 
-        if (!Turba::hasPermission($object, 'object', PERMS_DELETE)) {
+        if (!$object->hasPermission(PERMS_DELETE)) {
             return PEAR::raiseError(_("Permission denied"));
         }
 
@@ -452,32 +567,33 @@
     }
 
     /**
-     * Deletes all contacts from the address book.
+     * Deletes all contacts from an address book.
      *
-     * @return boolean  True if the operation worked.
+     * @param string  $sourceName  The identifier of the address book to
+     *                             delete.  If omitted, will clear the current
+     *                             user's 'default' address book for this source
+     *                             type.
+     *
+     * @return mixed  True on success, PEAR_Error on failure.
      */
-    function deleteAll()
+    function deleteAll($sourceName = '')
     {
         if (!$this->hasCapability('delete_all')) {
             return PEAR::raiseError('Not supported');
         } else {
-            return $this->_deleteAll();
+            return $this->_deleteAll($sourceName);
         }
     }
 
     /**
      * Modifies an existing entry in the contact source.
      *
-     * @param Turba_AbstractObject $object  The object to update.
+     * @param Turba_Object $object  The object to update.
      *
      * @return string  The object id, possibly updated.
      */
     function save($object)
     {
-        if ($this->readonly) {
-            return PEAR::raiseError(_("Address book is read-only."));
-        }
-
         $attributes = $this->toDriverKeys($object->getAttributes());
         $key = $this->toDriverKeys(array('__key' => $object->getValue('__key')));
         list($object_key, $object_id) = each($key);
@@ -498,6 +614,26 @@
     }
 
     /**
+     * Returns the number of contacts of the current user in this address book.
+     *
+     * @return integer  The number of contacts that the user owns.
+     */
+    function countContacts()
+    {
+        static $count;
+
+        if (!isset($count)) {
+            $count = $this->_search(array('AND' => array(array('field' => $this->toDriver('__owner'), 'op' => '=', 'test' => Auth::getAuth()))), array($this->toDriver('__key')));
+            if (is_a($count, 'PEAR_Error')) {
+                return $count;
+            }
+            $count = count($count);
+        }
+
+        return $count;
+    }
+
+    /**
      * Returns the criteria available for this source except '__key'.
      *
      * @return array  An array containing the criteria.
@@ -535,9 +671,9 @@
     }
 
     /**
-     * Exports a given Turba_AbstractObject as an iCalendar vCard.
+     * Exports a given Turba_Object as an iCalendar vCard.
      *
-     * @param Turba_AbstractObject $object  A Turba_AbstractObject.
+     * @param Turba_Object $object  A Turba_Object.
      *
      * @return Horde_iCalendar_vcard  A Horde_iCalendar_vcard object.
      */
@@ -648,7 +784,7 @@
      *
      * @return array  A Turba attribute hash.
      */
-    function toHash($vcard)
+    function toHash(&$vcard)
     {
         if (!is_a($vcard, 'Horde_iCalendar_vcard')) {
             return PEAR::raiseError('Invalid parameter for Turba_Driver::toHash(), expected Horde_iCalendar_vcard object.');
@@ -811,6 +947,36 @@
     }
 
     /**
+     * Checks if the current user has the requested permissions on this
+     * source.
+     *
+     * @param integer $perm  The permission to check for.
+     *
+     * @return boolean  True if the user has permission, otherwise false.
+     */
+     function hasPermission($perm)
+     {
+         if ($this->usingShares) {
+             return $this->share->hasPermission(Auth::getAuth(), $perm);
+         } else {
+             return Turba::hasPermission($this->name, 'source', $perm);
+         }
+     }
+
+    /**
+     * Creates an object key for a new object.
+     *
+     * @param array $attributes  The attributes (in driver keys) of the
+     *                           object being added.
+     *
+     * @return string  A unique ID for the new object.
+     */
+    function _makeKey($attributes)
+    {
+        return md5(mt_rand());
+    }
+
+    /**
      * Static method to construct Turba_Driver objects. Use this so that we
      * can return PEAR_Error objects if anything goes wrong.
      *
@@ -832,7 +998,8 @@
         if (class_exists($class)) {
             $driver = &new $class($config['params']);
         } else {
-            return $driver = PEAR::raiseError(sprintf(_("Unable to load the definition of %s."), $class));
+            $driver = PEAR::raiseError(sprintf(_("Unable to load the definition of %s."), $class));
+            return $driver;
         }
 
         $result = $driver->_init();
@@ -862,18 +1029,26 @@
             $driver->strict = $config['strict'];
         }
 
-        /* Store admins. */
-        if (isset($config['admin'])) {
-            $driver->admin = $config['admin'];
-        }
-
-        /* Set flags. */
-        if (isset($config['public'])) {
-            $driver->public = $config['public'];
-        }
-        if (isset($config['readonly'])) {
-            $driver->readonly = $config['readonly'] &&
-                (!isset($config['admin']) || !in_array(Auth::getAuth(), $config['admin']));
+        /* Get a share object if we need it. */
+        if (!empty($config['use_shares'])) {
+            if ((strpos($name, ':') === false)) {
+                if (!$GLOBALS['turba_shares']->exists($name . ':' . Auth::getAuth())) {
+                    /* User's 'default' share for this source type not present */
+                    $params = array('sourceType' => $name);
+                    $share = &Turba::createShare($params, true);
+                    if (is_a($share, 'PEAR_Error')) {
+                        return $share;
+                    }
+                }
+                $name .= ':' . Auth::getAuth();
+            }
+            $driver->share = &$GLOBALS['turba_shares']->getShare($name);
+            if (is_a($driver->share, 'PEAR_Error')) {
+                return $driver->share;
+            }
+            $driver->usingShares = true;
+        } else {
+            $driver->usingShares = false;
         }
 
         return $driver;
@@ -889,18 +1064,20 @@
      *
      * @param string $name   String containing the internal name of this
      *                       source.
-     * @param array $config  Array containing the configuration information for
-     *                       this source.
      *
      * @return Turba_Driver  The concrete Turba_Driver reference, or a
      *                       PEAR_Error on error.
      */
-    function &singleton($name, $config)
+    function &singleton($name)
     {
         static $instances = array();
 
         if (!isset($instances[$name])) {
-            $instances[$name] = &Turba_Driver::factory($name, $config);
+            if (!isset($GLOBALS['cfgSources'][$name])) {
+                $error = PEAR::raiseError(sprintf(_("The address book \"%s\" does not exist."), $name));
+                return $error;
+            }
+            $instances[$name] = &Turba_Driver::factory($name, $GLOBALS['cfgSources'][$name]);
         }
 
         return $instances[$name];


--- orig/po/gl_ES.po
+++ mod/po/gl_ES.po
@@ -16,7 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 1.1\n"
-"POT-Creation-Date: 2003-04-04 12:00+0100\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-08-19 12:13GMT+1\n"
 "Last-Translator: guille <guille at usc.es>\n"
 "Language-Team: Galego\n"
@@ -25,402 +26,1370 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr "Nome, Apelidos (p.e. Xoan Gómez)"
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr "Apelidos, Nome (p.e. Gómez, Xoan)"
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "O arquivo %s importouse correctamente"
 
-msgid "Add Contact ..."
-msgstr "Engadir un contacto ..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "Engadir un novo contacto"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Importar a axenda de enderezos"
 
-msgid "Add failed"
-msgstr "Fallou ó engadir"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
 
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
+
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Engadir"
 
-msgid "Addressbook is read-only."
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "A axenda de enderezos non é válida."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Non hai ningunha axenda de enderezos onde se poida escribir."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "engadir unha columna"
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "Fallou ó engadir"
+
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "Engadir"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: browse.php:28 config/prefs.php.dist:125
+#, fuzzy
+msgid "Address Book Listing"
+msgstr "A axenda de enderezos soamente é de lectura."
+
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Exportar a axenda de enderezos"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "A axenda de enderezos soamente é de lectura."
+
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "O arquivo %s importouse correctamente"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
 msgstr "A axenda de enderezos soamente é de lectura."
 
-msgid "Advanced Directory Search"
-msgstr "Busca avanzada no directorio"
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
 
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Alcume"
 
-msgid "An illegal value was specified."
-msgstr "O valor especificado non é válido"
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
 
-msgid "Available Columns:"
-msgstr "Columnas dispoñibles:"
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
+
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "Buscar"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
 
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Examinar"
 
-msgid "Cancel"
-msgstr "Cancelar"
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "Teléfono móbil"
+#: data.php:49
+msgid "CSV"
+msgstr ""
 
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Escolla a orde das columnas que se verán na lista de enderezos."
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "A axenda de enderezos non é válida."
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "A axenda de enderezos non é válida."
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
 
-msgid "Clear Search"
-msgstr "Borrar a busca"
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr "Escolla a orde das columnas que se verán na lista de enderezos."
 
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Opcións da columna"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Compañía"
 
-#, c-format
-msgid "Contents of %s"
-msgstr "Contido de %s"
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Enderezo persoal"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Fallou ó borrar"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "Fallou ó borrar"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "Compañía"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Exportar a axenda de enderezos"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
 
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Borrar"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Fallou ó borrar"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Fallou ó borrar"
 
-msgid "Default Display"
-msgstr "Vista a amosar por defecto"
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
 
-msgid "Directory Listing"
-msgstr "Lista do directorio"
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
 
-msgid "Directory Search"
-msgstr "Busca no directorio"
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "Opcións do usuario"
 
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Directorio"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Opcións de visualización"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Opcións de visualización"
 
-#, c-format
-msgid "Edit '%s'"
-msgstr "Editar '%s'"
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
 
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Editar"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Editar '%s'"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Exportar a axenda de enderezos"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "Correo Electrónico"
 
-msgid "Error"
-msgstr "Erro"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Export Address Book"
-msgstr "Exportar a axenda de enderezos"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "O arquivo %s importouse correctamente"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Non hai ningunha axenda de enderezos onde se poida escribir."
 
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportar"
 
-#, c-format
-msgid "Failed to browse the directory: %s"
+#: templates/data/export.inc:6
+msgid "Export Address Book"
+msgstr "Exportar a axenda de enderezos"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
+msgstr "Fallou o buscar no directorio: %s"
+
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Fallou o buscar no directorio: %s"
+
+#: browse.php:272
+#, fuzzy
+msgid "Failed to browse list"
+msgstr "Fallou ó buscar no directorio: %s"
+
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
 msgstr "Fallou ó buscar no directorio: %s"
 
-msgid "Failed to connect to the specified directory."
-msgstr "Fallou ó conectar co directorio especificado."
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "Fallou o buscar no directorio: %s"
 
-#, c-format
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Fallou o buscar no directorio: %s"
+
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Fallou o buscar no directorio: %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fax"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Título"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Atopar"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Atopar"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "De"
 
-msgid "Help"
-msgstr "Axuda"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
 
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Enderezo persoal"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "Teléfono persoal"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Teléfono persoal"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "Se importa datos CSV: A primeira fila, ¿contén os nomes dos campos?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Teléfono persoal"
 
-msgid "Illegal or malformed form data."
-msgstr "O datos do formulario non son válidos ou están mal formados."
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "Teléfono persoal"
 
-msgid "Import Address Book"
-msgstr "Importar a axenda de enderezos"
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Enderezo persoal"
 
-msgid "Import"
-msgstr "Importar"
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
 
-msgid "Import/Export Addressbooks"
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr ""
+
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Importar a axenda de enderezos"
+
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "Importar/exportar a axenda de enderezos"
 
-msgid "Import/Export"
-msgstr "Importar/exportar"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "O nome non é válido."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "A axenda de enderezos non é válida."
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "O enderezo de correo non é válido."
 
-msgid "Invalid name."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
 msgstr "O nome non é válido."
 
-msgid "Language"
-msgstr "Lingua"
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "O valor especificado non é válido"
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "O nome non é válido."
+
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "O nome non é válido."
+
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Nome"
 
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Listar"
 
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "que coincida con"
 
-msgid "Message"
-msgstr "Mensaxe"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Listar"
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "Buscar"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Teléfono persoal"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "mover á esquerda"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "mover á dereita"
+
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Exportar a axenda de enderezos"
 
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nome"
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+#: config/prefs.php.dist:31
+msgid "Name Format"
+msgstr "Formato do nome"
+
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
 msgstr ""
-"Ningunha das axendas de enderezos dispoñibles está configurada para "
-"permitirlle engadir novas entradas. Para amañalo, contacte co administrador "
-"do sistema."
 
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "Engadir un novo contacto"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Nome"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
+
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "A axenda de enderezos soamente é de lectura."
+
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "Notas"
+
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Notas"
 
-msgid "Options"
-msgstr "Opcións"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
 
-msgid "Please choose an address book to add a contact to."
-msgstr "Escolla unha axenda de enderezos para engadir o contacto."
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
 
-msgid "Please select a directory:"
-msgstr "Escolla un directorio:"
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
 
-msgid "Problem?"
-msgstr "¿Problemas?"
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
-msgid "Reset"
-msgstr "Limpar"
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
 
-msgid "Save Changes"
-msgstr "Gardar os cambios"
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "Opcións do usuario"
+
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
+
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
+
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
+
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Exportar a axenda de enderezos"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Buscar"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Importar a axenda de enderezos"
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "eliminar a columna"
+
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
 
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Gardar"
 
-msgid "Search Results"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "Buscar"
+
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Resultados da busca"
 
-msgid "Search"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
 msgstr "Buscar"
 
-msgid "Search&nbsp;Results"
-msgstr "Resultados&nbsp;da busca"
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "Buscar"
+
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Escolla unha axenda de enderezos para engadir o contacto."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Escolla unha axenda de enderezos para engadir o contacto."
+
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Escolla a fonte en que o quere exportar:"
 
-msgid "Select the destination to import to:"
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "Escolla o destino da importación:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Escolla a fonte en que o quere exportar:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "Escolla a fonte en que o quere exportar:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Escolla o arquivo que quere importar:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "Escolla o formato en que o quere exportar:"
 
-msgid "Select the format to import from:"
-msgstr "Escolla o formato en que o quere importar:"
+#: config/prefs.php.dist:135
+msgid "Select the format used to display names:"
+msgstr "Seleccionar o formato usado para amosar os nomes:"
 
-msgid "Select the source to export from:"
-msgstr "Escolla a fonte en que o quere exportar:"
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
+msgstr "Seleccionar vista para amosar por defecto."
 
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Escolla os campos que se verán nas listas de enderezos."
 
-msgid "Select your preferred language:"
-msgstr "Escolla a lingua:"
+#: config/prefs.php.dist:32
+msgid "Select which format to display names."
+msgstr "Seleccionar o formato para amosar os nomes."
+
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "A axenda de enderezos non é válida."
+
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Directorio"
+
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
 
-msgid "Selected Columns:"
-msgstr "Columnas escollidas:"
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr ""
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "Enviar un correo a %s"
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr ""
 
-msgid "Set your preferred display language."
-msgstr "Establece a lingua de visualización."
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Algúns dos arquivos de configuración de Turba non se dan atopados:"
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "Directorio"
 
-msgid "Success"
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
 msgstr "Correctamente"
 
-msgid "The data got lost"
-msgstr "Perdéronse os datos "
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
 
-msgid "The data got lost."
-msgstr "Perdéronse.os datos"
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
 
-msgid "The file contained no data."
-msgstr "O arquivo non contén datos."
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
 
-msgid "There are no writeable address books."
-msgstr "Non hai ningunha axenda de enderezos onde se poida escribir."
+#: data.php:50
+msgid "TSV"
+msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
+
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
 msgstr ""
-"Houbo un problema ó enviar o arquivo, que non pode ser maior có tamaño "
-"máximo permitido."
 
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "O arquivo %s importouse correctamente"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
+#, fuzzy
+msgid "There are no browseable address books."
+msgstr "Non hai ningunha axenda de enderezos onde se poida escribir."
+
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"Houbo un problema o engadir este obxecto. Contacte co administrador do "
-"sistema para obter axuda."
+"Ningunha das axendas de enderezos dispoñibles está configurada para "
+"permitirlle engadir novas entradas. Para amañalo, contacte co administrador "
+"do sistema."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error deleting this object. Contact your system administrator "
+"There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
-"Houbo un problema ó eliminar este obxecto. Contacte co administrador do "
+"Houbo un problema o engadir este obxecto. Contacte co administrador do "
 "sistema para obter axuda."
 
-msgid "There was an error importing the data."
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
 msgstr "Houbo un problema ó importar os datos."
 
-msgid "There was an error importing the uploaded file"
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
+msgstr "Houbo un problema ó importar os datos."
+
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
 msgstr "Houbo un problema ó importar o arquivo enviado"
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
-msgstr ""
-"Este arquivo controla as preferencias predeterminadas de Turba, así como as "
-"que poden mudar os usuarios."
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Houbo un problema ó importar o arquivo enviado"
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr ""
-"Este arquivo controla as follas de estilo empregadas para fixar as cores e "
-"os tipos de letra, e pode complementar ou substituír as predeterminadas de "
-"Horde."
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Houbo un problema ó importar os datos."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
-msgstr ""
-"Este arquivo define os nomes e tipos de atributos globais - nomes, enderezos "
-"de correo, etc."
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "Houbo un problema ó importar os datos."
+
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "Houbo un problema ó importar os datos."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "Este arquivo define a lista de fontes de datos dispoñibles para Turba."
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "Houbo un problema ó importar os datos."
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "Houbo un problema ó importar os datos."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Houbo un problema ó importar os datos."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Houbo un problema ó importar o arquivo enviado"
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Houbo un problema ó importar o arquivo enviado"
+
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "Houbo un problema ó importar os datos."
+
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Non hai ningunha axenda de enderezos onde se poida escribir."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
 msgstr ""
-"Este é o arquivo principal de configuración de Turba. Contén as rutas e "
-"opcións de tódolos programas de Turba."
 
-msgid "This number must be at least one."
-msgstr "O número debe ser polo menos un 1."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
 
-msgid "This person is already in your addressbook."
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "Xa está rexistrada na súa axenda de enderezos."
 
-msgid "This value must be a number."
-msgstr "O valor debe ser un número."
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Título"
 
-msgid "Turba is not properly configured"
-msgstr "O Turba non está correctamente configurado"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Non é posible cargar a definición de %s."
 
-msgid "User Options"
-msgstr "Opcións do usuario"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "Gardar os cambios"
+
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Directorio"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "Engadir un novo contacto"
 
-msgid "Warning"
-msgstr "Aviso"
+#: config/prefs.php.dist:124
+msgid "View to display by default:"
+msgstr "Vista a amosar por defecto:"
 
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
+
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "Teléfono do traballo"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Teléfono do traballo"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Teléfono do traballo"
+
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "Teléfono do traballo"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Enderezo do traballo"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
 msgstr ""
-"Non asociou ningún campo do arquivo importado ós campos correspondentes no "
-"Turba."
 
-msgid "Your Information"
-msgstr "A súa información"
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Actualizáronse as súas opcións"
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
 
-msgid "[Edit]"
-msgstr "[Editar]"
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
 
-msgid "add column"
-msgstr "engadir unha columna"
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
 
-msgid "move left"
-msgstr "mover á esquerda"
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
 
-msgid "move right"
-msgstr "mover á dereita"
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
 
-msgid "remove column"
-msgstr "eliminar a columna"
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
 
-msgid "View to display by default:"
-msgstr "Vista a amosar por defecto:"
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
 
-msgid "Select view to display by default."
-msgstr "Seleccionar vista para amosar por defecto."
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
 
-msgid "Name Format"
-msgstr "Formato do nome"
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "Examinar"
 
-msgid "Select which format to display names."
-msgstr "Seleccionar o formato para amosar os nomes."
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
 
-msgid "Select the format used to display names:"
-msgstr "Seleccionar o formato usado para amosar os nomes:"
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "Borrar"
 
-msgid "\"Firstname Lastname\"  (ie. John Doe)"
-msgstr "Nome, Apelidos (p.e. Xoan Gómez)"
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "Importar/exportar"
 
-msgid "\"Lastname, Firstname\" (ie. Doe, John)"
-msgstr "Apelidos, Nome (p.e. Gómez, Xoan)"
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Listar"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Importar a axenda de enderezos"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Engadir un novo contacto"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "Buscar"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "Importar a axenda de enderezos"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/po/nl_NL.po
+++ mod/po/nl_NL.po
@@ -4,30 +4,55 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba 2.0.3-cvs\n"
+"Project-Id-Version: Turba 2.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-23 19:49+0100\n"
-"PO-Revision-Date: 2005-03-23 21:27+0100\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2004-12-19 16:45+0100\n"
 "Last-Translator: Jan Kuipers <jrkuipers at lauwerscollege.nl>\n"
 "Language-Team: Dutch <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"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Pine adresboek"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "naar geselecteerd adresboek"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, fuzzy, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "'%s' werd niet gekopieerd, omdat het een lijst betreft."
+
+#: browse.php:124
+#, fuzzy, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "'%s' werd niet verplaatst, omdat het een lijst betreft."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Voornaam Achternaam\" (b.v. John Doe)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Achternaam, Voornaam\" (b.v. Doe, John)"
 
-#: add.php:96
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s toegevoegd."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "%s bestand met succes geimporteerd"
@@ -37,58 +62,84 @@
 msgid "%s to %s of %s"
 msgstr "%s tot %s van %s"
 
-#: browse.php:146
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s' werd niet gekopieerd, omdat het een lijst betreft."
-
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s' werd niet verplaatst, omdat het een lijst betreft."
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Pine adresboek"
 
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
 msgstr "Een browser met iFrame ondersteuning is vereist"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
 msgstr "Boven zoekformulier"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "_Uitgebreid zoeken"
+#: view.php:52
+#, fuzzy, php-format
+msgid "Access denied to %s"
+msgstr "%s met succes toegevoegd aan %s"
 
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:22
+#, fuzzy
 msgid "Add"
-msgstr "Toevoegen"
+msgstr "_Toevoegen"
+
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Ongeldig adresboek"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Geselecteerd adresboek '%s'."
 
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Kolom toevoegen"
 
+#: edit.php:128
+msgid "Add file"
+msgstr ""
+
 #: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "Toevoegen aan"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Pine adresboek"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Adresboek lijst"
 
-#: add.php:95
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Pine adresboek"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Adresboekinvoer"
 
-#: lib/Driver.php:496
-msgid "Address book is read-only."
-msgstr "Adresboek is alleen-lezen"
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Adresboek met succes geleegd."
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Adresboekinvoer"
+
+#: templates/prefs/addressbookselect.inc:170
+#, fuzzy
+msgid "Address books that will not be displayed:"
+msgstr "Het adresboek kon niet worden geleegd: %s"
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
@@ -96,55 +147,37 @@
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "Alle"
 
-#: lib/api.php:377
+#: lib/api.php:552
 msgid "Already Exists"
 msgstr "Bestaat al"
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Weet u zeker dat u %s wilt verwijderen?"
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Weet u zeker dat u de geselecteerde invoer wilt verwijderen?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Toenemend"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Beschikbare kolommen:"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "_Terug naar %s"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "Terug naar %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "_Eenvoudig zoeken"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
 msgstr "Eenvoudig zoeken"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
 msgstr "Onder zoekformulier"
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Verbinding mislukt: (%s) %s"
@@ -153,51 +186,68 @@
 msgid "Birthday"
 msgstr "Verjaardag"
 
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "_Bladeren"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Zakelijke categorie"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "He_rstel zoeken"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Controleer _Alles/Geen"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Kies een standaarddirectory voor uw persoonlijke adresbook, adreslijsten en "
-"zoekresultaten."
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "Kies een adresboek"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Kies een adresboek"
 
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Kies een adresboek"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "Kies een adresboek"
+
 #: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
 msgstr "Kies de weergavevolgorde van de kolommen in de adreslijst."
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "Herstel zoeken"
-
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Kolomopties"
 
-#: templates/data/export.inc:16 templates/data/import.inc:18
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Komma gescheiden waarden"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Komma gescheiden waarden (Microsoft Outlook)"
 
@@ -209,71 +259,81 @@
 msgid "Company Address"
 msgstr "Bedrijfsadres"
 
-#: lib/api.php:246 lib/api.php:366 lib/api.php:436 lib/api.php:526
-#: lib/api.php:572 lib/api.php:620 lib/api.php:807 lib/api.php:900
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Verbinding mislukt: %s"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Verbinding mislukt"
 
-#: browse.php:85
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "Adres van lijst verwijderd."
+
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "Adres van lijst verwijderd."
 
-#: browse.php:282
+#: browse.php:266
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Adressen in lijst: %s"
 
-#: browse.php:304
-#, php-format
-msgid "Contents of %s"
-msgstr "Inhoud van %s"
-
 #: templates/browse/actions.inc:12
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: lib/ObjectView.php:134
-msgid "Created"
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
 msgstr "Gemaakt"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Standaardweergave"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Prive adresboek"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
 msgstr ""
-"Standaarddirectory voor uw persoonlijke adresboek, adreslijsten en "
-"zoekresultaten."
 
-#: config/prefs.php.dist:72
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "Gemaakt"
+
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Standaard sorteervolgorde:"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Selecteer adresboek"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Verwijderbevestiging"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Verwijderknopgedrag"
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Verwijderen mislukt: (%s) %s"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Verwijderen mislukt"
 
@@ -281,38 +341,58 @@
 msgid "Department"
 msgstr "Afdeling"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Afnemend"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Directory"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Weergaveopties"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Weergaveopties"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
 msgstr "Wilt u het verwijderen van invoer bevestigen?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
+msgstr "Download vCard"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "Download vCard"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Bewerken"
 
-#: templates/browse/contactrow.inc:33
-#, php-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "'%s' bewerken"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Adresboek exporteren"
+
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Invoer bewerken voor %s"
@@ -321,58 +401,77 @@
 msgid "Email"
 msgstr "E-mail"
 
-#: edit.php:79
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Invoer voor %s bijgewerkt."
 
-#: templates/browse/actions.inc:6 templates/data/export.inc:46
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s bestand met succes geimporteerd"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Toegang tot adresboek mislukt: %s"
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exporteren"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Adresboek exporteren"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Alleen de geselecteerde adressen exporteren."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Het volgende adresboek volledig exporteren."
 
-#: browse.php:62 browse.php:120 browse.php:135 add.php:72 data.php:110
-#: data.php:228 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Toegang tot adresboek mislukt: %s"
 
-#: browse.php:154
+#: browse.php:139
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Toevoegen van %s aan %s mislukt: %s"
 
-#: browse.php:287
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "Bladeren in lijst mislukt"
 
-#: browse.php:318
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "Bladeren in directory mislukt"
 
-#: lib/Driver/ldap.php:321
-#, php-format
+#: lib/Driver/ldap.php:309
+#, fuzzy, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
-msgstr ""
-"Wijzigen van naam mislukt: (%s) %s; Oude DN = %s, Nieuwe DN = %s, Root = %s"
+msgstr "Wijzigen van naam mislukt: (%s) %s, %s"
 
-#: browse.php:140
+#: browse.php:120
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Vinden van toe te voegen object mislukt: %s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Toegang tot adresboek mislukt: %s"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Doorzoeken van directory %s mislukt."
@@ -381,10 +480,20 @@
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Titel"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Vinden"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Vinden"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Voornaam"
@@ -393,15 +502,15 @@
 msgid "Freebusy URL"
 msgstr "Freebusy URL"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Van"
 
-#: config/sources.php.dist:542
+#: config/sources.php.dist:604
 msgid "Global Address Book"
 msgstr "Globale adresboek"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Groep"
 
@@ -430,63 +539,65 @@
 msgstr "Staat of provincie (privé)"
 
 #: config/attributes.php.dist:88
+#, fuzzy
 msgid "Home Street Address"
 msgstr "Adres (privé)"
 
-#: config/sources.php.dist:478
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Adresboek lijst"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Adresboek importeren, stap %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Adresboeken importeren/exporteren"
 
-#: lib/api.php:360 lib/api.php:586
-msgid "Invalid Content-Type"
-msgstr "Ongeldig Content-Type"
-
-#: lib/api.php:423 lib/api.php:513
+#: lib/api.php:596 lib/api.php:683
 msgid "Invalid ID"
 msgstr "Ongeldig ID"
 
-#: lib/api.php:191 lib/api.php:318 lib/api.php:419 lib/api.php:509
-#: lib/api.php:562 lib/api.php:877
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
 msgstr "Ongeldig adresboek"
 
-#: lib/api.php:881 lib/api.php:955 lib/api.php:1008
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
 msgstr "Ongeldige e-mail"
 
-#: lib/api.php:889
+#: lib/api.php:1089
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Ongeldige sleutel opgegeven."
 
-#: lib/api.php:885
+#: lib/api.php:1085
 msgid "Invalid name"
 msgstr "Ongeldige naam"
 
-#: lib/api.php:566
+#: lib/api.php:735
 msgid "Invalid objectId"
 msgstr "Ongeldig objectId"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "LDAP ondersteuning is vereist, maar de LDAP module is niet beschikbaar of "
 "niet geladen."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
 
@@ -494,23 +605,33 @@
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Lijst"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "overeenkomend met"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "Maximum aantal pagina's."
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Maximum aantal pagina's."
 
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Nieuwe lijst"
+
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
 msgstr "Mini zoeken"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "Ontbrekende DN in de LDAP bronconfiguratie."
 
@@ -518,12 +639,12 @@
 msgid "Mobile Phone"
 msgstr "Mobiele telefoon"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Wijzigen mislukt: (%s) %s"
 
-#: lib/api.php:994
+#: lib/api.php:1193
 msgid "More than 1 entry found"
 msgstr "Meer dan 1 invoer gevonden"
 
@@ -532,49 +653,54 @@
 msgstr "Verplaatsen"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Naar links"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Naar rechts"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry adresboek"
 
-#: lib/api.php:914
+#: lib/api.php:1113
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
 "Meerdere personen met adres [%s], maar geen met naam [%s] die al bestaat"
 
-#: config/sources.php.dist:182 config/sources.php.dist:313
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
 msgstr "Mijn adresboek"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Mijn adresboek"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Naam"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Naamformaat"
 
-#: config/sources.php.dist:83
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter ledendirectory"
 
-#: add.php:45 add.php:112 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Nieuw adres"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "Nieuwe lijst"
-
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
 msgstr "Volgende"
 
@@ -582,20 +708,20 @@
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: lib/api.php:996 lib/api.php:1045
+#: lib/api.php:1195 lib/api.php:1244
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Geen %s invoer gevonden voor %s"
 
-#: lib/api.php:964
+#: lib/api.php:1163
 msgid "No address books found."
 msgstr "Geen adresboeken gevonden."
 
-#: minisearch.php:87
+#: minisearch.php:83
 msgid "No contacts found"
 msgstr "Geen adressen gevonden"
 
-#: lib/api.php:340
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
 msgstr "Geen vCard data gevonden."
 
@@ -607,11 +733,11 @@
 msgid "Notes"
 msgstr "Notities"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Aantal onderdelen per pagina"
 
-#: lib/api.php:442
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
 msgstr "Object niet gevonden."
 
@@ -619,7 +745,18 @@
 msgid "Office"
 msgstr "Kantoor"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Andere opties"
 
@@ -627,70 +764,86 @@
 msgid "PGP Public Key"
 msgstr "Openbare PGP sleutel"
 
-#: lib/api.php:324 lib/api.php:429 lib/api.php:519 lib/api.php:578
-#: lib/api.php:735 lib/api.php:895
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
 msgstr "Toegang geweigerd"
 
-#: lib/Driver.php:454
+#: lib/Driver.php:543
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "Toegang geweigerd"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine adresboek"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
 msgstr "Geef de naam van de nieuwe lijst, a.u.b:"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Selecteer een directory, a.u.b.:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-#: config/sources.php.dist:394
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Prive adresboek"
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Query mislukt: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "Snel zoeken"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:441
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Lezen mislukt: (%s) %s"
 
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Records weergegeven:"
 
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Kies een adresboek"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Kolom verwijderen"
 
-#: templates/browse/actions.inc:3
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "Uit deze lijst verwijderen."
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
+#, fuzzy
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
 "Vervang het bestaande adresboek door het geimporteerde adresboek? "
 "<b>Waarschuwing: Dit verwijdert alle invoer van uw huidige adresboek.</b>"
 
-#: lib/Driver.php:344
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Aangevraagd object niet gevonden."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
 msgstr "Herstel standaardinstellingen"
 
@@ -698,166 +851,195 @@
 msgid "S/MIME Public Certificate"
 msgstr "Openbaar S/MIME certificaat"
 
-#: lib/Driver/ldap.php:77
-#, php-format
+#: lib/Driver/ldap.php:69
+#, fuzzy, php-format
 msgid "STARTTLS failed: (%s) %s"
-msgstr "STARTTLS mislukt: (%s) %s"
+msgstr "Lezen mislukt: (%s) %s"
 
-#: add.php:46 edit.php:57
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Opslaan"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Zoeken"
 
-#: browse.php:267 minisearch.php:66
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Zoekresultaten"
 
-#: lib/api.php:811
+#: lib/api.php:1011
 msgid "Search failed"
 msgstr "Zoeken mislukt"
 
-#: lib/api.php:904 lib/api.php:910 lib/api.php:919 lib/api.php:932
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
 msgstr "Zoeken mislukt: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Zoekopties"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Zoeken..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Selecteer adresboek"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Selecteer het adresboek om vanuit te exporteren:"
 
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "Selecteer lijst"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Selecteer de agenda om naar te importeren:"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Selecteer het adresboek om vanuit te exporteren:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Selecteer de agenda om naar te importeren:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Selecteer het formaat van het bronbestand:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Selecteer het exportformaat:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Selecteer het importbestand:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Selecteer het formaat van het bronbestand:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Selecteer het formaat voor het weergeven van namen:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Selecteer de standaardweergave."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Selecteer welke velden worden weergegeven in de adreslijsten."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Selecteer het formaat voor het weergeven van namen."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Geselecteerde kolommen:"
-
-#: add.php:59
-#, php-format
-msgid "Selected address book '%s'."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
 msgstr "Geselecteerd adresboek '%s'."
 
-#: config/sources.php.dist:247
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Gedeelde directory"
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "Alle _weergeven"
-
-#: templates/browse/select.inc:11
-msgid "Show"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
 msgstr "Weergeven"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "Alle weergeven"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "Adressen weergeven"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "Lijsten weergeven"
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "_Adressen weergeven"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "_Lijsten weergeven"
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "Sorteervolgorde"
 
-#: lib/api.php:154
+#: lib/api.php:198
 msgid "Sources"
 msgstr "Bronnen"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
 msgstr "Opgeven waar u de geavanceerde zoekresultaten wilt laten verschijnen."
 
-#: browse.php:156
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s met succes toegevoegd aan %s"
 
-#: data.php:29
+#: browse.php:222
+#, fuzzy, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "%s met succes toegevoegd aan %s"
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/export.inc:18 templates/data/import.inc:19
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tab gescheiden waarden"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Het adresboek kon niet worden geleegd: %s"
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Adresboek met succes geleegd."
+
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Adresboek met succes geleegd."
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Adresboek met succes geleegd."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Het adresboek kon niet worden geleegd: %s"
 
-#: display.php:23 edit.php:24 vcard.php:22
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "Het gevraagde adres bestaat niet."
 
-#: browse.php:58
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s bestand met succes geimporteerd"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Er zijn geen door te bladeren adresboeken."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -867,7 +1049,7 @@
 "zijn geconfigureerd voor het toevoegen van nieuwe invoer. Wanneer u denkt "
 "dat dit een fout betreft, neem dan contact op met de systeembeheerder."
 
-#: add.php:108
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -875,94 +1057,131 @@
 "Er heeft zich een fout voorgedaan bij het toevoegen van het nieuwe adres. "
 "Neem contact op met uw systeembeheerder voor verdere hulp."
 
-#: browse.php:212
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Een fout bij het verwijderen van dit object."
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "Een fout bij het maken van een nieuwe lijst."
 
-#: browse.php:163
-#, php-format
-msgid "There was an error deleting %s from the source address book."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Een fout bij het bijwerken van deze invoer: %s"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "Een fout bij het verwijderen van %s uit het bronadresboek."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Een fout bij het verwijderen van dit adres: %s"
 
-#: browse.php:93
+#: browse.php:72
 msgid "There was an error deleting this object."
 msgstr "Een fout bij het verwijderen van dit object."
 
-#: browse.php:297
-msgid "There was an error displaying the select List"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
 msgstr "Een fout bij het weergeven van de geselecteerde lijst"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Een fout bij het importeren van de data: %s"
 
-#: lib/api.php:336
+#: lib/api.php:507 lib/api.php:761
 msgid "There was an error importing the iCalendar data."
 msgstr "Een fout bij het importeren van de iCalendardata."
 
-#: browse.php:83
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Een fout bij het maken van een nieuwe lijst."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Een fout bij het verwijderen van dit object."
 
-#: edit.php:84
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Een fout bij het bijwerken van deze invoer: %s"
+
+#: edit.php:158
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Een fout bij het bijwerken van deze invoer: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Er waren geen adressen om te exporteren."
 
-#: lib/Driver.php:404 lib/Driver.php:445
-msgid "This address book is read-only"
-msgstr "Dit adresboek is alleen-lezen"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Dit bestandsformaat wordt niet ondersteund."
 
-#: lib/api.php:923 lib/api.php:936
+#: lib/api.php:1122 lib/api.php:1135
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Deze persoon heeft reeds een %s invoer in het adresboek"
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titel"
 
-#: lib/Driver.php:825
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Niet in staat om de definitie van %s te laden."
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
 msgstr "Herstel wijzigingen"
 
-#: lib/api.php:471
-msgid "Unsupported Content-Type."
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, fuzzy, php-format
+msgid "Unsupported Content-Type: %s"
 msgstr "Niet ondersteund Content-Type."
 
-#: config/sources.php.dist:146
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign directory"
 
-#: templates/browse/contactrow.inc:27
-#, php-format
-msgid "View '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
 msgstr "'%s' bekijken"
 
-#: minisearch.php:82
+#: minisearch.php:78
 msgid "View Contact"
 msgstr "Adres weergeven"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Standaardweergave:"
 
@@ -995,14 +1214,16 @@
 msgstr "Staat of provincie (werk)"
 
 #: config/attributes.php.dist:119
+#, fuzzy
 msgid "Work Street Address"
-msgstr "Adres (werk)"
+msgstr "Werkadres"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "U maakt een distributielijst."
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-#: display.php:58 edit.php:44
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "U heeft geen recht om dit adres te bekijken."
 
@@ -1010,7 +1231,7 @@
 msgid "You do not have permission to view this object."
 msgstr "U heeft geen recht om dit object te bekijken."
 
-#: templates/browse/javascript.inc:51
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "U dient een doeladresboek te selecteren."
 
@@ -1018,40 +1239,65 @@
 msgid "You must select a target list."
 msgstr "U dient een doellijst te selecteren."
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "U dient tenminste eerst één invoer te selecteren."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "U dient tenminste eerst één invoer te selecteren."
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
 msgstr "U heeft alleen recht om dit adres te bekijken."
 
-#: templates/browse/contactrow.inc:12
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[geen waarde]"
 
-#: lib/Turba.php:275
-msgid "_Add"
-msgstr "_Toevoegen"
-
-#: lib/Turba.php:274
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: templates/browse/actions.inc:3
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "_Adressen weergeven"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
 msgstr "Ver_wijderen"
 
-#: lib/Turba.php:280
+#: lib/Turba.php:493
 msgid "_Import/Export"
 msgstr "_Import/Export"
 
-#: templates/browse/actions.inc:3
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Lijst"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Mijn adresboek"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Nieuw adres"
+
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
 msgstr "_Uit deze lijst verwijderen."
 
-#: lib/Turba.php:276
+#: lib/Turba.php:489
 msgid "_Search"
 msgstr "_Zoeken"
 
@@ -1059,19 +1305,35 @@
 msgid "contact.vcf"
 msgstr "contacts.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contacts.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contacts.tsv"
 
+#: data.php:219
+#, fuzzy
+msgid "contacts.vcf"
+msgstr "contacts.vcf"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "Geen"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "Adressen weergeven"
+
 #: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
+#, fuzzy
+msgid "to a different Address Book"
 msgstr "naar geselecteerd adresboek"
 
-#: data.php:30 templates/browse/column_headers.inc:7
-#: templates/data/export.inc:20 templates/data/import.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/lib/Turba.php
+++ mod/lib/Turba.php
@@ -1,8 +1,14 @@
 <?php
+
+/**
+ * The virtual path to use for VFS data.
+ */
+define('TURBA_VFS_PATH', '.horde/turba/documents');
+
 /**
  * Turba Base Class.
  *
- * $Horde: turba/lib/Turba.php,v 1.59.4.10 2005/09/27 20:39:41 jan Exp $
+ * $Horde: turba/lib/Turba.php,v 1.59.4.22 2006/02/03 00:48:52 jan Exp $
  *
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @author  Jon Parise <jon at horde.org>
@@ -57,9 +63,13 @@
             $email_vals = explode(',', $email_vals);
             $email_values = false;
             foreach ($email_vals as $j => $email_val) {
-                $mail_link = $addresses[$i . ':' . $j];
-                if (is_a($mail_link, 'PEAR_Error')) {
-                    $mail_link = 'mailto:' . urlencode($address);
+                if (!is_a($addresses, 'PEAR_Error')) {
+                    $mail_link = $addresses[$i . ':' . $j];
+                    if (is_a($mail_link, 'PEAR_Error')) {
+                        $mail_link = 'mailto:' . $address;
+                    }
+                } else {
+                    $mail_link = 'mailto:' . $address;
                 }
 
                 $email_value = Horde::link($mail_link, $email_val) . htmlspecialchars($email_val) . '</a>';
@@ -78,33 +88,108 @@
         }
     }
 
-    function string2Columns($string)
+    /**
+     * Get all the address books the user has the requested permissions to and
+     * return them in the user's preferred order.
+     *
+     * @param integer $permission  The PERMS_* constant to filter on.
+     *
+     * @return array  The filtered, ordered $cfgSources entries.
+     */
+    function getAddressBooks($permission = PERMS_READ)
+    {
+        $addressbooks = array();
+        foreach (array_keys(Turba::getAddressBookOrder()) as $addressbook) {
+            $addressbooks[$addressbook] = $GLOBALS['cfgSources'][$addressbook];
+        }
+
+        if (!$addressbooks) {
+            $addressbooks = $GLOBALS['cfgSources'];
+        }
+
+        return Turba::permissionsFilter($addressbooks, 'source', $permission);
+    }
+
+    /**
+     * Get the order the user selected for displaying address books.
+     *
+     * @return array  An array describing the order to display the address books.
+     */
+    function getAddressBookOrder()
+    {
+        $i = 0;
+        $lines = explode("\n", $GLOBALS['prefs']->getValue('addressbooks'));
+        $temp = $lines;
+        $addressbooks = array();
+        foreach ($lines as $line) {
+            $line = trim($line);
+            if ($line && isset($GLOBALS['cfgSources'][$line])) {
+                $addressbooks[$line] = $i++;
+            } else {
+                // If the address book does not exist in cfgSources,
+                // see if it would have represented a Horde_Share.  If so,
+                // assume the share is no longer available and prune the
+                // setting.
+                if (strpos($line, ':')) {
+                    $pos = array_search($line, $temp);
+                    unset($temp[$pos]);
+                }
+            }
+        }
+        $GLOBALS['prefs']->setValue('addressbooks', implode("\n", $temp));
+        return $addressbooks;
+    }
+
+    /**
+     * Returns the current user's default address book.
+     *
+     * @return string  The default address book name.
+     */
+    function getDefaultAddressBook()
+    {
+        $lines = explode("\n", $GLOBALS['prefs']->getValue('addressbooks'));
+        foreach ($lines as $line) {
+            $line = trim($line);
+            if ($line && isset($GLOBALS['cfgSources'][$line])) {
+                return $line;
+            }
+        }
+
+        return null;
+    }
+
+
+    /**
+     */
+    function getColumns()
     {
-        $ret = array();
-        $lines = explode("\n", $string);
+        $columns = array();
+        $lines = explode("\n", $GLOBALS['prefs']->getValue('columns'));
         foreach ($lines as $line) {
             $line = trim($line);
-            if (!empty($line)) {
-                $columns = explode("\t", $line);
-                if (count($columns) > 1) {
-                    $source = array_splice($columns, 0, 1);
-                    $ret[$source[0]] = $columns;
+            if ($line) {
+                $cols = explode("\t", $line);
+                if (count($cols) > 1) {
+                    $source = array_splice($cols, 0, 1);
+                    $columns[$source[0]] = $cols;
                 }
             }
         }
 
-        return $ret;
+        return $columns;
     }
 
     /**
      * Returns a best guess at the lastname in a string.
      *
-     * @param $name     String contain the full name.
+     * @param string $name  String contain the full name.
      *
-     * @return          String containing the last name.
+     * @return string  String containing the last name.
      */
     function guessLastname($name)
     {
+        global $prefs;
+
         $name = trim(preg_replace('|\s|', ' ', $name));
         if (!empty($name)) {
             /* Assume that last names are always before any commas. */
@@ -146,6 +231,11 @@
             $name_format = $prefs->getValue('name_format');
         }
 
+        /* if no formatting, return original name */
+        if ($name_format != 'first_last' && $name_format != 'last_first') {
+            return $ob->getValue('name');
+        }
+
         /* See if we have the name fields split out explicitly. */
         if ($ob->hasValue('firstname') && $ob->hasValue('lastname')) {
             if ($name_format == 'last_first') {
@@ -174,60 +264,74 @@
     }
 
     /**
-     * Checks if a user has the specified permissions on the passed-in
-     * object.
+     * Checks if a user has the specified permissions on the passed-in object.
+     *
+     * @since Turba 2.1
      *
-     * @param array $in        The data to check on.
-     * @param string $filter   What are we checking for.
-     * @param int $permission  What permission to check for.
+     * @param mixed $in            The data to check on.
+     * @param string $filter       What are we checking for.
+     * @param integer $permission  What permission to check for.
+     *
+     * @return mixed  Either a boolean if checking PERMS_* or a requested
+     *                extended permissions value.
      *
-     * @return boolean         Boolean indicating if the current user has the
-     *                         requested permission on the requested item.
      */
     function hasPermission($in, $filter, $permission = PERMS_READ)
     {
+        global $perms;
+
+        $userID = Auth::getAuth();
+
         switch ($filter) {
         case 'object':
-            if (!is_a($in, 'Turba_AbstractObject')) {
+            if (!is_a($in, 'Turba_Object')) {
                 return false;
             }
 
-            $userID = Auth::getAuth();
-            if (Auth::isAdmin() || in_array($userID, $in->driver->admin)) {
-                return true;
-            }
-
-            /* If permissions have been set on this source, we treat
-             * them as authoritative. Otherwise, we fall through to
-             * checking the admin array of the source. */
             $sourceTag = 'turba:sources:' . $in->driver->name;
-            if ($GLOBALS['perms']->exists($sourceTag)) {
-                return $GLOBALS['perms']->hasPermission($sourceTag, $userID, $permission, $in->getValue('__owner'));
+            if ($perms->exists($sourceTag)) {
+                return $perms->hasPermission($sourceTag, $userID, $permission,
+                                             $in->getValue('__owner'));
             }
 
-            switch ($permission) {
-            case PERMS_SHOW:
-            case PERMS_READ:
-                if ($in->driver->public ||
-                    ($in->hasValue('__owner') &&
-                     $in->getValue('__owner') == $userID)) {
-                    return true;
-                }
-                break;
+            // Otherwise, we assume anyone can access their private
+            // address books, but not public ones.
+            return !$in->driver->public;
 
-            case PERMS_EDIT:
-            case PERMS_DELETE:
-                /* Find out if this is a case that the object is
-                 * editable. */
-                if (!$in->driver->readonly &&
-                    $in->hasValue('__owner') &&
-                    $in->getValue('__owner') == $userID) {
-                    return true;
+        case 'source':
+            // Note that if we are using Horde Permissions then $source will
+            // (correctly) be pruned here to point to the 'original' entry in
+            // $cfgSources. Otherwise, we couldn't enforce the extended
+            // permissions like max_contacts on a per source basis.
+            if (($pos = strpos($in, ':')) !== false) {
+                $source = substr($in, 0, $pos);
+            } else {
+                $source = $in;
+            }
+            $srcConfig = $GLOBALS['cfgSources'][$source];
+            if (!$perms->exists('turba:sources:' . $in)) {
+                // Assume we have permissions if it's not explicitly set.
+                // If using Horde_Share, the only perms we'd be checking
+                // are the extended permissions.
+                return true;
+            } elseif ((empty($srcConfig['use_shares'])) &&
+                      ($source === $in)) {
+                // Using Horde_Perms AND checking source level permsissions
+                return $perms->hasPermission('turba:sources:' . $in, $userID,
+                                             $permission);
+            } else {
+                // Checking extended permissions for either Horde_Perms or
+                // Horde_Share
+                $allowed = $perms->getPermissions('turba:sources:' . $in);
+                if (is_array($allowed)) {
+                    switch (substr($in, strpos($in, ':'))) {
+                    case 'max_contacts':
+                        $allowed = array_reduce($allowed, create_function('$a, $b', 'return max($a, $b);'), 0);
+                        break;
+                    }
                 }
-                return false;
-                break;
+                return $allowed;
             }
-            break;
 
         default:
             return true;
@@ -247,19 +351,18 @@
      */
     function permissionsFilter($in, $filter, $permission = PERMS_READ)
     {
+        global $perms;
+
         $out = array();
 
         switch ($filter) {
         case 'source':
-            if (Auth::isAdmin()) {
-                return $in;
-            }
-
-            $userID = Auth::getAuth();
-            foreach ($in as $sourceID => $name) {
-                $sourceTag = 'turba:sources:' . $sourceID;
-                if (!$GLOBALS['perms']->exists($sourceTag) || $GLOBALS['perms']->hasPermission($sourceTag, $userID, $permission)) {
-                    $out[$sourceID] = $name;
+            foreach ($in as $sourceId => $source) {
+                $driver = &Turba_Driver::singleton($sourceId);
+                if (!is_a($driver, 'PEAR_Error')) {
+                    if ($driver->hasPermission($permission)) {
+                        $out[$sourceId] = $source;
+                    }
                 }
             }
             break;
@@ -272,20 +375,188 @@
     }
 
     /**
+     * Creates a new $cfgSources entry for each share the current user has
+     * access to.  Note that this will only sync shares that are unique to
+     * Horde (basically, a SQL driver source for now).  Any backend that
+     * supports acls or similar mechanism should be configured from within
+     * sources.php or _horde_hook_share_* calls.
+     *
+     * @param array $sources  The default $cfgSources array.
+     *
+     * @return array  The $cfgSources array.
+     */
+    function getConfigFromShares($sources)
+    {
+        $shares = Turba::listShares();
+       // Notify the user if we failed, but still return the $cfgSource array.
+       if (is_a($shares, 'PEAR_Error')) {
+           $notification->push($shares);
+           return $sources;
+       }
+       $shareNames = array_keys($shares);
+       foreach ($shareNames as $name) {
+           if (!isset($sources[$name])) {
+               list($srcType, $user) = explode(':', $name, 2);
+               if (($user != Auth::getAuth()) &&
+                   (!empty($sources[$srcType]['use_shares']))) {
+                   $newSrc = $sources[$srcType];
+                   $newSrc['title'] = $shares[$name]->get('name');
+                   $sources[$name] = $newSrc;
+               }
+           }
+       }
+       return $sources;
+    }
+
+    /**
+     * Returns all shares the current user has specified permissions to.
+     *
+     * @param boolean $owneronly   Only return address books owned by the user?
+     *                             Defaults to false.
+     * @param integer $permission  Permissions to filter by.
+     *
+     * @return array  Shares the user has the requested permissions to.
+     */
+    function listShares($owneronly = false, $permission = PERMS_READ)
+    {
+        $sources = $GLOBALS['turba_shares']->listShares(Auth::getAuth(), $permission,
+                                                      $owneronly ? Auth::getAuth() : null);
+        if (is_a($sources, 'PEAR_Error')) {
+            Horde::logMessage($sources, __FILE__, __LINE__, PEAR_LOG_ERR);
+            return array();
+        }
+        return $sources;
+    }
+
+    /**
+     * Create a new Turba share.
+     *
+     * @param array $params       Parameters for the new share object.
+     * @param boolean $isdefault  Are we creating a 'default' share?
+     *
+     * @return mixed  The new share object or PEAR_Error
+     */
+    function &createShare($params, $isDefault = false)
+    {
+        // We need to know what the source type is for this share.
+        if (empty($params['sourceType'])) {
+            $share = PEAR::raiseError(sprintf(_("Unable to create new share. Missing source type.")));
+            return $share;
+        }
+
+        if ($isDefault) {
+            // Gather info for user's default share for this source.
+            require_once 'Horde/Identity.php';
+            $identity = &Identity::singleton();
+            if (!isset($params['shareName'])) {
+                // Use the shareName if it was passed in, otherwise use
+                // a sensible default.
+                $name = $identity->getValue('fullname');
+                if (trim($name) == '') {
+                    $name = Auth::removeHook(Auth::getAuth());
+                }
+                $name = sprintf(_("%s's Address Book"), $name);
+            } else {
+                $name = $params['shareName'];
+            }
+            $uid = Auth::getAuth();
+        } else {
+            // Not default share, see if we need to generate a uid.
+            $name = $params['shareName'];
+            if (empty($params['uid'])) {
+                $uid = md5(microtime());
+            } else {
+                $uid = $params['uid'];
+            }
+        }
+
+        // Generate the new share
+        $share = &$GLOBALS['turba_shares']->newShare($params['sourceType'] . ':' . $uid);
+        if (is_a($share, 'PEAR_Error')) {
+            return $share;
+        }
+
+        $share->set('name', $name);
+        $share->set('uid', $uid);
+        $share->addUserPermission(Auth::getAuth(), PERMS_ALL);
+        foreach ($params as $key => $value) {
+            if ($key != 'sourceType' && $key != 'shareName' && $key != 'uid') {
+                $share->set($key, $value);
+            }
+        }
+        $GLOBALS['turba_shares']->addShare($share);
+        $share->save();
+        return $share;
+    }
+
+    /**
+     * Update a Turba share.
+     *
+     * @param string $name   The name of the share to update.
+     * @param array $params  The params to update.
+     *
+     * @return mixed  The display name of the updated share or PEAR_Error.
+     */
+    function updateShare($name, $params)
+    {
+        $share = &$GLOBALS['turba_shares']->getShare($name);
+        $name = $share->get('name');
+        foreach ($params as $key => $value) {
+            $share->set($key, $value);
+        }
+        $result = $share->save();
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        } else {
+            return $name;
+        }
+    }
+
+    /**
+     * Remove a Turba share.
+     *
+     * @param string $name  The name of the share to remove.
+     *
+     * @return mixed  The display name of the deleted share or PEAR_Error.
+     */
+    function deleteShare($name)
+    {
+        $share = &$GLOBALS['turba_shares']->getShare($name);
+        if (is_a($share, 'PEAR_Error')) {
+            return $share;
+        }
+
+        // Enforce the requirement that only the share's owner can delete it.
+        if ($share->get('owner') != Auth::getAuth()) {
+            return PEAR::raiseError(_("You do not have permissions to delete this source."));
+        }
+        $name = $share->get('name');
+        $res = $GLOBALS['turba_shares']->removeShare($share);
+        if (is_a($res, 'PEAR_Error')) {
+            return $res;
+        } else {
+            return $name;
+        }
+    }
+
+    /**
      * Build Turba's list of menu items.
      */
     function getMenu($returnType = 'object')
     {
         require_once 'Horde/Menu.php';
-
         $menu = &new Menu();
-        if ($GLOBALS['source_count']) {
-            $menu->add(Horde::applicationUrl('browse.php'), _("_Browse"), 'menu/browse.png', null, null, null, $GLOBALS['prefs']->getValue('initial_page') == 'browse.php' && basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null);
+
+        if ($GLOBALS['haveShare']) {
+            $menu->add(Horde::applicationUrl('addressbooks.php'), _("_My Address Books"), 'turba.png');
+        }
+        if ($GLOBALS['browse_source_count']) {
+            $menu->add(Horde::applicationUrl('browse.php'), _("_Browse"), 'menu/browse.png', null, null, null, (($GLOBALS['prefs']->getValue('initial_page') == 'browse.php' && basename($_SERVER['PHP_SELF']) == 'index.php') || (basename($_SERVER['PHP_SELF']) == 'browse.php' && Util::getFormData('key') != '**search')) ? 'current' : '__noselection');
         }
         if (count($GLOBALS['addSources'])) {
-            $menu->add(Horde::applicationUrl('add.php'), _("_Add"), 'menu/new.png');
+            $menu->add(Horde::applicationUrl('add.php'), _("_New Contact"), 'menu/new.png');
         }
-        $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', $GLOBALS['registry']->getImageDir('horde'), null, null, $GLOBALS['prefs']->getValue('initial_page') == 'search.php' && basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null);
+        $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', $GLOBALS['registry']->getImageDir('horde'), null, null, (($GLOBALS['prefs']->getValue('initial_page') == 'search.php' && basename($_SERVER['PHP_SELF']) == 'index.php') || (basename($_SERVER['PHP_SELF']) == 'browse.php' && Util::getFormData('key') == '**search')) ? 'current' : null);
 
         /* Import/Export */
         if ($GLOBALS['conf']['menu']['import_export']) {
@@ -298,5 +569,4 @@
             return $menu->render();
         }
     }
-
 }


--- orig/templates/browse/column_headers.inc
+++ mod/templates/browse/column_headers.inc
@@ -1,19 +1,50 @@
-<form method="post" name="contacts" action="<?php echo Horde::selfUrl() ?>">
+<form method="post" name="contacts" action="browse.php">
 <?php echo Util::formInput() ?>
-<table cellspacing="1" width="100%" class="item">
+<table cellspacing="0" width="100%" class="linedRow">
+<thead>
  <tr>
-  <th class="item" width="1%" style="cursor:pointer;" onclick="document.contacts.checkAll.checked = !document.contacts.checkAll.checked; SelectAll();" align="left" nowrap="nowrap"><input type="checkbox" name="checkAll" onclick="document.contacts.checkAll.checked = !document.contacts.checkAll.checked; SelectAll();" <?php echo Horde::getAccessKeyAndTitle(_("Check _All/None")) ?>" /></th>
+<?php if ($this->showMark): ?>
+  <th class="item leftAlign" width="1%" style="cursor:pointer" onclick="document.contacts.checkAll.checked = !document.contacts.checkAll.checked; SelectAll();" nowrap="nowrap"><input type="checkbox" name="checkAll" onclick="document.contacts.checkAll.checked = !document.contacts.checkAll.checked; SelectAll();" <?php echo Horde::getAccessKeyAndTitle(_("Check _All/None")) ?> /></th>
+<?php endif; ?>
+<?php if ($this->showEdit): ?>
   <th class="item" width="1%"><?php echo Horde::img('edit.png', _("Edit"), '', $registry->getImageDir('horde')) ?></th>
+<?php endif; ?>
+<?php if ($this->showVcard): ?>
   <th class="item" width="1%"><?php echo Horde::img('mime/vcard.png', _("vCard"), '', $registry->getImageDir('horde')) ?></th>
+<?php endif; ?>
+<?php if ($this->showGroup): ?>
   <th class="item" width="1%"><?php echo Horde::img('group.png', _("List")) ?></th>
-  <th class="<?php echo ($prefs->getValue('sortby') == 0) ? 'selected' : 'item' ?>" width="<?php echo $width ?>%" align="left" nowrap="nowrap">
-   <a href="#" onclick="Sort(0, <?php echo abs(1 - $prefs->getValue('sortdir')) ?>); return false; "><?php echo Horde::img($prefs->getValue('sortdir') ? 'za.png' : 'az.png', _("Sort Direction"), null, $registry->getImageDir('horde')) ?></a>
-   <a href="#" onclick="Sort(0, <?php echo (int)$prefs->getValue('sortdir') ?>); return false;"><?php echo $attributes['name']['label'] ?></a>
+<?php endif; ?>
+  <th class="<?php echo ($this->showSort && $sortby == 0) ? 'selected' : 'item' ?> leftAlign" width="<?php echo $width ?>%" nowrap="nowrap">
+<?php if ($this->showSort): ?>
+   <?php if ($GLOBALS['prefs']->getValue('sortby') == 0): ?>
+      <a class="widget" href="#" onclick="Sort(0, <?php echo abs(1 - $sortdir) ?>); return false; "><?php echo Horde::img($sortdir ? 'za.png' : 'az.png', _("Sort Direction"), null, $registry->getImageDir('horde')) ?></a>
+      <a class="widget" href="#" onclick="Sort(0, <?php echo abs(1 - $sortdir) ?>); return false;">
+   <?php else: ?>
+      <a class="widget" href="#" onclick="Sort(0, <?php echo $sortdir ?>); return false;">
+   <?php endif; ?>
+<?php endif; ?>
+   <?php echo $attributes['name']['label'] ?>
+<?php if ($this->showSort): ?>
+   </a>
+<?php endif; ?>
   </th>
   <?php for ($i = 1; $i <= count($columns); $i++): ?>
-  <th class="<?php echo ($prefs->getValue('sortby') == $i) ? 'selected' : 'item' ?>" width="<?php echo $width ?>%" align="left" nowrap="nowrap">
-   <a href="#" onclick="Sort(<?php echo $i ?>, <?php echo abs(1 - $prefs->getValue('sortdir')) ?>); return false; "><?php echo Horde::img($prefs->getValue('sortdir') ? 'za.png' : 'az.png', _("Sort Direction"), null, $registry->getImageDir('horde')) ?></a>
-   <a href="#" onclick="Sort(<?php echo $i ?>, <?php echo (int)$prefs->getValue('sortdir') ?>); return false;"><?php echo $attributes[$columns[$i-1]]['label'] ?></a>
+  <th class="<?php echo ($this->showSort && $sortby == $i) ? 'selected' : 'item' ?> leftAlign" width="<?php echo $width ?>%" nowrap="nowrap">
+<?php if ($this->showSort): ?>
+   <?php if ($GLOBALS['prefs']->getValue('sortby') == $i): ?>
+      <a class="widget" href="#" onclick="Sort(<?php echo $i ?>, <?php echo abs(1 - $sortdir) ?>); return false; "><?php echo Horde::img($sortdir ? 'za.png' : 'az.png', _("Sort Direction"), null, $registry->getImageDir('horde')) ?></a>
+      <a class="widget" href="#" onclick="Sort(<?php echo $i ?>, <?php echo abs(1 - $sortdir) ?>); return false;">
+   <?php else: ?>
+      <a class="widget" href="#" onclick="Sort(<?php echo $i ?>, <?php echo $sortdir ?>); return false;">
+   <?php endif; ?>
+<?php endif; ?>
+   <?php echo $attributes[$columns[$i - 1]]['label'] ?>
+<?php if ($this->showSort): ?>
+   </a>
+<?php endif; ?>
   </th>
- <?php endfor; ?>
+  <?php endfor; ?>
  </tr>
+</thead>
+<tbody>


--- orig/po/zh_CN.po
+++ mod/po/zh_CN.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 1.0\n"
-"POT-Creation-Date: 2001-12-29 10:35+0800\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2001-06-19 09:46+0800\n"
 "Last-Translator: WangHengWen <whw at my169.com>\n"
 "Language-Team: Chinese <whw at my169.com>\n"
@@ -13,303 +14,1337 @@
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "%s ÎļþÒѾ­³É¹¦µ¼Èë"
 
-msgid "Add Contact ..."
-msgstr "Ôö¼ÓÁªÏµÈË..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "Ôö¼ÓеÄÁªÏµÈË"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "µ¼ÈëµØÖ·±¾"
+
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
 
-msgid "Add failed"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
+msgid "Add"
+msgstr "Ôö¼Ó"
+
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "·Ç·¨µØÖ·±¾"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:237
+msgid "Add column"
+msgstr ""
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
 msgstr "Ôö¼Ó²Ù×÷ʧ°Ü"
 
-msgid "Add"
-msgstr "Ôö¼Ó"
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "Ôö¼Ó"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "µ¼ÈëµØÖ·±¾"
+
+#: browse.php:28 config/prefs.php.dist:125
+#, fuzzy
+msgid "Address Book Listing"
+msgstr "µØÖ·±¾ÊÇÖ»¶ÁµÄ."
+
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "µ¼ÈëµØÖ·±¾"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "µØÖ·±¾ÊÇÖ»¶ÁµÄ."
+
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "%s ÎļþÒѾ­³É¹¦µ¼Èë"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "µØÖ·±¾ÊÇÖ»¶ÁµÄ."
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
+msgid "Advanced Search"
+msgstr "¸ß¼¶ËÑË÷"
+
+#: config/attributes.php.dist:64
+msgid "Alias"
+msgstr "±ðÃû"
+
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
+
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
+
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "²éÕÒ"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr ""
+
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
+
+#: data.php:49
+msgid "CSV"
+msgstr ""
+
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "·Ç·¨µØÖ·±¾"
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "·Ç·¨µØÖ·±¾"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:17
+msgid "Column Options"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
+msgid "Company"
+msgstr "¹«Ë¾"
+
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "¼ÒÍ¥µØÖ·"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "ɾ³ý²Ù×÷ʧ°Ü"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "ɾ³ý²Ù×÷ʧ°Ü"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "¹«Ë¾"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "¹¤×÷µØÖ·"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
+
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
+msgid "Delete"
+msgstr "ɾ³ý"
+
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "¹¤×÷µØÖ·"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "ɾ³ý²Ù×÷ʧ°Ü"
+
+#: delete.php:38
+msgid "Deletion failed"
+msgstr "ɾ³ý²Ù×÷ʧ°Ü"
+
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
+msgid "Directory"
+msgstr "Ŀ¼"
+
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr ""
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
+msgid "Display Options"
+msgstr ""
+
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
+msgid "Edit"
+msgstr "±à¼­"
+
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "±à¼­"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "¹¤×÷µØÖ·"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
+msgid "Email"
+msgstr ""
+
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s ÎļþÒѾ­³É¹¦µ¼Èë"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Ŀ¼ËÑË÷ʧ°Ü: %s"
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
+msgid "Export"
+msgstr "µ¼³ö"
+
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "¹¤×÷µØÖ·"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
+msgstr "Ŀ¼ËÑË÷ʧ°Ü: %s"
+
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Ŀ¼ËÑË÷ʧ°Ü: %s"
+
+#: browse.php:272
+msgid "Failed to browse list"
+msgstr ""
+
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
+msgstr "Ŀ¼ËÑË÷ʧ°Ü: %s"
+
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "Ŀ¼ËÑË÷ʧ°Ü: %s"
+
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Ŀ¼ËÑË÷ʧ°Ü: %s"
+
+#: data.php:149
+#, php-format
+msgid "Failed to search the directory: %s"
+msgstr "Ŀ¼ËÑË÷ʧ°Ü: %s"
+
+#: config/attributes.php.dist:167
+msgid "Fax"
+msgstr "´«Õæ"
+
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "±êÌâ"
+
+#: templates/browse/search.inc:70
+msgid "Find"
+msgstr "²éÕÒ"
+
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "²éÕÒ"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
+#, fuzzy
+msgid "From"
+msgstr "·¢¼þÈË"
+
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "¹¤×÷µØÖ·"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
+
+#: config/attributes.php.dist:82
+msgid "Home Address"
+msgstr "¼ÒÍ¥µØÖ·"
+
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "¼ÒÍ¥µç»°"
+
+#: config/attributes.php.dist:150
+msgid "Home Phone"
+msgstr "¼ÒÍ¥µç»°"
+
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "¼ÒÍ¥µç»°"
+
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "¼ÒÍ¥µç»°"
+
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "¼ÒÍ¥µØÖ·"
+
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
+
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr ""
+
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "µ¼ÈëµØÖ·±¾"
+
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
+msgstr "µ¼Èë/µ¼³öµØÖ·±¾"
+
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "·Ç·¨Ãû³Æ"
+
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
+msgstr "·Ç·¨µØÖ·±¾"
+
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
+msgstr "·Ç·¨µÄ E-Mail µØÖ·"
+
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
+msgstr "·Ç·¨Ãû³Æ"
+
+#: lib/Driver/ldap.php:266
+msgid "Invalid key specified."
+msgstr ""
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "·Ç·¨Ãû³Æ"
+
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "·Ç·¨Ãû³Æ"
+
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Ãû³Æ"
+
+#: templates/browse/column_headers.inc:16
+msgid "List"
+msgstr ""
+
+#: templates/browse/search.inc:77
+msgid "Matching"
+msgstr ""
+
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr ""
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "²éÕÒ"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "¼ÒÍ¥µç»°"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+msgid "Move left"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+msgid "Move right"
+msgstr ""
+
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "¹¤×÷µØÖ·"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "µ¼ÈëµØÖ·±¾"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "¹¤×÷µØÖ·"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
+msgid "Name"
+msgstr "Ãû³Æ"
+
+#: config/prefs.php.dist:31
+msgid "Name Format"
+msgstr ""
+
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "Ôö¼ÓеÄÁªÏµÈË"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Ãû³Æ"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
 
-msgid "Addressbook is read-only."
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
 msgstr "µØÖ·±¾ÊÇÖ»¶ÁµÄ."
 
-msgid "Advanced Directory Search"
-msgstr "¸ß¼¶Ä¿Â¼ËÑË÷"
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
 
-msgid "Advanced Search"
-msgstr "¸ß¼¶ËÑË÷"
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
 
-msgid "Alias"
-msgstr "±ðÃû"
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "±¸×¢"
 
-msgid "Bcc"
-msgstr "°µËÍ"
+#: config/attributes.php.dist:184
+msgid "Notes"
+msgstr "±¸×¢"
 
-msgid "Cancel"
-msgstr "ÖÐÖ¹"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
 
-msgid "Cc"
-msgstr "³­ËÍ"
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "µ¥Î»µç»°"
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
 
-msgid "Clear Search"
-msgstr "Çå³ý²éÕÒ"
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
-msgid "Company"
-msgstr "¹«Ë¾"
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
 
-msgid "Delete"
-msgstr "ɾ³ý"
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+msgid "Other Options"
+msgstr ""
 
-msgid "Deletion failed"
-msgstr "ɾ³ý²Ù×÷ʧ°Ü"
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
 
-msgid "Directory Search"
-msgstr "Ŀ¼²éÕÒ"
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
 
-msgid "Directory"
-msgstr "Ŀ¼"
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
 
-msgid "Edit"
-msgstr "±à¼­"
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
 
-msgid "Email"
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "µ¼ÈëµØÖ·±¾"
+
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
 msgstr ""
 
-msgid "Error"
-msgstr "´íÎó"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
+#: config/sources.php.dist:416
 #, fuzzy
-msgid "Export Addressbook"
+msgid "Private Address Book"
 msgstr "¹¤×÷µØÖ·"
 
-msgid "Export"
-msgstr "µ¼³ö"
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
 
-msgid "Failed to connect to the specified directory."
-msgstr "Á¬½Óµ½Ö¸¶¨Ä¿Â¼·þÎñÆ÷ʧ°Ü."
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "²éÕÒ"
 
-#, c-format
-msgid "Failed to search the directory: %s"
-msgstr "Ŀ¼ËÑË÷ʧ°Ü: %s"
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
 
-msgid "Fax"
-msgstr "´«Õæ"
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
 
-msgid "Find"
-msgstr "²éÕÒ"
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
 
+#: templates/prefs/addressbookselect.inc:176
 #, fuzzy
-msgid "From"
-msgstr "·¢¼þÈË"
+msgid "Remove address book"
+msgstr "µ¼ÈëµØÖ·±¾"
 
-msgid "Help"
-msgstr "°ïÖú"
+#: templates/prefs/columnselect.inc:239
+msgid "Remove column"
+msgstr ""
 
-msgid "Home Address"
-msgstr "¼ÒÍ¥µØÖ·"
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
 
-msgid "Home Phone"
-msgstr "¼ÒÍ¥µç»°"
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "µ±µ¼ÈëCVS¸ñ¹¤µÄÊý¾Ýʱ,µÚÒ»Ðаüº¬×Ö¶ÎÃûÂð?"
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
 
-msgid "Illegal or malformed form data."
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
 msgstr ""
 
-#, fuzzy
-msgid "Import Addressbook"
-msgstr "µ¼ÈëµØÖ·±¾"
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
 
-msgid "Import"
-msgstr "µ¼Èë"
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
 
-msgid "Import/Export Addressbooks"
-msgstr "µ¼Èë/µ¼³öµØÖ·±¾"
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
+msgid "Save"
+msgstr "±£´æ"
 
-msgid "Import/Export"
-msgstr "µ¼Èë/µ¼³ö"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "²éÕÒ"
 
-msgid "Invalid addressbook."
-msgstr "·Ç·¨µØÖ·±¾"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
+msgstr "²éÕÒ½á¹û"
 
-msgid "Invalid e-mail address."
-msgstr "·Ç·¨µÄ E-Mail µØÖ·"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "²éÕÒ"
 
-msgid "Invalid name."
-msgstr "·Ç·¨Ãû³Æ"
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "²éÕÒ"
 
-msgid "Language"
-msgstr "ÓïÑÔ"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "ÇëÑ¡ÔñÒ»±¾ÄãÒªÔö¼ÓµÄµØÖ·±¾."
 
-msgid "Matching"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "ÇëÑ¡ÔñÒ»±¾ÄãÒªÔö¼ÓµÄµØÖ·±¾."
+
+#: templates/data/export.inc:32
+msgid "Select the address book to export from:"
 msgstr ""
 
-msgid "Message"
-msgstr "ÏûÏ¢"
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
+msgstr "ÇëÑ¡ÔñÒ»±¾ÄãÒªÔö¼ÓµÄµØÖ·±¾."
+
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr ""
 
-msgid "Name"
-msgstr "Ãû³Æ"
+#: templates/data/export.inc:10
+msgid "Select the export format:"
+msgstr ""
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+#: templates/data/import.inc:43
+msgid "Select the file to import:"
 msgstr ""
 
-msgid "Notes"
-msgstr "±¸×¢"
+#: templates/data/import.inc:11
+msgid "Select the format of the source file:"
+msgstr ""
 
-msgid "Please choose an address book to add a contact to."
-msgstr "ÇëÑ¡ÔñÒ»±¾ÄãÒªÔö¼ÓµÄµØÖ·±¾."
+#: config/prefs.php.dist:135
+msgid "Select the format used to display names:"
+msgstr ""
 
-msgid "Problem?"
-msgstr "ÎÊÌâ?"
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
 
-msgid "Reset"
-msgstr "¸´Ô­"
+#: config/prefs.php.dist:18
+msgid "Select which fields to display in the address lists."
+msgstr ""
 
-msgid "Save Changes"
-msgstr "±£´æ¸ü¸Ä"
+#: config/prefs.php.dist:32
+msgid "Select which format to display names."
+msgstr ""
 
-msgid "Save"
-msgstr "±£´æ"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "·Ç·¨µØÖ·±¾"
 
+#: config/sources.php.dist:173
 #, fuzzy
-msgid "Search Results"
-msgstr "²éÕÒ½á¹û"
-
-msgid "Search"
-msgstr "²éÕÒ"
+msgid "Shared Directory"
+msgstr "Ŀ¼"
 
-msgid "Search&nbsp;Results"
-msgstr "²éÕÒ½á¹û"
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
 
-msgid "Select the destination to import to:"
+#: templates/browse/actions.inc:41
+msgid "Show All"
 msgstr ""
 
-msgid "Select the file to import:"
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
 msgstr ""
 
-msgid "Select the format to export to:"
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
 msgstr ""
 
-msgid "Select the format to import from:"
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "Ŀ¼"
+
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
+msgstr "³É¹¦"
+
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
 msgstr ""
 
-msgid "Select the source to export from:"
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
 msgstr ""
 
-msgid "Select your preferred language:"
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
 msgstr ""
 
-msgid "Send Message"
-msgstr "·¢ËÍÓʼþ"
+#: data.php:50
+msgid "TSV"
+msgstr ""
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "·¢ËÍÓʼþµ½ %s"
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
 
-msgid "Set the your preferred display language."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
 msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
 msgstr ""
 
-msgid "Success"
-msgstr "³É¹¦"
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
 
-msgid "The data got lost"
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
 msgstr ""
 
-msgid "The data got lost."
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
 msgstr ""
 
-msgid "The file contained no data."
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
 msgstr ""
 
-msgid "There are no writeable address books."
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
 msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s ÎļþÒѾ­³É¹¦µ¼Èë"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
 msgstr ""
 
+#: browse.php:31
+#, fuzzy
+msgid "There are no browseable address books."
+msgstr "¸ÃµØÖ·ÒѾ­ÔÚÄãµÄµØÖ·±¾ÖдæÔÚ."
+
+#: add.php:29
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
 
+#: add.php:121
 msgid ""
-"There was an error deleting this object. Contact your system administrator "
+"There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
 
-msgid "There was an error importing the data."
+#: browse.php:189 browse.php:230
+msgid "There was an error adding this object."
 msgstr ""
 
-msgid "There was an error importing the uploaded file"
+#: browse.php:238
+msgid "There was an error creating a new list."
 msgstr ""
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
+#: addressbooks.php:35
+#, php-format
+msgid "There was an error creating this address book: %s"
 msgstr ""
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: browse.php:147
+#, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr ""
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
+#: delete.php:37
+#, php-format
+msgid "There was an error deleting this contact: %s"
 msgstr ""
 
-msgid "This file defines the list of available sources for Turba."
+#: browse.php:72
+msgid "There was an error deleting this object."
 msgstr ""
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+#: browse.php:278
+msgid "There was an error displaying the list"
+msgstr ""
+
+#: data.php:335
+#, php-format
+msgid "There was an error importing the data: %s"
+msgstr ""
+
+#: lib/api.php:507 lib/api.php:761
+msgid "There was an error importing the iCalendar data."
+msgstr ""
+
+#: browse.php:58
+msgid "There was an error removing a contact from the list."
+msgstr ""
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr ""
+
+#: addressbooks.php:81 addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr ""
+
+#: edit.php:158
+#, php-format
+msgid "There was an error updating this entry: %s"
+msgstr ""
+
+#: data.php:179
+msgid "There were no addresses to export."
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
 msgstr ""
 
-msgid "This person is already in your addressbook."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
+
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "¸ÃµØÖ·ÒѾ­ÔÚÄãµÄµØÖ·±¾ÖдæÔÚ."
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "±êÌâ"
 
-msgid "To"
-msgstr "ÊÕ¼þÈË"
-
-msgid "Turba is not properly configured"
-msgstr "TurbaûÓÐÍêÈ«ÅäÖúÃ"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr ""
 
-msgid "Warning"
-msgstr "¾¯¸æ"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "±£´æ¸ü¸Ä"
+
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Ŀ¼"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "Ôö¼ÓеÄÁªÏµÈË"
+
+#: config/prefs.php.dist:124
+msgid "View to display by default:"
+msgstr ""
+
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
 
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "¹¤×÷µØÖ·"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "¹¤×÷µç»°"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "¹¤×÷µç»°"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "¹¤×÷µç»°"
+
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "¹¤×÷µç»°"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "¹¤×÷µØÖ·"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
+
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
+
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
+
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
+
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
 msgstr ""
 
-msgid "Your Information"
-msgstr "ÄãµÄÐÅÏ¢"
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
+
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+msgid "_Browse"
+msgstr ""
+
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
 
+#: templates/browse/actions.inc:2
 #, fuzzy
-msgid "[Edit]"
-msgstr "±à¼­"
+msgid "_Delete"
+msgstr "ɾ³ý"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "µ¼Èë/µ¼³ö"
+
+#: templates/browse/actions.inc:39
+msgid "_Lists"
+msgstr ""
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "µ¼ÈëµØÖ·±¾"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Ôö¼ÓеÄÁªÏµÈË"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "²éÕÒ"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "¹¤×÷µØÖ·"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/po/bg_BG.po
+++ mod/po/bg_BG.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 2.0-cvs\n"
-"POT-Creation-Date: 2002-09-14 00:38-0400\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-11-19 20:44-0500\n"
 "Last-Translator: Miroslav Pendev <miro at cybershade.us>\n"
 "Language-Team: BG i18n at lists.horde.org\n"
@@ -14,492 +15,1368 @@
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Pine Àäðåñíà êíèãà"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "Èçáåðè àäðåñíà êíèãà"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "%s ôàéë áåøå èìïîðòèðàí óñïåøíî"
 
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
+
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Pine Àäðåñíà êíèãà"
+
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
+
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Äîáàâè"
 
-msgid "Add a new contact"
-msgstr "Äîáàâè íîâ êîíòàêò"
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Íåâàëèäíà àäðåñíà êíèãà."
 
-msgid "Add failed"
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Íÿìà àäðåñíè êíèãè, â êîèòî ìîæåòå äà ïèøåòå."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "äîáàâè êîëîíà"
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
 msgstr "Ãðåøêà ïðè äîáàâÿíå"
 
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "Äîáàâè"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Pine Àäðåñíà êíèãà"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Àäðåñåí ñïèñúê"
 
-msgid "Address book is read-only."
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Èçõîä àäðåñíà êíèãà"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
 msgstr "Àäðåñíàòà êíèãà å â ðåæèì ÷åòåíå."
 
-#, c-format
-msgid "Addresses in list: %s"
-msgstr "Àäðåñè â ñïèñúê: %s"
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "Pine àäðåñíà êíèãà áåøå èìïîðòèðàíà óñïåøíî"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Àäðåñíàòà êíèãà å â ðåæèì ÷åòåíå."
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
 
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Ðàçøèðåíî òúðñåíå"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Ïñåâäîíèì"
 
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "Âñè÷êè"
 
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
+
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Íàðàñòâàùè"
 
-msgid "Available Columns:"
-msgstr "Íàëè÷íè êîëîíè:"
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "Òúðñè"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
 
-#, c-format
-msgid "Back to %s"
-msgstr "Îáðàòíî â %s"
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
 
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Ïðåãëåäàé"
 
-msgid "Checkbox"
-msgstr "Checkbox"
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
 
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Èçáåðåòå ðåäà íà ïîêàçâàíå íà êîëîíèòå â àäðåñíèÿ ñïèñúê."
+#: data.php:49
+msgid "CSV"
+msgstr ""
+
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "Íåâàëèäíà àäðåñíà êíèãà."
 
-msgid "Clear Search"
-msgstr "Èç÷èñòè òúðñåíå"
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Íåâàëèäíà àäðåñíà êíèãà."
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr "Èçáåðåòå ðåäà íà ïîêàçâàíå íà êîëîíèòå â àäðåñíèÿ ñïèñúê."
 
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Îïöèè çà êîëîíèòå"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "CSV - ðàçäåëåíè ñúñ çàïåòàÿ ñòîéíîñòè"
 
+#: templates/data/export.inc:13
+#, fuzzy
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr "CSV - ðàçäåëåíè ñúñ çàïåòàÿ ñòîéíîñòè"
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Êîìïàíèÿ"
 
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Äîìàøåí àäðåñ"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Ãðåøêà ïðè òðèåíå"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "Ãðåøêà ïðè òðèåíå"
+
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "Êîíòàêòúò áåøå ïðåìàõíàò îò ñïèñúêà."
+
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "Êîíòàêòúò áåøå ïðåìàõíàò îò ñïèñúêà."
 
-#, c-format
-msgid "Contents of %s"
-msgstr "Ñúäúðæàíèå íà %s"
+#: browse.php:266
+#, fuzzy, php-format
+msgid "Contacts in list: %s"
+msgstr "Àäðåñè â ñïèñúê: %s"
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "Êîìïàíèÿ"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "×àñòíà Àäðåñíà êíèãà"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
 
-msgid "Default Display"
-msgstr "Èçãëåä ïî ïîäðàçáèðàíå"
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
 
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Ïîñîêà íà ñîðòèðàíå ïî ïîäðàçáèðàíå:"
 
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Èçòðèé"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Èçáåðè àäðåñíà êíèãà"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Ãðåøêà ïðè òðèåíå"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Ãðåøêà ïðè òðèåíå"
 
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Íàìàëÿâàùè"
 
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "Ïîòðåáèòåëñêè îïöèè"
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Äèðåêòîðèÿ"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Äèñïëåé Îïöèè"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Äèñïëåé Îïöèè"
 
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Ðåäàêöèÿ"
 
-#, c-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "Ðåäàêòèðàé '%s'"
 
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Èçõîä àäðåñíà êíèãà"
+
+#: edit.php:78 edit.php:154
+#, fuzzy, php-format
+msgid "Edit entry for %s"
+msgstr "Íÿìà %s íàìåðåíè äàííè  çà %s."
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "Ïèñìî"
 
-msgid "Error while searching directory."
-msgstr "Ãðåøêà ïðè òúðñåíåòî â êàòàëîãà."
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Exit Address Book"
-msgstr "Èçõîä àäðåñíà êíèãà"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
 
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s ôàéë áåøå èìïîðòèðàí óñïåøíî"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Íÿìà àäðåñíè êíèãè, â êîèòî ìîæåòå äà ïèøåòå."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
+#, fuzzy
+msgid "Export"
+msgstr "Èìïîðò/Åêñïîðò"
+
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Åêñïîðò íà àäðåñíà êíèãà"
 
-msgid "Failed to access the specified address book."
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
 msgstr "Ãðåøêà ïðè äîñòúïà äî çàäàäåíàòà àäðåñíà êíèãà"
 
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Íåâúçìîæíîñò çà òúðñåíå â äèðåêòîðèÿ: %s"
+
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "Ãðåøêà ïðè ïðåãëåæäàíå íà ñïèñúêà"
 
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "Ãðåøêà ïðè ïðåãëåæäàíå íà ïàïêàòà"
 
-msgid "Failed to connect to the specified directory."
-msgstr "Ãðåøêà ïðè ñâúðçâàíå êúì çàäàäåíàòà äèðåêòîðèÿ"
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
 
-#, c-format
-msgid "Failed to search the directory: %s"
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
 msgstr "Íåâúçìîæíîñò çà òúðñåíå â äèðåêòîðèÿ: %s"
 
-msgid "Failed to search the specified directory."
-msgstr "Ãðåøêà ïðè òúðñåíå â çàäàäåíàòà ïàïêà."
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Ãðåøêà ïðè äîñòúïà äî çàäàäåíàòà àäðåñíà êíèãà"
 
+#: data.php:149
+#, php-format
+msgid "Failed to search the directory: %s"
+msgstr "Íåâúçìîæíîñò çà òúðñåíå â äèðåêòîðèÿ: %s"
+
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Ôàêñ"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Äëúæíîñò"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Òúðñè"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Òúðñè"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Îò"
 
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Mulberry àäðåñíà êíèãà"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Ãðóïà"
 
-msgid "Help"
-msgstr "Ïîìîù"
-
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Äîìàøåí àäðåñ"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "Äîìàøåí òåëåôîí"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Äîìàøåí òåëåôîí"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "Ïðè èìïîðò íà CSV äàííè: ïúðâèÿ ëè ðåä ñúäúðæà èìåíàòà íà ïîëåòàòà?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Äîìàøåí òåëåôîí"
+
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "Äîìàøåí òåëåôîí"
 
-msgid "Illegal or malformed form data."
-msgstr "Íåäîïóñòèìè èëè ïîâðåäåíè äàííè."
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Äîìàøåí àäðåñ"
 
-msgid "Import Address Book"
-msgstr "Èìïîðò íà àäðåñíà êíèãà"
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
 
-msgid "Import/Export"
-msgstr "Èìïîðò/Åêñïîðò"
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Àäðåñåí ñïèñúê"
 
-msgid "Import/Export Address books"
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Èìïîðò íà àäðåñíà êíèãà"
+
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "Èìïîðò/Åêñïîðò íà àäðåñíè êíèãè"
 
-msgid "Invalid address book."
-msgstr "Íåâàëèäíà àäðåñíà êíèãà."
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Íåâàëèäíî èìå."
 
-msgid "Invalid e-mail address."
-msgstr "Íåâàëèäåí e-mail àäðåñ."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
+msgstr "Íåâàëèäíà àäðåñíà êíèãà."
 
-msgid "Invalid email."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "Íåâàëèäåí email"
 
-msgid "Invalid entry."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
 msgstr "Íåâàëèäíè äàííè."
 
-msgid "Invalid name."
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "Íåâàëèäåí email"
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
 msgstr "Íåâàëèäíî èìå."
 
-msgid "Language"
-msgstr "Åçèê"
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "Íåâàëèäíè äàííè."
+
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
 
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Èìå"
+
+#: templates/browse/column_headers.inc:16
+#, fuzzy
+msgid "List"
+msgstr "Íîâ ñïèñúê"
+
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Ñúäúðæàùè"
 
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Íîâ ñïèñúê"
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "Òúðñè"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "Ìîáèëåí òåëåôîí"
 
-msgid "More than 1 entry returned."
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+#, fuzzy
+msgid "More than 1 entry found"
 msgstr "Áåøå âúðíàò ïîâå÷å îò 1 ðåä."
 
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "ïðåìåñòè íà ëÿâî"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "ïðåìåñòè íà äÿñíî"
+
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry àäðåñíà êíèãà"
 
-msgid "Mulberry address book sucessfully imported"
-msgstr "Mulberry àäðåñíà êíèãà áåøå èìïîðòèðàíà óñïåøíî"
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
 
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
 msgstr "Ìîÿòà àäðåñíà êíèãà"
 
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Ìîÿòà àäðåñíà êíèãà"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Èìå"
 
+#: config/prefs.php.dist:31
+msgid "Name Format"
+msgstr ""
+
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter Member Directory"
 
-msgid "New List"
-msgstr "Íîâ ñïèñúê"
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "Ïîêàæè êîíòàêòèòå"
 
-#, c-format
-msgid "No %s entry found for %s."
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Èìå"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, fuzzy, php-format
+msgid "No %s entry found for %s"
 msgstr "Íÿìà %s íàìåðåíè äàííè  çà %s."
 
-msgid "None"
-msgstr "Íÿìà"
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "Àäðåñíàòà êíèãà å â ðåæèì ÷åòåíå."
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+#: minisearch.php:83
+#, fuzzy
+msgid "No contacts found"
+msgstr "Ïîêàæè êîíòàêòèòå"
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
 msgstr ""
-"Íèêîÿ îò íàëè÷íèòå àäðåñíè êíèãè íå å êîíôèãóðèðàíà äà äîáàâÿòå äàííè êúì "
-"íåÿ. Àêî ñìÿòàòå, ÷å òîâà íå å âÿðíî, ìîëÿ êîíñóëòèðàéòå ñå ñúñ Ñèñòåìíèÿ "
-"Àäìèíèñòðàòîð."
 
+#: templates/browse/footer.inc:7
+msgid "None"
+msgstr "Íÿìà"
+
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Áåëåæêè"
 
-msgid "Options"
-msgstr "Îïöèè"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
+
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
 
-msgid "Outlook"
-msgstr "Outlook"
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "Ïîòðåáèòåëñêè îïöèè"
+
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr "PGP Ïóáëè÷åí êëþ÷"
 
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine Àäðåñíà êíèãà"
 
-msgid "Pine address book sucessfully imported"
-msgstr "Pine àäðåñíà êíèãà áåøå èìïîðòèðàíà óñïåøíî"
-
-msgid "Please choose an address book to add a contact to."
-msgstr "Ìîëÿ, èçáåðåòå êúì êîÿ àäðåñíà êíèãà äà äîáàâèòå êîíòàêò."
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
 
-msgid "Please select a directory:"
-msgstr "Ìîëÿ, èçáåðåòå äèðåêòîðèÿ:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "×àñòíà Àäðåñíà êíèãà"
 
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Òúðñè"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Íåâàëèäíà àäðåñíà êíèãà."
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "ïðåìàõíè êîëîíà"
+
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "Ïðåìàõâàíå îò òîçè ñïèñúê."
 
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
+msgid "Save"
+msgstr ""
+
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Òúðñè"
 
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Ðåçóëòàòè îò òúðñåíåòî"
 
-msgid "Search&nbsp;Results"
-msgstr "Ðåçóëòàòè&nbsp;îò&nbsp;òúðñåíåòî"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "Òúðñè"
+
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "Òúðñè"
 
-msgid "Select"
-msgstr "Èçáåðè"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Èçáåðè àäðåñíà êíèãà"
 
-msgid "Select Address Book"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
 msgstr "Èçáåðè àäðåñíà êíèãà"
 
-msgid "Select List"
-msgstr "Èçáåðè ñïèñúê"
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Èçáåðåòå èçòî÷íèê çà åêñïîðò:"
 
-msgid "Select the destination to import to:"
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "Èçáåðåòå êúäå äà ñå èçâúðøè èìïîðòà:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Èçáåðåòå èçòî÷íèê çà åêñïîðò:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "Èçáåðåòå èçòî÷íèê çà åêñïîðò:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Èçáåðåòå ôàéë çà èìïîðò:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "Èçáåðåòå ôîðìàò, êúì êîéòî äà ñå åêñïîðòèðà:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "Èçáåðåòå ôîðìàò, îò êîéòî äà ñå èìïîðòèðà:"
 
-msgid "Select the source to export from:"
-msgstr "Èçáåðåòå èçòî÷íèê çà åêñïîðò:"
-
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Èçáåðåòå èçãëåä ïî ïîäðàçáèðàíå."
 
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Èçáåðåòå êîè ïîëåòà äà ñà ïîêàçàíè â ñïèñúêà ñ àäðåñè."
 
-msgid "Select your preferred language:"
-msgstr "Èçáåðåòå ïðåäïî÷èòàíèÿò îò Âàñ åçèê:"
-
-msgid "Selected Columns:"
-msgstr "Èçáåðåòå êîëîíè:"
-
-#, c-format
-msgid "Send mail to %s"
-msgstr "Èçïðàòè ïèñìî äî %s"
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "Èçáåðåòå êîè ïîëåòà äà ñà ïîêàçàíè â ñïèñúêà ñ àäðåñè."
 
-msgid "Set your preferred display language."
-msgstr "Èçáåðåòå ïðåäïî÷èòàíèÿò îò Âàñ åçèê çà äèñïëåÿ."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "Èçáåðè àäðåñíà êíèãà"
 
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Ñïîäåëåíà Äèðåêòîðèÿ"
 
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "Ïîêàæè ñïèñúöèòå"
+
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "Ïîêàæè âñè÷êè"
 
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "Ïîêàæè êîíòàêòèòå"
 
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "Ïîêàæè ñïèñúöèòå"
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Íÿêîè îò êîíôèãóðàöèîííèòå ôàéëîâå íà Turba ëèïñâàò:"
-
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "Ñîðòèðàíå"
 
+#: lib/api.php:198
+msgid "Sources"
+msgstr ""
+
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
+
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
+
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
+
+#: data.php:50
+msgid "TSV"
+msgstr ""
+
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tab (òàáóëàöèÿ) ðàçäåëåíè ñòîéíîñòè"
 
-msgid "The data got lost."
-msgstr "Äàííèòå áÿõà çàãóáåíè."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Îáåêòà, êîéòî èçèñêâàòå íå ñúùåñòâóâà."
 
-msgid "The data was lost"
-msgstr "Äàííèòå áÿõà çàãóáåíè"
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Pine àäðåñíà êíèãà áåøå èìïîðòèðàíà óñïåøíî"
 
-msgid "The file contained no data."
-msgstr "Ôàéëúò íå ñúäúðæà äàííè."
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Pine àäðåñíà êíèãà áåøå èìïîðòèðàíà óñïåøíî"
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Pine àäðåñíà êíèãà áåøå èìïîðòèðàíà óñïåøíî"
 
-msgid "The object you requested does not exist."
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+#, fuzzy
+msgid "The contact you requested does not exist."
 msgstr "Îáåêòà, êîéòî èçèñêâàòå íå ñúùåñòâóâà."
 
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s ôàéë áåøå èìïîðòèðàí óñïåøíî"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Íÿìà àäðåñíè êíèãè çà ïðåãëåæäàíå."
 
-msgid "There are no writeable address books."
-msgstr "Íÿìà àäðåñíè êíèãè, â êîèòî ìîæåòå äà ïèøåòå."
-
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"Ãðåøêà ïðè èçïðàùàíåòî íà ôàéëà. Âúçìîæíî å ôàéëúò äà å ïî-ãîëÿì îò "
-"ìàêñèìàëíî äîïóñòèìèÿò ðàçìåð."
+"Íèêîÿ îò íàëè÷íèòå àäðåñíè êíèãè íå å êîíôèãóðèðàíà äà äîáàâÿòå äàííè êúì "
+"íåÿ. Àêî ñìÿòàòå, ÷å òîâà íå å âÿðíî, ìîëÿ êîíñóëòèðàéòå ñå ñúñ Ñèñòåìíèÿ "
+"Àäìèíèñòðàòîð."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+"There was an error adding the new contact. Contact your system administrator "
+"for further help."
 msgstr ""
 "Ãðåøêà ïðè äîáàâÿíåòî íà òîçè îáåêò. Êîíñóëòèðàéòå ñå ñúñ Ñèñòåìíèÿ "
 "Àäìèíèñòðàòîð."
 
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Ãðåøêà ïðè èçòðèâàíåòî íà òîçè îáåêò."
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "Ãðåøêà ïðè ñúçäàâàíå íà íîâ ñïèñúê."
 
-msgid "There was an error deleting this object."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Ãðåøêà ïðè ñúçäàâàíå íà íîâ ñïèñúê."
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "Ãðåøêà ïðè èçòðèâàíåòî íà òîçè îáåêò."
 
-msgid ""
-"There was an error deleting this object. Contact your system administrator "
-"for further help."
-msgstr ""
-"Ãðåøêà ïðè èçòðèâàíåòî íà òîçè îáåêò. Êîíñóëòèðàéòå ñå ñúñ Ñèñòåìíèÿ "
-"Àäìèíèñòðàòîð."
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Ãðåøêà ïðè èçòðèâàíåòî íà òîçè îáåêò."
 
-msgid "There was an error displaying the select List"
-msgstr "Ãðåøêà ïðè ïîêàçâàíåòî íà èçáðàíèÿ ñïèñúê"
+#: browse.php:72
+msgid "There was an error deleting this object."
+msgstr "Ãðåøêà ïðè èçòðèâàíåòî íà òîçè îáåêò."
 
-msgid "There was an error importing the data."
-msgstr "Ãðåøêà ïðè èìïîðò íà äàííèòå."
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "Ãðåøêà ïðè ïîêàçâàíåòî íà èçáðàíèÿ ñïèñúê"
 
-#, c-format
-msgid "There was an error importing the data: %s."
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
 msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà äàííèòå: %s."
 
-msgid "There was an error importing the uploaded file"
-msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà èçïðàòåíèÿ ôàéë"
-
-msgid "There was an error importing the vCard data."
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
 msgstr "Ãðåøêà ïðè èìïîðò íà vCard äàííè."
 
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Ãðåøêà ïðè ñúçäàâàíå íà íîâ ñïèñúê."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Ãðåøêà ïðè ïðåìåñòâàíå íà îáåêòà."
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
-msgstr ""
-"Òîçè ôàéë ñúäúðæà íàñòðîéêèòå ïî ïîäðàçáèðàíå íà Turba è êîíòðîëèðà êîè îò "
-"òÿõ ïîòðåáèòåëÿò ìîæå äà ïðîìåíÿ."
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà äàííèòå: %s."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr ""
-"Òîçè ôàéë êîíòðîëèðà ñòèëîâåòå, êîéòî ñå èçïîëçâàò çà öâåòîâåòå è øðèôòîâåòå "
-"â äîïúëíåíèå êúì ïîäðàçáèðàùèòå ñòèëîâå íà Horde."
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà äàííèòå: %s."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Íÿìà àäðåñíè êíèãè, â êîèòî ìîæåòå äà ïèøåòå."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
 msgstr ""
-"Òîçè ôàéë çàäàâà ãëîáàëíèòå ñòîéíîñòè çà èìåíà è òèïîâe - èìåíà, email "
-"àäðåñè è ò.í."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "Òîçè ôàéë çàäàâà ñïèñúêà ñ íàëè÷íèòå ñîðñîâå çà Turba."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+#: data.php:269
+msgid "This file format is not supported."
 msgstr ""
-"Òîâà å ãëàâíèÿ êîíôèãóðàöèîíåí ôàéë íà Turba. Òîé ñúäúðæà ïúòèùà è îïöèè çà "
-"ñêðèïòîâåòå íà Turba."
 
-#, c-format
-msgid "This person already has a %s entry in the address book."
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "Òîçè ÷îâåê âå÷å ñúùåñòâóâà êàòî %s âúâ àäðåñíàòà êíèãà."
 
-msgid "This person is already in your address book."
-msgstr "Òîçè ÷îâåê âå÷å ñúùåñòâóâà âúâ Âàøàòà àäðåñíà êíèãà."
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Äëúæíîñò"
 
-msgid "Turba is not properly configured"
-msgstr "Turba íå å êîíôèãóðèðàíà êîðåêòíî"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Ãðåøêà ïðè çàðåæäàíå íà äåôèíèöèèòå íà %s."
 
-msgid "Unnamed Contact"
-msgstr "Áåçèìåíåí êîíòàêò"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+msgid "Undo Changes"
+msgstr ""
 
-msgid "User Options"
-msgstr "Ïîòðåáèòåëñêè îïöèè"
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
 
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign Directory"
 
-msgid "View map"
-msgstr "Âèæ êàðòà"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "Ïîêàæè êîíòàêòèòå"
 
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Èçãëåä, êîèòî äà áúäå ïîêàçàí ïî ïîäðàçáèðàíå:"
 
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
+
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Áèçíåñ àäðåñ"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "Áèçíåñ òåëåôîí"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Áèçíåñ òåëåôîí"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Áèçíåñ òåëåôîí"
+
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "Áèçíåñ òåëåôîí"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Áèçíåñ àäðåñ"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
 msgstr ""
-"Âèå íå ñúïîñòàâèõòå íèêàêâè ïîëåòà îò èìïîðòèðàíèÿ ôàéë êúì ñúîòâåòíèòå "
-"ïîëåòà â Turba."
 
-msgid "Your Information"
-msgstr "Èíôîðìàöèÿ çà Âàñ"
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
 
-msgid "[Edit]"
-msgstr "[Ðåäàêöèÿ]"
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
 
-msgid "add column"
-msgstr "äîáàâè êîëîíà"
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
 
-msgid "move left"
-msgstr "ïðåìåñòè íà ëÿâî"
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
 
-msgid "move right"
-msgstr "ïðåìåñòè íà äÿñíî"
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
 
-msgid "remove column"
-msgstr "ïðåìàõíè êîëîíà"
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
+
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "Ïðåãëåäàé"
+
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "Ïîêàæè êîíòàêòèòå"
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "Èçòðèé"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "Èìïîðò/Åêñïîðò"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Ïîêàæè ñïèñúöèòå"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Ìîÿòà àäðåñíà êíèãà"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Ïîêàæè êîíòàêòèòå"
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Remove from this list"
+msgstr "Ïðåìàõâàíå îò òîçè ñïèñúê."
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "Òúðñè"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "Íÿìà"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "Ïîêàæè êîíòàêòèòå"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "Èçáåðè àäðåñíà êíèãà"
 
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/templates/browse/search.inc
+++ mod/templates/browse/search.inc
@@ -4,37 +4,47 @@
 $criteria_options = '';
 $js_criteria = "var criteriaOptions = new Array();\n";
 $source_count = 0;
-foreach ($cfgSources as $key => $entry) {
-    $js_criteria .= "criteriaOptions[$source_count] = new Array()\n";
-    $js_criteria .= "criteriaOptions[$source_count][0] = '$key';\n";
+foreach (Turba::getAddressBooks() as $key => $entry) {
+    $js_criteria .= "criteriaOptions[$source_count] = new Array()\n" .
+        "criteriaOptions[$source_count][0] = '$key';\n";
 
     /* Build the criteria select widget. */
     $field_count = 1;
     foreach ($entry['search'] as $field) {
         $js_criteria .= "criteriaOptions[$source_count][$field_count] = new Array('$field', '" . $attributes[$field]['label'] . "');\n";
         if ($key == $source) {
-            $criteria_options .= "<option value=\"$field\">";
-            $criteria_options .= $attributes[$field]['label'] . "</option>\n";
+            $selected = ($criteria == $field) ? ' selected="selected"' : '';
+            $criteria_options .= "<option value=\"$field\"$selected>" .
+                htmlspecialchars($attributes[$field]['label']) . "</option>\n";
         }
         $field_count++;
     }
 
     $selected = ($key == $source) ? ' selected="selected"' : '';
-    $source_options .= "<option value=\"$key\"$selected>";
-    $source_options .= $entry['title'] . "</option>\n";
+    $source_options .= "<option value=\"$key\"$selected>" .
+        htmlspecialchars($entry['title']) . "</option>\n";
 
     $unique_source = $key;
     $source_count++;
 }
 
+/* Build search mode tabs. */
+require_once 'Horde/UI/Tabs.php';
+require_once 'Horde/Variables.php';
+$sUrl = Horde::applicationUrl('search.php');
+$vars = &Variables::getDefaultVariables();
+$tabs = &new Horde_UI_Tabs('search_mode', $vars);
+$tabs->addTab(_("Basic Search"), $sUrl, 'basic');
+$tabs->addTab(_("Advanced Search"), $sUrl, 'advanced');
+echo $tabs->render($_SESSION['turba_search_mode']);
+
 if ($_SESSION['turba_search_mode'] == 'basic'): ?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 <?php echo $js_criteria ?>
 function updateCriterias()
 {
     var f = document.directory_search;
-
     while (f.criteria.length > 0) {
         f.criteria.options[f.criteria.length-1] = null;
     }
@@ -52,40 +62,29 @@
 //-->
 </script>
 
-<form name="directory_search" action="<?php echo Horde::applicationUrl('search.php') ?>" method="get">
-<input type="hidden" name="actionID" value="1" />
+<form name="directory_search" action="search.php" method="get">
 <?php echo Util::formInput() ?>
+<input type="hidden" name="actionID" value="1" />
 
-<table border="0" cellpadding="1" cellspacing="0" width="100%">
-<tr class="header">
-  <td class="header">
-      <b><?php echo _("Basic Search") ?></b>
-  </td>
-  <td align="right" class="header">
-    <?php echo Horde::widget(Util::addParameter(Horde::applicationUrl('search.php'), 'search_mode', 'advanced'), _("Advanced Search"), 'smallheader', '', '', _("Ad_vanced Search")) ?></a>
-  </td>
-</tr>
-</table>
-
-<table border="0" cellpadding="0" cellspacing="5">
-<tr>
-    <td class="light" align="right"><b><?php echo _("Find") ?></b></td>
+<table cellspacing="5">
+  <tr>
+    <td class="light rightAlign"><strong><?php echo _("Find") ?></strong></td>
     <td class="item">
         <select name="criteria">
-<?php echo $criteria_options ?>
+         <?php echo $criteria_options ?>
         </select>
     </td>
 
-    <td class="light" align="right"><b><?php echo _("Matching") ?></b></td>
+    <td class="light rightAlign"><strong><?php echo _("Matching") ?></strong></td>
     <td class="item">
-        <input type="text" size="30" name="val" value="" />
+        <input type="text" size="30" name="val" value="<?php echo htmlspecialchars($val) ?>" />
     </td>
 
 <?php if (count($cfgSources) > 1): ?>
-    <td class="light" align="right"><b><?php echo _("From") ?></b></td>
+    <td class="light rightAlign"><strong><?php echo _("From") ?></strong></td>
     <td class="item">
         <select name="source" onchange="updateCriterias()">
-<?php echo $source_options ?>
+         <?php echo $source_options ?>
         </select>
     </td>
 <?php else: ?>
@@ -95,47 +94,37 @@
 <?php endif; ?>
 
     <td>
-        <input class="button" type="submit" value="<?php echo _("Search") ?>" />
+        <input class="button" type="submit" name="search" value="<?php echo _("Search") ?>" />
     </td>
-</tr>
+  </tr>
 </table>
 </form>
-<br/>
+<br />
 
 <?php else: ?>
 
-<form name="directory_search" action="<?php echo Horde::applicationUrl('search.php') ?>" method="get">
+<form name="directory_search" action="search.php" method="get">
 <?php echo Util::formInput() ?>
 
-<table border="0" cellpadding="1" cellspacing="0" width="100%">
-<tr class="header">
-  <td class="header">
-    <b><?php echo _("Advanced Search") ?></b>
-  </td>
-  <td align="right" class="header">
-    <?php echo Horde::widget(Util::addParameter(Horde::applicationUrl('search.php'), 'search_mode', 'basic'), _("Basic Search"), 'smallheader', '', '', _("Basi_c Search")) ?></a>
-  </td>
-</tr>
-</table>
-
-<table border="0" cellpadding="0" cellspacing="5" width="100%">
-<tr>
+<table cellspacing="5" width="100%">
+  <tr>
     <td>&nbsp;</td>
     <td>
-        <input type="submit" class="button" name="search" value="<?php echo _("Search") ?>" />
-        <input type="reset" class="button" name="reset" value="<?php echo _("Reset to Defaults") ?>" />
+      <input type="submit" class="button" name="search" value="<?php echo _("Search") ?>" />
+      <input type="reset" class="button" name="reset" value="<?php echo _("Reset to Defaults") ?>" />
     </td>
-</tr>
-
-    <?php if ($source_count > 1) : ?>
+  </tr>
+ <?php if ($source_count > 1) : ?>
+  <tr>
+    <td class="light rightAlign"><strong><?php echo _("Directory") ?></strong></td>
+    <td class="leftAlign">
+      <select name="source" onchange="directory_search.submit()">
+       <?php echo $source_options ?>
+      </select>
+    </td>
+  </tr>
+ <?php else: ?>
+  <input type="hidden" name="source" value="<?php echo $unique_source ?>">
+ <?php endif; ?>
 
-<tr><td class="light" align="right"><b><?php echo _("Directory") ?></b></td>
-    <td align="left"><select name="source" onchange="directory_search.submit()">
-<?php echo $source_options ?>
-</select></td></tr>
-
-    <?php else: ?>
-    <input type="hidden" name="source" value="<?php echo $unique_source ?>">
-    <?php endif ?>
-
-<?php endif;
+<?php endif; ?>


--- orig/templates/data/export.inc
+++ mod/templates/data/export.inc
@@ -1,51 +1,43 @@
 <form method="post" name="export" action="<?php echo Horde::downloadUrl(_("contacts.csv"), null, Horde::applicationUrl('data.php')) ?>">
+<?php echo Util::formInput() ?>
 <input type="hidden" name="actionID" value="export" />
-<table cellspacing="0" cellpadding="0" border="0" width="100%">
-<tr>
-  <td>
-    <table cellpadding="3" cellspacing="0" border="0" width="100%">
-    <tr><td class="header" align="center"><?php echo _("Export Address Book") ?></td>
-    </tr></table>
-  </td>
-</tr>
-<tr>
-  <td class="item">
-  <table border="0"><tr><td>
-    <label for="exportID"><?php echo _("Select the export format:") ?></label><br />
-    <select name="exportID" id="exportID">
-      <option value="<?php echo EXPORT_CSV ?>"><?php echo _("Comma separated values") ?></option>
-      <option value="<?php echo EXPORT_OUTLOOKCSV ?>"><?php echo _("Comma separated values (Microsoft Outlook)") ?></option>
-      <option value="<?php echo EXPORT_TSV ?>"><?php echo _("Tab separated values") ?></option>
-      <!-- not (yet) implemented -->
-      <!--<option value="<?php echo EXPORT_VCARD ?>"><?php echo _("vCard") ?></option>-->
-    </select><br />
+
+<h1 class="header">
+ <?php echo _("Export Address Book") ?>
+</h1>
+
+<div class="item">
+ <label for="exportID"><?php echo _("Select the export format:") ?></label><br />
+ <select name="exportID" id="exportID">
+  <option value="<?php echo EXPORT_CSV ?>"><?php echo _("Comma separated values") ?></option>
+  <option value="<?php echo EXPORT_OUTLOOKCSV ?>"><?php echo _("Comma separated values (Microsoft Outlook)") ?></option>
+  <option value="<?php echo EXPORT_TSV ?>"><?php echo _("Tab separated values") ?></option>
+  <option value="<?php echo EXPORT_VCARD ?>"><?php echo _("vCard") ?></option>
+ </select><br />
 
 <?php if ($actionID == 'select' && Util::getFormData('objectkeys')): ?>
-    <br />
-    <input type="radio" name="selected" id="selected1" value="1" checked="checked" />
-    <label for="selected1"><?php echo _("Export only the selected contacts.") ?></label>
+ <br />
+ <input type="radio" name="selected" id="selected1" value="1" checked="checked" />
+ <label for="selected1"><?php echo _("Export only the selected contacts.") ?></label>
 <?php foreach (Util::getFormData('objectkeys') as $key => $value): ?>
-    <input type="hidden" name="objectkeys[<?php echo htmlspecialchars($key) ?>]" value="<?php echo htmlspecialchars($value) ?>" />
+ <input type="hidden" name="objectkeys[<?php echo htmlspecialchars($key) ?>]" value="<?php echo htmlspecialchars($value) ?>" />
 <?php endforeach; ?>
-    <br />
-    <input type="radio" name="selected" id="selected0" value="0" />
-    <label for="selected0"><?php echo _("Export the following address book completely.") ?></label>
-    <br />
+ <br />
+ <input type="radio" name="selected" id="selected0" value="0" />
+ <label for="selected0"><?php echo _("Export the following address book completely.") ?></label>
+ <br />
 <?php endif; ?>
 <?php if (count($source_options) > 1): ?>
-    <br />
-    <label for="source"><?php echo _("Select the address book to export from:") ?></label><br />
-    <select name="source" id="source">
-      <?php echo implode('', $source_options) ?>
-    </select><br />
+ <br />
+ <label for="source"><?php echo _("Select the address book to export from:") ?></label><br />
+ <select name="source" id="source">
+  <?php echo implode('', $source_options) ?>
+ </select><br />
 <?php else: ?>
-    <input type="hidden" name="source" value="<?php echo htmlspecialchars($unique_source) ?>" />
+ <input type="hidden" name="source" value="<?php echo htmlspecialchars($unique_source) ?>" />
 <?php endif; ?>
-    <br />
+ <br />
 
-    <input type="submit" value="<?php echo _("Export") ?>" class="button" />
-  </td></tr></table>
-  </td>
-</tr>
-</table>
+ <input type="submit" value="<?php echo _("Export") ?>" class="button" />
+</div>
 </form>


--- orig/po/pt_PT.po
+++ mod/po/pt_PT.po
@@ -1,10 +1,14 @@
+# TURBA Portugal Portuguese translation.
+# Manuel Menezes de Sequeira <Manuel.Sequeira>, 2005.
+# Based on a previous
 # Turba Portugal Portuguese translation.
 # Nuno Loureiro <nuno at eth.pt>, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 2.0-cvs\n"
-"POT-Creation-Date: 2002-05-29 02:59+0100\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-13 17:13+0200\n"
 "PO-Revision-Date: 2002-02-21 18:31+0000\n"
 "Last-Translator: Nuno Loureiro <nuno at eth.pt>\n"
 "Language-Team: Portuguese <dev at lists.horde.org>\n"
@@ -12,396 +16,1067 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#, c-format
+#: browse.php:120
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "\"%s\" não foi copiado por ser uma lista."
+
+#: browse.php:118
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "\"%s\" não foi movido por ser uma lista."
+
+#: config/prefs.php.dist:111
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr "\"Próprio Apelido\" (e.g., José Silva)"
+
+#: config/prefs.php.dist:110
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr "\"Apelido, Próprio\" (e.g., Silva, José)"
+
+#: add.php:87
+#, php-format
+msgid "%s added."
+msgstr "%s adicionado."
+
+#: data.php:256
+#, php-format
 msgid "%s file successfully imported"
 msgstr "Ficheiro %s importado com sucesso"
 
-msgid "Add Contact ..."
-msgstr "Adicionar contacto..."
-
-msgid "Add a new contact"
-msgstr "Adicionar novo contacto"
-
-msgid "Add failed"
-msgstr "Falhou a inserção"
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr "%s a %s de %s"
+
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr "É necessário um navegador que suporte iFrames"
+
+#: config/prefs.php.dist:132
+msgid "Above search form"
+msgstr "Sobre o formulário de procura"
+
+#: templates/browse/search.inc:65
+msgid "Ad_vanced Search"
+msgstr "Pes_quisa Avançada"
 
+#: add.php:52
 msgid "Add"
 msgstr "Adicionar"
 
+#: templates/prefs/columnselect.inc:237
+msgid "Add column"
+msgstr "Adicionar coluna"
+
+#: templates/browse/actions.inc:22
+msgid "Add to"
+msgstr "Adicionar a"
+
+#: browse.php:30 config/prefs.php.dist:99
 msgid "Address Book Listing"
-msgstr "Listagem da Lista de contactos"
+msgstr "Listagem dos Contactos"
 
-msgid "Addressbook is read-only."
-msgstr "A lista de contactos permite apenas, acesso de leitura"
+#: add.php:86
+msgid "Address book entry"
+msgstr "Contacto"
+
+#: lib/Driver.php:478
+msgid "Address book is read-only."
+msgstr "Livro de endereços só pode ser lido."
+
+#: data.php:236
+msgid "Address book successfully purged."
+msgstr "Livro de endereços purgado com sucesso."
 
+#: search.php:97 templates/browse/search.inc:65
+#: templates/browse/search.inc:113
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
-msgstr "Apelido"
+msgstr "Alcunha"
 
+#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+msgid "All"
+msgstr "Tudo"
+
+#: lib/api.php:395
+msgid "Already Exists"
+msgstr "Já Existe"
+
+#: templates/browse/javascript.inc:89
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr "Quer mesmo remover %s?"
+
+#: templates/browse/javascript.inc:63
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr "Quer mesmo remover as entradas seleccionadas?"
+
+#: config/prefs.php.dist:70
+msgid "Ascending"
+msgstr "Crescente"
+
+#: templates/prefs/columnselect.inc:233
 msgid "Available Columns:"
 msgstr "Colunas disponíveis:"
 
-msgid "Browse"
-msgstr "Listar"
+#: templates/browse/actions.inc:44
+#, php-format
+msgid "Ba_ck to %s"
+msgstr "_Voltar a %s"
+
+#: templates/browse/actions.inc:44
+#, php-format
+msgid "Back to %s"
+msgstr "Voltar a %s"
+
+#: templates/browse/search.inc:116
+msgid "Basi_c Search"
+msgstr "Procura Bási_ca"
+
+#: search.php:94 templates/browse/search.inc:62
+#: templates/browse/search.inc:116
+msgid "Basic Search"
+msgstr "Procura Básica"
+
+#: config/prefs.php.dist:131
+msgid "Below search form"
+msgstr "Sob o formulário de procura"
+
+#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr "Ligação falhou: (%s) %s"
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr "Aniversário"
+
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr "Categoria de Negócio"
+
+#: data.php:28
+msgid "CSV"
+msgstr "CSV"
+
+#: templates/browse/actions.inc:48
+msgid "C_lear Search"
+msgstr "_Limpar Pesquisa"
+
+#: templates/browse/column_headers.inc:5
+msgid "Check _All/None"
+msgstr "Marcar _Tudo/Nada"
 
-msgid "Cancel"
-msgstr "Cancelar"
+#: config/prefs.php.dist:29
+msgid ""
+"Choose a default directory for your personal addressbook, contact lists, and "
+"searches."
+msgstr ""
+"Escolha uma pasta por omissão para os seus livro de endereços pessoal, as "
+"suas listas de contactos e as suas procuras."
 
-msgid "Cell Phone"
-msgstr "Telemóvel"
+#: add.php:44
+msgid "Choose an address book"
+msgstr "Escolha o livro de endereços"
 
+#: templates/prefs/columnselect.inc:228
 msgid "Choose the order of the columns to display in the address list."
-msgstr "Escolher a ordem das colunas a mostrar na listagem de endereços."
+msgstr "Escolha a ordem das colunas a mostrar na lista de contactos."
 
+#: templates/browse/actions.inc:48
 msgid "Clear Search"
 msgstr "Limpar Pesquisa"
 
+#: config/prefs.php.dist:10
 msgid "Column Options"
-msgstr "Opções das colunas"
+msgstr "Opções de Coluna"
+
+#: templates/data/import.inc:18 templates/data/export.inc:16
+msgid "Comma separated values"
+msgstr "Valores separados por vírgulas"
+
+#: templates/data/export.inc:17
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr "Valores separados por vírgulas (Microsoft Outlook)"
 
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Empresa"
 
-#, c-format
+#: config/attributes.php.dist:144
+msgid "Company Address"
+msgstr "Morada na Empresa"
+
+#: lib/api.php:247 lib/api.php:268 lib/api.php:384 lib/api.php:454
+#: lib/api.php:544 lib/api.php:590 lib/api.php:638 lib/api.php:825
+#: lib/api.php:918
+#, php-format
+msgid "Connection failed: %s"
+msgstr "Ligação falhou: %s"
+
+#: lib/Driver/ldap.php:66
+msgid "Connection failure"
+msgstr "Falha de ligação"
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr "Contacto removido da lista."
+
+#: browse.php:257
+#, php-format
+msgid "Contacts in list: %s"
+msgstr "Contactos na lista: %s"
+
+#: browse.php:281
+#, php-format
 msgid "Contents of %s"
 msgstr "Conteúdo de %s"
 
+#: templates/browse/actions.inc:12
+msgid "Copy"
+msgstr "Copiar"
+
+#: lib/ObjectView.php:134
+msgid "Created"
+msgstr "Criado"
+
+#: config/prefs.php.dist:16
 msgid "Default Display"
-msgstr "Visualização Padrão"
+msgstr "Visualização por Omissão"
+
+#: config/prefs.php.dist:121
+msgid ""
+"Default directory for your personal addressbook, contact lists, and searches."
+msgstr ""
+"Pasta por omissão para o seu livro de endereços pessoal, as suas listas de "
+"contactos e as suas procuras."
+
+#: config/prefs.php.dist:72
+msgid "Default sorting direction:"
+msgstr "Direcção de ordenação por omissão:"
 
+#: templates/browse/actions.inc:3 lib/Renderer.php:48
 msgid "Delete"
-msgstr "Apagar"
+msgstr "Remover"
 
+#: config/prefs.php.dist:35
+msgid "Delete Confirmation"
+msgstr "Confirmação de Remoção"
+
+#: config/prefs.php.dist:36
+msgid "Delete button behaviour"
+msgstr "Comportamento do butão \"delete\""
+
+#: lib/Driver/ldap.php:283
+#, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Remoção falhou: (%s) %s"
+
+#: delete.php:32
 msgid "Deletion failed"
-msgstr "A remoção falhou"
+msgstr "Remoção falhou"
 
-msgid "Directory Listing"
-msgstr "Listagem do Directório"
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr "Departamento"
 
-msgid "Directory Search"
-msgstr "Pesquisa no Directório"
+#: config/prefs.php.dist:71
+msgid "Descending"
+msgstr "Decrescente"
 
+#: templates/browse/search.inc:132
 msgid "Directory"
 msgstr "Directório"
 
+#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
+#: config/prefs.php.dist:27
 msgid "Display Options"
-msgstr "Opções de visualização"
+msgstr "Opções de Visualização"
 
-#, c-format
-msgid "Edit '%s'"
-msgstr "Editar '%s'"
+#: config/prefs.php.dist:149
+msgid "Do you want to confirm deleting entries?"
+msgstr "Deseja confirmar a remoção de entradas?"
+
+#: templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr "Descarregar vCard"
 
+#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
+#: lib/Renderer.php:46
 msgid "Edit"
 msgstr "Editar"
 
-msgid "Email"
-msgstr "Email"
+#: templates/browse/contactrow.inc:33
+#, php-format
+msgid "Edit \"%s\""
+msgstr "Editar \"%s\""
+
+#: edit.php:53 edit.php:80
+#, php-format
+msgid "Edit entry for %s"
+msgstr "Editar entrada de %s"
 
-msgid "Error while searching directory."
-msgstr "Ocorreu um erro ao pesquisar no directório."
+#: config/attributes.php.dist:58
+msgid "Email"
+msgstr "Correio Electrónico"
 
-msgid "Export Addressbook"
-msgstr "Exportar Endereços"
+#: edit.php:79
+#, php-format
+msgid "Entry for %s updated."
+msgstr "Entrada de %s actualizada."
 
+#: templates/browse/actions.inc:6 templates/data/export.inc:46
 msgid "Export"
 msgstr "Exportar"
 
-#, c-format
-msgid "Failed to browse the directory: %s"
-msgstr "A listagem do directório falhou: %s"
+#: templates/data/export.inc:7
+msgid "Export Address Book"
+msgstr "Exportar Livro de Endereços"
+
+#: templates/data/export.inc:26
+msgid "Export only the selected contacts."
+msgstr "Exportar apenas os contactos seleccionados"
+
+#: templates/data/export.inc:32
+msgid "Export the following address book completely."
+msgstr "Exportar na íntegrar o livro de endereços que se segue."
+
+#: data.php:110 data.php:228 browse.php:37 browse.php:94 browse.php:109
+#: add.php:63 search.php:52
+#, php-format
+msgid "Failed to access the address book: %s"
+msgstr "Falhou acesso ao livro de endereços: %s"
+
+#: browse.php:128
+#, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Falhou adição de %s a %s: %s"
+
+#: browse.php:263
+msgid "Failed to browse list"
+msgstr "Falhou navegação da lista"
+
+#: browse.php:297
+msgid "Failed to browse the directory"
+msgstr "Falhou navegação do directório"
+
+#: lib/Driver/ldap.php:321
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr "Falhou a mudança do nome: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+
+#: browse.php:114
+#, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "Procura do objecto a adicionar falhou: %s"
 
-msgid "Failed to connect to the specified directory."
-msgstr "A ligação ao directório especificado falhou."
-
-#, c-format
+#: data.php:124 search.php:88
+#, php-format
 msgid "Failed to search the directory: %s"
-msgstr "A pesquisa no directório falhou: %s"
-
-msgid "Failed to search the specified directory."
-msgstr "A pesquisa ao directório especificado falhou."
+msgstr "Pesquisa no directório falhou: %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fax"
 
+#: templates/browse/search.inc:72
 msgid "Find"
-msgstr "Pesquisar"
+msgstr "Procurar"
 
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr "Nome Próprio"
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr "URL de livre/ocupado"
+
+#: templates/browse/search.inc:85
 msgid "From"
 msgstr "De"
 
-msgid "Help"
-msgstr "Ajuda"
+#: config/sources.php.dist:562
+msgid "Global Address Book"
+msgstr "Lista de Endereços Global"
+
+#: templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr "Grupo"
 
+#: config/attributes.php.dist:82
 msgid "Home Address"
-msgstr "Morada"
-
-msgid "Home Phone"
-msgstr "Telefone"
-
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr ""
-"Na importação de dados em formato CSV: A primeira linha contémos nomes dos "
-"campos? "
+msgstr "Morada de Casa"
 
-msgid "Illegal or malformed form data."
-msgstr "Formulário de dados com problemas ou dados inválidos"
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr "Cidade de Casa"
 
-msgid "Import Addressbook"
-msgstr "Importar Lista de contactos"
+#: config/attributes.php.dist:108
+msgid "Home Country"
+msgstr "País de Casa"
 
-msgid "Import"
-msgstr "Importar"
-
-msgid "Import/Export Addressbooks"
-msgstr "Importar/Exportar Listas de contactos"
-
-msgid "Import/Export"
-msgstr "Importar/Exportar"
-
-msgid "Invalid addressbook."
-msgstr "Lista de contactos Inválida."
-
-msgid "Invalid e-mail address."
-msgstr "Email inválido."
+#: config/attributes.php.dist:150
+msgid "Home Phone"
+msgstr "Telefonei de Casa"
 
-msgid "Invalid email."
-msgstr "Email inválido."
+#: config/attributes.php.dist:103
+msgid "Home Postal Code"
+msgstr "Código Postal de Casa"
+
+#: config/attributes.php.dist:98
+msgid "Home State/Province"
+msgstr "Estado/Província de Casa"
+
+#: config/attributes.php.dist:88
+msgid "Home Street Address"
+msgstr "Rua de Casa"
+
+#: config/sources.php.dist:487
+msgid "IMSP"
+msgstr "IMSP"
+
+#: templates/data/import.inc:9
+#, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Importar Lista de Endereços, Passo %d"
+
+#: data.php:274
+msgid "Import/Export Address Books"
+msgstr "Importar/Exportar Listas de Endereços"
+
+#: lib/api.php:378 lib/api.php:604
+msgid "Invalid Content-Type"
+msgstr "\"Content-Type\" Inválido."
+
+#: lib/api.php:441 lib/api.php:531
+msgid "Invalid ID"
+msgstr "ID Inválido."
+
+#: lib/api.php:191 lib/api.php:334 lib/api.php:437 lib/api.php:527
+#: lib/api.php:580 lib/api.php:895
+msgid "Invalid address book"
+msgstr "Livro de endereços inválido."
+
+#: lib/api.php:899 lib/api.php:973 lib/api.php:1026
+msgid "Invalid email"
+msgstr "Endereço de correio electrónico inválido."
+
+#: lib/api.php:907
+msgid "Invalid entry"
+msgstr "Entrada Inválida."
+
+#: lib/Driver/ldap.php:279
+msgid "Invalid key specified."
+msgstr "Chave inválida especificada."
 
-msgid "Invalid name."
+#: lib/api.php:903
+msgid "Invalid name"
 msgstr "Nome Inválido."
 
-msgid "Invalid public key."
-msgstr "Chave pública Inválida."
+#: lib/api.php:584
+msgid "Invalid objectId"
+msgstr "objectID Inválido."
 
-msgid "Language"
-msgstr "Idioma"
+#: lib/Driver/ldap.php:38
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+"Suporte LDAP é necessário mas o módulo LDAP não está disponível ou não está "
+"carregado."
+
+#: lib/ObjectView.php:139
+msgid "Last Modified"
+msgstr "Modificado"
+
+#: config/attributes.php.dist:53
+msgid "Last Name"
+msgstr "Último Nome"
 
+#: templates/browse/column_headers.inc:8
 msgid "List"
 msgstr "Lista"
 
+#: templates/browse/search.inc:79
 msgid "Matching"
 msgstr "Correspondente"
 
-msgid "More than 1 entry returned."
-msgstr "Foi retornada mais que 1 entrada."
+#: config/prefs.php.dist:81
+msgid "Maximum number of pages"
+msgstr "Número máximo de páginas"
+
+#: lib/Block/minisearch.php:3
+msgid "Mini Search"
+msgstr "Mini-procura"
+
+#: lib/Driver/ldap.php:315
+msgid "Missing DN in LDAP source configuration."
+msgstr "Falta DN na configuração do LDAP fonte"
+
+#: config/attributes.php.dist:162
+msgid "Mobile Phone"
+msgstr "Telemóvel"
+
+#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr "Modificação falhou: (%s) %s"
+
+#: lib/api.php:1012
+msgid "More than 1 entry found"
+msgstr "Encontrada mais que uma entrada."
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr "Mover"
+
+#: templates/prefs/columnselect.inc:247
+msgid "Move left"
+msgstr "Mover à esquerda"
+
+#: templates/prefs/columnselect.inc:249
+msgid "Move right"
+msgstr "Mover à direita"
+
+#: data.php:31 templates/data/import.inc:21
+msgid "Mulberry Address Book"
+msgstr "Livro de Endereços Mulberry"
 
-msgid "Mulberry addressbook sucessfully imported"
-msgstr "A lista de contactos Mulberry foi importada com sucesso"
+#: lib/api.php:932
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr "Há várias pessoas com o endereço [%s], mas nenhuma com o nome [%s]"
 
+#: config/sources.php.dist:87 config/sources.php.dist:221
+msgid "My Address Book"
+msgstr "O Meu Livro de Endereços"
+
+#: config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nome"
 
-#, c-format
-msgid "No public key found for %s."
-msgstr "Não foi encontrada a chave pública para %s."
-
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
-msgstr ""
-"Nenhuma das Listas de contactos disponíveis está configurada para permitir "
-"ainserção de dados. Se achar que foi um erro, por favorcontacte o "
-"Administrador do sistema."
+#: config/prefs.php.dist:22
+msgid "Name Format"
+msgstr "Formato do Nome"
+
+#: config/sources.php.dist:295
+msgid "Netcenter Member Directory"
+msgstr "Directório de Membros do Netcenter"
+
+#: add.php:36 add.php:102 lib/Block/minisearch.php:27
+msgid "New Contact"
+msgstr "Novo Contacto"
+
+#: templates/browse/actions.inc:26
+msgid "New List"
+msgstr "Nova Lista"
+
+#: templates/data/import.inc:42
+msgid "Next"
+msgstr "Próxima"
+
+#: config/attributes.php.dist:218
+msgid "Nickname"
+msgstr "Alcunha"
+
+#: lib/api.php:1014 lib/api.php:1063
+#, php-format
+msgid "No %s entry found for %s"
+msgstr "Não se encontrou entrada %s para %s"
+
+#: lib/api.php:982
+msgid "No address books found."
+msgstr "Não se encontrou livros de endereços."
+
+#: minisearch.php:87
+msgid "No contacts found"
+msgstr "Não se encontrou contactos"
+
+#: lib/api.php:356
+msgid "No vCard data was found."
+msgstr "Não se encontrou dados vCard."
+
+#: templates/browse/footer.inc:7
+msgid "None"
+msgstr "Nenhuma"
 
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Notas"
 
-msgid "Options"
-msgstr "Opções"
+#: config/prefs.php.dist:89
+msgid "Number of items per page"
+msgstr "Número de itens por página"
+
+#: lib/api.php:460
+msgid "Object not found"
+msgstr "Objecto não encontrado."
+
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr "Escritório"
+
+#: config/prefs.php.dist:34
+msgid "Other Options"
+msgstr "Outras Opções"
 
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr "Chave Pública PGP"
 
-msgid "Pine addressbook sucessfully imported"
-msgstr "Lista de contactos do Pine importada com sucesso"
-
-msgid "Please choose an address book to add a contact to."
-msgstr "Escolha uma lista de contactos para adicionar um contacto."
+#: lib/api.php:340 lib/api.php:447 lib/api.php:537 lib/api.php:596
+#: lib/api.php:753 lib/api.php:913
+msgid "Permission Denied"
+msgstr "Permissão Negada"
+
+#: lib/Driver.php:436
+msgid "Permission denied"
+msgstr "Permissão Negada"
+
+#: data.php:32 templates/data/import.inc:22
+msgid "Pine Address Book"
+msgstr "Livro de Endereços Pine"
+
+#: templates/browse/javascript.inc:30
+msgid "Please enter the name of the new list:"
+msgstr "Por favor introduza o nome da nova pasta:"
 
+#: templates/prefs/columnselect.inc:221
 msgid "Please select a directory:"
-msgstr "Por favor, escolha um directório:"
+msgstr "Por favor escolha um directório:"
 
-msgid "Problem?"
-msgstr "Problema?"
+#: config/sources.php.dist:399
+msgid "Private Address Book"
+msgstr "Livro de Endereços Privado"
+
+#: lib/Driver/ldap.php:155
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr "A interrogação falhou: (%s) %s"
+
+#: templates/block/minisearch.inc:18
+msgid "Quick Search"
+msgstr "Procura Rápida"
+
+#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr "A leitura falhou: (%s) %s"
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr "Registos mostrados:"
+
+#: templates/prefs/columnselect.inc:239
+msgid "Remove column"
+msgstr "Remover coluna"
+
+#: templates/browse/actions.inc:3
+msgid "Remove from this list"
+msgstr "Remover desta lista"
 
-msgid "Reset"
-msgstr "Limpar"
+#: templates/data/import.inc:26
+msgid ""
+"Replace existing address book with the imported one? <b>Warning: This "
+"deletes all entries in your current address book.</b>"
+msgstr ""
+"Substituir livro de endereços existente pelo importado? <b>Aviso: Isso "
+"removerá todas as entradas no seu livro de endereços corrente.</b>"
 
-msgid "Save Changes"
-msgstr "Gravar alterações"
+#: lib/Driver.php:330
+msgid "Requested object not found."
+msgstr "Objecto pedido não encontrado."
+
+#: add.php:37 templates/browse/search.inc:126
+msgid "Reset to Defaults"
+msgstr "Voltar a Valores por Omissão"
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr "Certificado Público S/MIME"
+
+#: lib/Driver/ldap.php:77
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr "STARTLS falhou: (%s) %s"
 
+#: edit.php:57 add.php:37
 msgid "Save"
-msgstr "Gravar"
-
-msgid "Search Results"
-msgstr "Resultados da pesquisa"
+msgstr "Guardar"
 
+#: templates/browse/search.inc:98 templates/browse/search.inc:125
+#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
 msgid "Search"
-msgstr "Pesquisar"
+msgstr "Procurar"
 
-msgid "Search&nbsp;Results"
-msgstr "Resultados&nbsp;da&nbsp;Pesquisa"
+#: browse.php:241 minisearch.php:66
+msgid "Search Results"
+msgstr "Resultados da Procura"
 
-msgid "Select the destination to import to:"
-msgstr "Seleccione o destino para importar:"
+#: lib/api.php:829
+msgid "Search failed"
+msgstr "Procura falhou"
+
+#: lib/api.php:922 lib/api.php:928 lib/api.php:937 lib/api.php:950
+#, php-format
+msgid "Search failed: %s"
+msgstr "Procura falhou: %s"
+
+#: config/prefs.php.dist:28
+msgid "Searching Options"
+msgstr "Opções de Procura"
+
+#: templates/block/minisearch.inc:24
+msgid "Searching..."
+msgstr "Procurando..."
+
+#: templates/browse/select.inc:9
+msgid "Select Address Book"
+msgstr "Seleccionar Livro de Endereços"
+
+#: templates/browse/actions.inc:24
+msgid "Select List"
+msgstr "Seleccionar Lista"
+
+#: templates/data/export.inc:37
+msgid "Select the address book to export from:"
+msgstr "Seleccione o livro de endereços do qual exportar:"
+
+#: templates/data/import.inc:31
+msgid "Select the address book to import to:"
+msgstr "Seleccione o livro de endereços para o qual importar:"
+
+#: templates/data/export.inc:14
+msgid "Select the export format:"
+msgstr "Seleccione o formato de exportação:"
 
+#: templates/data/import.inc:40
 msgid "Select the file to import:"
-msgstr "Seleccione o ficheiro para importar:"
-
-msgid "Select the format to export to:"
-msgstr "Seleccione o formato para exportar:"
+msgstr "Seleccione o ficheiro a importar:"
 
-msgid "Select the format to import from:"
-msgstr "Seleccione o formato para importar:"
+#: templates/data/import.inc:16
+msgid "Select the format of the source file:"
+msgstr "Seleccione o formato do ficheiro fonte:"
 
-msgid "Select the source to export from:"
-msgstr "Seleccione a origem para exportar:"
+#: config/prefs.php.dist:109
+msgid "Select the format used to display names:"
+msgstr "Seleccione o formato usado para mostrar nomes:"
 
+#: config/prefs.php.dist:17
 msgid "Select view to display by default."
-msgstr "Escolher a vizualização a mostrar por defeito."
+msgstr "Escolher a vizualização a mostrar por omissão."
 
+#: config/prefs.php.dist:11
 msgid "Select which fields to display in the address lists."
-msgstr "Escolher os campos visiveis na listagem de endereços."
+msgstr "Escolher os campos visíveis nas listas de contactos."
 
-msgid "Select your preferred language:"
-msgstr "Seleccione o seu idioma preferido:"
+#: config/prefs.php.dist:23
+msgid "Select which format to display names."
+msgstr "Escolher com que formato mostrar os nomes."
 
+#: templates/prefs/columnselect.inc:243
 msgid "Selected Columns:"
-msgstr "Colunas seleccionadas:"
-
-#, c-format
-msgid "Send mail to %s"
-msgstr "Enviar mail para %s"
-
-msgid "Set your preferred display language."
-msgstr "Seleccione a linguagem de apresentação preferida."
-
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Ficheiros de configuração do Turba não encontrados:"
-
-msgid "The data got lost."
-msgstr "Os dados perderam-se."
-
-msgid "The data was lost"
-msgstr "Os dados perderam-se"
-
-msgid "The file contained no data."
-msgstr "O ficheiro não contém dados."
+msgstr "Colunas Seleccionadas:"
 
-msgid "There are no writeable address books."
-msgstr "Não há listas de contactos com permissão de escrita."
+#: add.php:50
+#, php-format
+msgid "Selected address book \"%s\"."
+msgstr "Seleccionado o livro de endereços \"%s\"."
+
+#: config/sources.php.dist:154
+msgid "Shared Directory"
+msgstr "Directório Partilhado"
+
+#: templates/browse/actions.inc:42
+msgid "Sho_w All"
+msgstr "Mostrar T_udo"
+
+#: templates/browse/select.inc:11
+msgid "Show"
+msgstr "Mostrar"
+
+#: templates/browse/actions.inc:42
+msgid "Show All"
+msgstr "Mostrar Tudo"
+
+#: templates/browse/actions.inc:41
+msgid "Show Contacts"
+msgstr "Mostrar Contactos"
+
+#: templates/browse/actions.inc:40
+msgid "Show Lists"
+msgstr "Mostrar Listas"
+
+#: templates/browse/actions.inc:41
+msgid "Show _Contacts"
+msgstr "Mostrar _Contactos"
+
+#: templates/browse/actions.inc:40
+msgid "Show _Lists"
+msgstr "Mostrar _Listas"
+
+#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:15
+msgid "Sort Direction"
+msgstr "Direcção de Ordenação"
+
+#: lib/api.php:154
+msgid "Sources"
+msgstr "Fontes"
+
+#: config/prefs.php.dist:130
+msgid "Specify where you want advanced search results to appear."
+msgstr "Especifique onde pretende que apareçam os resultados da procura."
+
+#: browse.php:130
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr "Adicação de %s a %s teve sucesso"
+
+#: data.php:29
+msgid "TSV"
+msgstr "TSV"
+
+#: templates/data/import.inc:19 templates/data/export.inc:18
+msgid "Tab separated values"
+msgstr "Valores separados por tabulações"
+
+#: data.php:234
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr "O livro de endereços não pôde ser purgado: %s"
+
+#: edit.php:24 vcard.php:22 display.php:23
+msgid "The contact you requested does not exist."
+msgstr "O contacto pedido não existe."
+
+#: browse.php:33
+msgid "There are no browseable address books."
+msgstr "Não há livros de endereços navegáveis."
 
+#: add.php:29
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"Houve um problema com o envio do ficheiro. O ficheiro deve ser maior queo "
-"tamanho máximo permitido."
+"Não há livros de endereços alteráveis. Nenhum dos livros de endereços "
+"disponíveis está configurado para permitir a adição de novas entradas. Se "
+"achar que isto é um erro, por favor contacte o administrador do sistema."
 
+#: add.php:99
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
-msgstr ""
-"Ocorreu um erro ao adicionar este objecto. Contacte o seu administrador de "
-"sistema para obter ajuda."
-
-msgid ""
-"There was an error deleting this object. Contact your system administrator "
+"There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
-"Ocorreu um erro ao apagar este objecto. Contacte o seu administrador de "
+"Ocorreu um erro ao adicionar este contacto. Contacte o seu administrador de "
 "sistema para obter ajuda."
 
-msgid "There was an error importing the data."
-msgstr "Houve um erro na importação dos dados."
-
-msgid "There was an error importing the uploaded file"
-msgstr "Houve um erro na importação do ficheiro enviado"
-
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
-msgstr ""
-"Este ficheiro controla as preferências padrão para o Turba, e também "
-"controlaquais as preferências que os utilizadores podem alterar."
-
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr ""
-"Este ficheiro controla o estilo utilizado para definir cores e "
-"fontesadicionalmente ou em sobreposição com os padrões do Horde."
-
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
-msgstr ""
-"Este ficheiro define os nomes e tipos dos atributos globais do Turba - "
-"nomes, endereços de email, etc."
-
-msgid "This file defines the list of available sources for Turba."
-msgstr "Este ficheiro define a lista de origens disponível para o Turba."
-
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
-msgstr ""
-"Este é o ficheiro de configuração principal do Turba. Contém caminhos "
-"eopções para os scripts do Turba. "
-
-msgid "This person already has a public key in the addressbook."
-msgstr "Esta pessoa já tem uma chave pública na sua lista de contactos."
-
-msgid "This person is already in your addressbook."
-msgstr "Esta pessoa já está na sua lista de contactos."
+#: browse.php:185
+msgid "There was an error creating a new list."
+msgstr "Ocorreu um erro ao criar uma nova lista."
+
+#: browse.php:136
+#, php-format
+msgid "There was an error deleting %s from the source address book."
+msgstr "Ocorreu um erro removendo %s do livro de endereços de origem."
+
+#: delete.php:31
+#, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Ocorreu um erro ao remover este contacto: %s"
+
+#: browse.php:68
+msgid "There was an error deleting this object."
+msgstr "Ocorreu um erro removendo este objecto."
+
+#: browse.php:273
+msgid "There was an error displaying the select List"
+msgstr "Ocorreu um erro ao mostrar a Lista seleccionada."
+
+#: data.php:249
+#, php-format
+msgid "There was an error importing the data: %s"
+msgstr "Ocorreu um erro na importação de dados: %s"
+
+#: lib/api.php:352
+msgid "There was an error importing the iCalendar data."
+msgstr "Ocorreu um erro na importação de dados iCalendar."
+
+#: browse.php:58
+msgid "There was an error removing this object."
+msgstr "Ocorreu um erro na remoção deste objecto."
+
+#: edit.php:84
+#, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "Ocorreu um erro ao actualizar esta entrada: %s"
+
+#: data.php:151
+msgid "There were no addresses to export."
+msgstr "Não havia endereços a exportar."
+
+#: lib/Driver.php:390 lib/Driver.php:427
+msgid "This address book is read-only"
+msgstr "O livro de endereços só permite leitura"
+
+#: data.php:211
+msgid "This file format is not supported."
+msgstr "Este formato de ficheiro não é suportado."
+
+#: lib/api.php:941 lib/api.php:954
+#, php-format
+msgid "This person already has a %s entry in the address book"
+msgstr "Esta pessoa já tem uma entrada %s no seu livro de endereços."
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Título"
 
-msgid "Turba is not properly configured"
-msgstr "O Turba não está correctamente configurado"
-
-#, c-format
+#: lib/Driver.php:835
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Impossível ler a definição de %s."
 
-msgid "User Options"
-msgstr "Opções do utilizador"
+#: edit.php:57
+msgid "Undo Changes"
+msgstr "Voltar atrás nas alterações"
+
+#: lib/api.php:489
+msgid "Unsupported Content-Type."
+msgstr "Tipo de conteúdo (Content-Type) não é suportado."
+
+#: config/sources.php.dist:358
+msgid "Verisign Directory"
+msgstr "Directório Verisign"
+
+#: templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr "Ver \"%s\""
+
+#: minisearch.php:82
+msgid "View Contact"
+msgstr "Ver Contacto"
 
+#: config/prefs.php.dist:98
 msgid "View to display by default:"
 msgstr "Visualização a mostrar por defeito:"
 
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr "URL da página Web"
+
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Endereço do Emprego"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr "Cidade do Emprego"
+
+#: config/attributes.php.dist:139
+msgid "Work Country"
+msgstr "País do Emprego"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Telefone do Emprego"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
-msgstr ""
-"Não mapeou nenhum campo do ficheiro importado para os campos "
-"correspondentesdo Turba"
-
-msgid "Your Information"
-msgstr "As suas Informações"
-
-msgid "[Edit]"
-msgstr "[Editar]"
-
-msgid "add column"
-msgstr "Adicionar coluna"
-
-msgid "move left"
-msgstr "Mover p/a esquerda"
-
-msgid "move right"
-msgstr "Mover p/a direita"
-
-msgid "remove column"
-msgstr "remover coluna"
-
+#: config/attributes.php.dist:134
+msgid "Work Postal Code"
+msgstr "Código Postal do Emprego"
+
+#: config/attributes.php.dist:129
+msgid "Work State/Province"
+msgstr "Estado/Província do Emprego"
+
+#: config/attributes.php.dist:119
+msgid "Work Street Address"
+msgstr "Rua do Emprego"
+
+#: templates/browse/javascript.inc:30
+msgid "You are creating a distribution list."
+msgstr "Está a criar uma lista de distribuição."
+
+#: edit.php:44 display.php:59
+msgid "You do not have permission to view this contact."
+msgstr "Não tem permissão para ver este contacto."
+
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr "Não tem permissão para ver este objecto."
+
+#: templates/browse/javascript.inc:51
+msgid "You must select a target address book."
+msgstr "Tem de seleccionar um livro de endereços alvo."
+
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr "Tem de seleccionar uma lista alvo."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
+#: templates/browse/javascript.inc:68
+msgid "You must select at least one entry first."
+msgstr "Tem de seleccionar primeiro pelo menos uma entrada."
+
+#: edit.php:48
+msgid "You only have permission to view this contact."
+msgstr "Só tem permissão para ver este contacto."
+
+#: browse.php:284
+msgid "Your default addressbook is not browseable."
+msgstr "O seu livro de endereços por omissão não é navegável."
+
+#: templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr "[sem valor]"
+
+#: lib/Turba.php:286
+msgid "_Add"
+msgstr "_Adicionar"
+
+#: lib/Turba.php:283
+msgid "_Browse"
+msgstr "_Navegar"
+
+#: templates/browse/actions.inc:3
+msgid "_Delete"
+msgstr "_Remover"
+
+#: lib/Turba.php:292
+msgid "_Import/Export"
+msgstr "_Importar/Exportar"
+
+#: templates/browse/actions.inc:3
+msgid "_Remove from this list"
+msgstr "Remov_er desta lista"
+
+#: lib/Turba.php:288
+msgid "_Search"
+msgstr "_Procurar"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr "contacto.vcf"
+
+#: data.php:172 data.php:177 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr "contactos.csv"
+
+#: data.php:182
+msgid "contacts.tsv"
+msgstr "contactos.tsv"
+
+#: templates/browse/actions.inc:14
+msgid "to Selected Address Book"
+msgstr "Seleccionar Livro de Endereços"
+
+#: data.php:30 templates/browse/column_headers.inc:7
+#: templates/data/import.inc:20 templates/data/export.inc:20
+msgid "vCard"
+msgstr "vCard"


--- orig/config/prefs.php.dist
+++ mod/config/prefs.php.dist
@@ -1,33 +1,36 @@
 <?php
 /**
- * $Horde: turba/config/prefs.php.dist,v 1.28 2004/09/23 12:49:50 jan Exp $
+ * $Horde: turba/config/prefs.php.dist,v 1.28.10.2 2005/10/24 15:39:12 jan Exp $
  *
  * See horde/config/prefs.php for documentation on the structure of this file.
  */
 
+$prefGroups['addressbooks'] = array(
+    'column' => _("Display Options"),
+    'label' => _("Address Books"),
+    'desc' => _("Choose which address books to use."),
+    'members' => array('default_dir', 'addressbookselect')
+);
+
 $prefGroups['columns'] = array(
     'column' => _("Display Options"),
     'label' => _("Column Options"),
     'desc' => _("Select which fields to display in the address lists."),
-    'members' => array('columnselect'));
+    'members' => array('columnselect')
+);
 
 $prefGroups['display'] = array(
     'column' => _("Display Options"),
-    'label' => _("Default Display"),
-    'desc' => _("Select view to display by default."),
-    'members' => array('initial_page', 'sortby', 'sortdir', 'maxpage', 'perpage'));
+    'label' => _("Display"),
+    'desc' => _("Select view to display by default, sort options, and paging options."),
+    'members' => array('initial_page', 'sortby', 'sortdir', 'maxpage', 'perpage', 'adv_results_placement')
+);
 
 $prefGroups['format'] = array(
     'column' => _("Display Options"),
     'label' => _("Name Format"),
     'desc' => _("Select which format to display names."),
-    'members' => array('name_format'));
-
-$prefGroups['search'] = array(
-    'column' => _("Display Options"),
-    'label' => _("Searching Options"),
-    'desc' => _("Choose a default directory for your personal addressbook, contact lists, and searches."),
-    'members' => array('default_dir', 'adv_results_placement')
+    'members' => array('name_format')
 );
 
 $prefGroups['application'] = array(
@@ -37,6 +40,29 @@
     'members' => array('delete_opt')
 );
 
+if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
+    !isset($GLOBALS['conf']['imsp']['enabled'])) {
+    $prefGroups['imsp'] = array(
+        'column' => _("Other Options"),
+        'label' => _("IMSP Address Book Administration"),
+        'desc' => _("Add and Delete IMSP address books"),
+        'members' => array('imsp_opt')
+    );
+}
+
+// address book selection widget
+$_prefs['addressbookselect'] = array(
+    'locked' => false,
+    'type' => 'special'
+);
+
+// address books to be displayed
+$_prefs['addressbooks'] = array(
+    'value' => '',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit'
+);
 
 // columns selection widget
 $_prefs['columnselect'] = array(
@@ -102,13 +128,14 @@
 
 // the format to display names.  Either 'last_first' or 'first_last'
 $_prefs['name_format'] = array(
-    'value' => 'first_last',
+    'value' => 'none',
     'locked' => false,
     'shared' => false,
     'type' => 'enum',
     'desc' => _("Select the format used to display names:"),
     'enum' => array('last_first' => _("\"Lastname, Firstname\" (ie. Doe, John)"),
-                    'first_last' => _("\"Firstname Lastname\"  (ie. John Doe)"))
+                    'first_last' => _("\"Firstname Lastname\"  (ie. John Doe)"),
+                    'none' => _("no formatting"))
 );
 
 // Default directory
@@ -118,10 +145,11 @@
     'locked' => false,
     'shared' => true,
     'type' => 'select',
-    'desc' => _("Default directory for your personal addressbook, contact lists, and searches.")
+    'desc' => _("This will be the default address book when adding or importing contacts.")
 );
 
-// Advanced search results placement. Are results positioned above or below the search form?
+// Advanced search results placement. Are results positioned above or below
+// the search form?
 $_prefs['adv_results_placement'] = array(
     'value' => 'below',
     'locked' => false,
@@ -148,3 +176,11 @@
     'type' => 'checkbox',
     'desc' => _("Do you want to confirm deleting entries?")
 );
+
+if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
+    !isset($GLOBALS['conf']['imsp']['enabled'])) {
+    $_prefs['imsp_opt'] = array(
+        'locked' => false,
+        'type' => 'special'
+    );
+}


--- orig/docs/INSTALL
+++ mod/docs/INSTALL
@@ -1,9 +1,9 @@
 ======================
- Installing Turba 2.0
+ Installing Turba 2.1
 ======================
 
-:Last update:   $Date: 2005/02/03 15:04:40 $
-:Revision:      $Revision: 1.10.10.2 $
+:Last update:   $Date: 2005/10/18 12:51:40 $
+:Revision:      $Revision: 1.10.10.4 $
 :Contact:       turba at lists.horde.org
 
 .. contents:: Contents


--- orig/templates/data/import.inc
+++ mod/templates/data/import.inc
@@ -2,48 +2,48 @@
 <?php Util::pformInput() ?>
 <input type="hidden" name="actionID" value="<?php echo htmlspecialchars($next_step) ?>" />
 <input type="hidden" name="import_step" value="<?php echo (int)$import_step ?>" />
-<table cellspacing="0" cellpadding="0" border="0" width="100%">
-<tr>
-  <td>
-    <table cellpadding="3" cellspacing="0" border="0" width="100%">
-    <tr><td class="header" align="center"><?php echo sprintf(_("Import Address Book, Step %d"), (int)$import_step) ?></td>
-    </tr></table>
-  </td>
-</tr>
-<tr>
-  <td class="item">
-  <table border="0"><tr><td>
-    <label for="import_format"><?php echo _("Select the format of the source file:") ?></label><br />
-    <select name="import_format" id="import_format">
-      <option value="csv"><?php echo _("Comma separated values") ?></option>
-      <option value="tsv"><?php echo _("Tab separated values") ?></option>
-      <option value="vcard"><?php echo _("vCard") ?></option>
-      <option value="mulberry"><?php echo _("Mulberry Address Book") ?></option>
-      <option value="pine"><?php echo _("Pine Address Book") ?></option>
-    </select><br />
-
-    <input type="checkbox" align="middle" name="purge" id="purge" value="1" />
-    <label for="purge"><?php echo _("Replace existing address book with the imported one? <b>Warning: This deletes all entries in your current address book.</b>") ?></label>
-    <br />
+
+<h1 class="header">
+ <?php printf(_("Import Address Book, Step %d"), (int)$import_step) ?>
+</h1>
+
+<div class="item">
+ <label for="import_format"><?php echo _("Select the format of the source file:") ?></label><br />
+ <select name="import_format" id="import_format">
+  <option value="csv"><?php echo _("Comma separated values") ?></option>
+  <option value="tsv"><?php echo _("Tab separated values") ?></option>
+  <option value="vcard"><?php echo _("vCard") ?></option>
+  <option value="mulberry"><?php echo _("Mulberry Address Book") ?></option>
+  <option value="pine"><?php echo _("Pine Address Book") ?></option>
+ </select><br />
+
+ <input type="checkbox" align="middle" name="purge" id="purge" value="1" />
+ <label for="purge"><?php echo _("Replace existing address book with the imported one? <strong>Warning: This deletes all entries in your current address book.</strong>") ?></label>
+ <br />
 
 <?php if (count($dest_options) > 1): ?>
-    <br />
-    <label for="dest"><?php echo _("Select the address book to import to:") ?></label><br />
-    <select name="dest" id="dest">
-      <?php echo implode('', $dest_options) ?>
-    </select><br />
+ <br />
+ <label for="dest"><?php echo _("Select the address book to import to:") ?></label><br />
+ <select name="dest" id="dest">
+  <?php echo implode('', $dest_options) ?>
+ </select><br />
 <?php else: ?>
-    <input type="hidden" name="dest" value="<?php echo htmlspecialchars($unique_dest) ?>" />
+ <input type="hidden" name="dest" value="<?php echo htmlspecialchars($unique_dest) ?>" />
 <?php endif; ?>
-<br />
+ <br />
+
+ <label for="charset"><?php echo _("Select the charset of the source file:") ?></label><br />
+ <select name="charset" id="charset" style="direction: ltr">
+<?php foreach ($charsets as $charset => $charset_name): ?>
+  <option value="<?php echo htmlspecialchars($charset) ?>"<?php if ($charset == $my_charset) echo ' selected="selected"' ?>><?php echo htmlspecialchars($charset_name) ?></option>
+<?php endforeach; ?>
+ </select>
+ <br /><br />
 
-    <label for="import_file"><?php echo _("Select the file to import:") ?></label><br />
-    <input type="file" name="import_file" id="import_file" class="fixed" size="40" /><br /><br />
-    <input type="submit" value="<?php echo _("Next") ?>" class="button" />
-  </td></tr></table>
-  </td>
-</tr>
-</table>
+ <label for="import_file"><?php echo _("Select the file to import:") ?></label><br />
+ <input type="file" name="import_file" id="import_file" class="fixed" size="40" /><br /><br />
+ <input type="submit" value="<?php echo _("Next") ?>" class="button" />
+</div>
 </form>
 
-<br />
+<br class="spacer" />


--- orig/lib/version.php
+++ mod/lib/version.php
@@ -1 +1 @@
-<?php define('TURBA_VERSION', 'H3 (2.0.5)') ?>
+<?php define('TURBA_VERSION', 'H3 (2.1)') ?>


--- orig/templates/common-header.inc
+++ mod/templates/common-header.inc
@@ -6,7 +6,7 @@
 }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<!-- Turba: Copyright 2000-2005, The Horde Project. Turba is under an ASL license. -->
+<!-- Turba: Copyright 2000-2006, The Horde Project. Turba is under an ASL license. -->
 <!--   Horde Project: http://horde.org/ | Turba: http://horde.org/turba/    -->
 <!--       Horde ASL License: http://www.horde.org/licenses/asl.php         -->
 <?php echo !empty($language) ? '<html lang="' . strtr($language, '_', '-') . '">' : '<html>' ?>
@@ -20,9 +20,9 @@
 }
 Horde::includeScriptFiles();
 ?>
-<title><?php echo $page_title ?></title>
+<title><?php echo htmlspecialchars($page_title) ?></title>
 <link href="<?php echo $GLOBALS['registry']->getImageDir()?>/favicon.ico" rel="SHORTCUT ICON" />
 <?php echo Horde::stylesheetLink('turba') ?>
 </head>
 
-<body<?php if (Util::nonInputVar('bodyClass')) echo ' class="' . $bodyClass . '"'; if (!empty($nls['rtl'][$language])) echo ' style="direction:rtl"'; ?>>
+<body<?php if (Util::nonInputVar('bodyClass')) echo ' class="' . $bodyClass . '"'; ?>>


--- orig/docs/RELEASE_NOTES
+++ mod/docs/RELEASE_NOTES
@@ -12,36 +12,39 @@
  * 8 - Minor security fixes
  * 9 - Major security fixes
  */
-$this->notes['fm']['focus'] = 8;
+$this->notes['fm']['focus'] = 5;
 
 /* Mailing list release notes. */
 $this->notes['ml']['changes'] = <<<ML
 The Horde Team is pleased to announce the final release of the Turba Contact
-Manager version H3 (2.0.5).
-
-This is a security release that fixes cross site scripting
-vulnerabilities in several of the address book name and contact data
-fields. None of the vulnerabilities can be exploited by
-unauthenticated users; however, we strongly recommend that all users
-of Turba 2.0.4 upgrade to 2.0.5 as soon as possible.
-
-Many thanks to Johannes Greil of SEC Consult
-(http://www.sec-consult.com/) for reporting these problems and working
-with us to test the fixes.
+Manager version H3 (2.1).
 
 Turba is the Horde contact management application. It is a production level
 address book, and makes heavy use of the Horde framework to provide
 integration with IMP and other Horde applications.
 
-Major changes compared to the Turba version H3 (2.0.4) are:
-    * Close several XSS vulnerabilities with address book and contact data.
+Major changes compared to the Turba H3 (2.0) versions are:
+    * Submenu with address books and "Add" and "Search" entries in sidebar.
+    * Distribution lists can contain contacts from multiple sources.
+    * Shared address books.
+    * Paged browse view.
+    * Add files and threaded comments to contacts.
+    * Edit several contacts at once.
+    * Improved CSV import.
+    * Keep names optionally unformatted.
+    * Export more than one vCard at once.
+    * New language: Icelandic.
+    * Drop cached searches.
+    * Compatible with PHP 5.1.
+    * Improved MS-SQL support.
+    * Permissions managed completely though administration interface.
+    * Permission to restrict number of contacts.
+    * Command line script to batch import vCards.
 ML;
 
-/* Freshmeat release notes. */
+/* Freshmeat release notes, not more than 600 characters. */
 $this->notes['fm']['changes'] = <<<FM
-Several XSS vulnerabilities with address book and contact data have
-been closed. The holes closed were only exploitable by authenticated
-users.
+A submenu with address books has been added to the sidebar. Distribution lists allow contacts from multiple sources. Shared address books and support for adding files and threaded comments to contacts have been added. Several contacts can be added at once. CSV import and MS-SQL support have been improved. Names are optionally kept unformatted. More than one vCard can be added at once. Cached searches have been dropped. Permission management has been simplified and new permissions to restrict the number of contacts have been added. A command line script to batch import vCards has been added.
 FM;
 
 $this->notes['name'] = 'Turba';


--- orig/lib/ObjectView.php
+++ mod/lib/ObjectView.php
@@ -1,21 +1,20 @@
 <?php
 /**
  * The Turba_ObjectView:: class provides an interface for visualizing
- * a Turba_AbstractObject.
+ * a Turba_Object.
  *
- * $Horde: turba/lib/ObjectView.php,v 1.27.4.3 2005/07/03 03:14:43 selsky Exp $
+ * $Horde: turba/lib/ObjectView.php,v 1.27.4.4 2005/10/18 12:50:05 jan Exp $
  *
  * @author   Chuck Hagenbuch <chuck at horde.org>
- * @since    Turba 0.0.1
  * @package  Turba
  */
 class Turba_ObjectView {
 
     /**
-     * A reference to the Turba_AbstractObject that this
+     * A reference to the Turba_Object that this
      * Turba_ObjectView displays.
      * @access private
-     * @var Turba_AbstractObject
+     * @var Turba_Object
      */
     var $_object;
 
@@ -41,9 +40,9 @@
     /**
      * Constructs a new Turba_ObjectView object.
      *
-     * @param Turba_AbstractObject $object  The object to display.
-     * @param string $template              Which template file to display
-     *                                      this object with.
+     * @param Turba_Object $object  The object to display.
+     * @param string $template      Which template file to display this object
+     *                              with.
      */
     function Turba_ObjectView(&$object, $template = null)
     {


--- orig/po/nn_NO.po
+++ mod/po/nn_NO.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 2.0-cvs\n"
-"POT-Creation-Date: 2002-06-08 22:16+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-06-08 22:44+0100\n"
 "Last-Translator: Per-Stian Vatne <psv at orsta.org>\n"
 "Language-Team: Norwegian Nynorsk <nynorsk at orsta.org>\n"
@@ -14,360 +15,1370 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "Fila %s vart importert"
 
-msgid "Add Contact ..."
-msgstr "Legg til kontakt..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "Legg til ny kontakt"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Adresseboklisting"
 
-msgid "Add failed"
-msgstr "Kunne ikkje legge til"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
 
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
+
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Legg til"
 
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Ugyldig adressebok."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Ingen adressebøker med skrivetilgang."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "legg til kolonne"
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "Kunne ikkje legge til"
+
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "Legg til"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Adresseboklisting"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Adresseboklisting"
 
-msgid "Addressbook is read-only."
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Adresseboklisting"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "Adresseboka er berre lesbar"
+
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "Pine-adressebok vart importert"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
 msgstr "Adresseboka er berre lesbar"
 
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Alias"
 
-msgid "Available Columns:"
-msgstr "Tilgjengelege kolonner:"
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
+
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
+
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "Søk"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
 
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Bla gjennom"
 
-msgid "Cancel"
-msgstr "Avbryt"
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
+
+#: data.php:49
+msgid "CSV"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "Mobiltelefon"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Vel rekkefølgja på kolonnene som skal visast i adresselista."
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
 
-msgid "Clear Search"
-msgstr "Nullstill søk"
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "Ingen adressebøker tilgjengeleg for gjennomsyning."
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Ingen adressebøker tilgjengeleg for gjennomsyning."
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
 
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr "Vel rekkefølgja på kolonnene som skal visast i adresselista."
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Alternativ for kolonne"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Firma"
 
-#, c-format
-msgid "Contents of %s"
-msgstr "Innhald i %s"
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Adresse, privat"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Kunne ikkje slette"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "Kunne ikkje slette"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "Firma"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Eksporter adressebok"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
 
-msgid "Default Display"
-msgstr "Standardvising"
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
 
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Slett"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Eksporter adressebok"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Kunne ikkje slette"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Kunne ikkje slette"
 
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "Brukaralternativ"
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Katalog"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Visingsalternativ"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Visingsalternativ"
 
-#, c-format
-msgid "Edit '%s'"
-msgstr "Endre '%s'"
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
 
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Endre"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Endre '%s'"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Eksporter adressebok"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "E-post"
 
-msgid "Error while searching directory."
-msgstr "Feil ved søking i katalog."
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Export Addressbook"
-msgstr "Eksporter adressebok"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "Fila %s vart importert"
 
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Ingen adressebøker med skrivetilgang."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Eksport"
 
-msgid "Failed to access the specified address book."
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "Eksporter adressebok"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
 msgstr "Fekk ikkje tilgang til den spesifiserte adresseboka."
 
-#, c-format
-msgid "Failed to browse %s."
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
 msgstr "Kunne ikkje bla i %s."
 
-msgid "Failed to connect to the specified directory."
-msgstr "Kunne ikkje kople til den spesifiserte katalogen."
+#: browse.php:272
+#, fuzzy
+msgid "Failed to browse list"
+msgstr "Kunne ikkje bla i %s."
 
-#, c-format
-msgid "Failed to search the directory: %s"
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
+msgstr "Kunne ikkje søke i katalogen: %s"
+
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
 msgstr "Kunne ikkje søke i katalogen: %s"
 
-msgid "Failed to search the specified directory."
-msgstr "Kunne ikkje søke i den spesifiserte katalogen."
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Fekk ikkje tilgang til den spesifiserte adresseboka."
+
+#: data.php:149
+#, php-format
+msgid "Failed to search the directory: %s"
+msgstr "Kunne ikkje søke i katalogen: %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Faks"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Tittel"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Finn"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Finn"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Frå"
 
-msgid "Help"
-msgstr "Hjelp"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Eksporter adressebok"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
 
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Adresse, privat"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "Telefon, privat"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Telefon, privat"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "Dersom du importerer CSV-data; inneheld den første rada feltnamn?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Telefon, privat"
+
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "Telefon, privat"
 
-msgid "Illegal or malformed form data."
-msgstr "Ulovleg eller feil utforma data."
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Adresse, privat"
 
-msgid "Import Addressbook"
-msgstr "Importer adressebok"
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
 
-msgid "Import"
-msgstr "Import"
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Adresseboklisting"
+
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Importer adressebok"
 
-msgid "Import/Export Addressbooks"
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "Importer/eksporter adressebøker"
 
-msgid "Import/Export"
-msgstr "Import/eksport"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Ugyldig namn."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "Ugyldig adressebok."
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "Ugyldig e-postadresse."
 
-msgid "Invalid email."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
+msgstr "Ugyldig namn."
+
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
 msgstr "Ugyldig e-postadresse."
 
-msgid "Invalid name."
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
 msgstr "Ugyldig namn."
 
-msgid "Invalid public key."
-msgstr "Ugyldig offentleg nøkkel."
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "Ugyldig namn."
+
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
 
-msgid "Language"
-msgstr "Språk"
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Namn"
 
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "List"
 
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "samsvarande med"
 
-msgid "More than 1 entry returned."
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "List"
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "Søk"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Telefon, privat"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+#, fuzzy
+msgid "More than 1 entry found"
 msgstr "Meir enn 1 oppføring returnert."
 
-msgid "Mulberry addressbook sucessfully imported"
-msgstr "Mulberry-adressebok vart importert"
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "flytt venstre"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "flytt høgre"
+
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "Eksporter adressebok"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Adresseboklisting"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Adresseboklisting"
 
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Namn"
 
-#, c-format
-msgid "No public key found for %s."
+#: config/prefs.php.dist:31
+msgid "Name Format"
+msgstr ""
+
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "Legg til ny kontakt"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Namn"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, fuzzy, php-format
+msgid "No %s entry found for %s"
 msgstr "Fann ingen offentleg nøkkel for %s."
 
-msgid "None of the available address books are configured to allow you to add new entries to them. If you believe this is an error, please contact your system administrator."
-msgstr "Ingen av deil tilgjengelege adressebøkene er konfigurert til å la deg legge til nye oppføringar. Dersom du meinar dette er feil, ver venleg og kontakt din systemadministrator."
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "Adresseboka er berre lesbar"
+
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "Notatar"
 
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Notatar"
 
-msgid "Options"
-msgstr "Alternativ"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
+
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
+
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
 
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "Brukaralternativ"
+
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr "PGP offentleg nøkkel"
 
-msgid "Pine addressbook sucessfully imported"
-msgstr "Pine-adressebok vart importert"
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
 
-msgid "Please choose an address book to add a contact to."
-msgstr "Vel ei adressebok for å legge til ei kontakt."
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
 
-msgid "Please select a directory:"
-msgstr "Vel ein katalog:"
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
 
-msgid "Problem?"
-msgstr "Problem?"
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "Adresseboklisting"
 
-msgid "Reset"
-msgstr "Nullstill"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
 
-msgid "Save Changes"
-msgstr "Lagre endringar"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
+
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Eksporter adressebok"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Søk"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Importer adressebok"
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "fjern kolonne"
+
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
 
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Lagre"
 
-msgid "Search Results"
-msgstr "Søkeresultat"
-
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Søk"
 
-msgid "Search&nbsp;Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Søkeresultat"
 
-msgid "Select the destination to import to:"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "Søk"
+
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "Søk"
+
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Vel ei adressebok for å legge til ei kontakt."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Vel ei adressebok for å legge til ei kontakt."
+
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Vel kjelde å eksportere frå:"
+
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "Vel mål for import:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Vel kjelde å eksportere frå:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "Vel kjelde å eksportere frå:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Vel fil som skal importerast:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "Vel format å eksportere til:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "Vel format å importere frå:"
 
-msgid "Select the source to export from:"
-msgstr "Vel kjelde å eksportere frå:"
-
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Vel vising som skal brukast som standard."
 
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Vel kva felt som skal visast i adresselistene."
 
-msgid "Select your preferred language:"
-msgstr "Vel ønska språk:"
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "Vel kva felt som skal visast i adresselistene."
+
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "Ugyldig adressebok."
+
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Katalog"
+
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
+
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr ""
+
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr ""
+
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "Katalog"
+
+#: lib/api.php:198
+msgid "Sources"
+msgstr ""
+
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
+
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
+
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
+
+#: data.php:50
+msgid "TSV"
+msgstr ""
+
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
+
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
 
-msgid "Selected Columns:"
-msgstr "Tilgjengelege kolonner:"
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "Send post til %s"
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
 
-msgid "Set your preferred display language."
-msgstr "Set ønska språk."
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Nokre av Turba sine konfigurasjonsfiler manglar:"
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Pine-adressebok vart importert"
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
 
-msgid "The data got lost."
-msgstr "Dataene forsvann"
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
 
-msgid "The data was lost"
-msgstr "Dataene forsvann"
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Fila %s vart importert"
 
-msgid "The file contained no data."
-msgstr "Fila inneheld ingen data."
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
 
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Ingen adressebøker tilgjengeleg for gjennomsyning."
 
-#, c-format
-msgid "There are no entries in %s."
-msgstr "Ingen oppføringar i %s."
+#: add.php:29
+#, fuzzy
+msgid ""
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
+msgstr ""
+"Ingen av deil tilgjengelege adressebøkene er konfigurert til å la deg legge "
+"til nye oppføringar. Dersom du meinar dette er feil, ver venleg og kontakt "
+"din systemadministrator."
 
-msgid "There are no writeable address books."
-msgstr "Ingen adressebøker med skrivetilgang."
+#: add.php:121
+#, fuzzy
+msgid ""
+"There was an error adding the new contact. Contact your system administrator "
+"for further help."
+msgstr ""
+"Feil når objektet skulle leggast til. Kontakt din systemadministrator for "
+"vidare hjelp."
+
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Det skjedde ein feil ved import av data."
+
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
+msgstr "Det skjedde ein feil ved import av data."
+
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Det skjedde ein feil ved import av den opplasta fila"
 
-msgid "There was a problem with the file upload. The file may have been larger than the maximum allowed size."
-msgstr "Problem ved opplasting av fil. Fila var kanskje større enn den maksimalt tillatte storleiken."
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Det skjedde ein feil ved import av den opplasta fila"
+
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Det skjedde ein feil ved import av data."
+
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "Det skjedde ein feil ved import av data."
+
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "Det skjedde ein feil ved import av data."
 
-msgid "There was an error adding this object. Contact your system administrator for further help."
-msgstr "Feil når objektet skulle leggast til. Kontakt din systemadministrator for vidare hjelp."
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "Det skjedde ein feil ved import av data."
 
-msgid "There was an error deleting this object. Contact your system administrator for further help."
-msgstr "Feil når objektet skulle slettast. Kontakt din systemadministrator for vidare hjelp."
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "Det skjedde ein feil ved import av data."
 
-msgid "There was an error importing the data."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
 msgstr "Det skjedde ein feil ved import av data."
 
-msgid "There was an error importing the uploaded file"
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Det skjedde ein feil ved import av den opplasta fila"
 
-msgid "This file controls the default preferences for Turba, and also controls which preferences users can alter."
-msgstr "Denne fila kontrollerer standardinnstillingane for Turba, og kontrollerer også kva innstillingar brukarar kan endre."
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Det skjedde ein feil ved import av den opplasta fila"
 
-msgid "This file controls the stylesheet that is used to set colors and fonts in addition to or overriding Horde defaults."
-msgstr "Denne fila kontrollerer stilarket som blir brukt til å definere fargar og skrifttypar, og legg til eller overstyrer standardverdiane til Horde."
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "Det skjedde ein feil ved import av data."
 
-msgid "This file defines the Turba global attribute names and types - names, email addresses, etc."
-msgstr "Denne fila definerer dei globale attributtnamna og -typane for Turba - namn, e-postadresser, osb."
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Ingen adressebøker med skrivetilgang."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "Denne fila definerer lista over tilgjengelege kjelder for Turba."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
 
-msgid "This is the main Turba configuration file. It contains paths and options for the Turba scripts."
-msgstr "Dette er hovedkonfigurasjonsfila for Turba. Den inneheld katalognamn og alternativ for skripta i Turba."
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
 
-msgid "This person already has a public key in the addressbook."
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "Denne personen har allereie ein offentleg nøkkel i adresseboka."
 
-msgid "This person is already in your addressbook."
-msgstr "Denne personen er allereie i adresseboka di."
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Tittel"
 
-msgid "Turba is not properly configured"
-msgstr "Turba er ikkje ordentleg konfigurert"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Kunne ikkje laste inn definisjonen til %s."
 
-msgid "User Options"
-msgstr "Brukaralternativ"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "Lagre endringar"
 
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Katalog"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "Legg til ny kontakt"
+
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Bruk denne visinga som standard:"
 
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
+
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Adresse, arbeid"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "Telefon, arbeid"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Telefon, arbeid"
 
-msgid "You didn't map any fields from the imported file to the corresponding fields in Turba."
-msgstr "Du kopla ingen felt frå den importerte fila til korresponderande felt i Turba."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Telefon, arbeid"
 
-msgid "Your Information"
-msgstr "Din informasjon"
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "Telefon, arbeid"
 
-msgid "[Edit]"
-msgstr "[Endre]"
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Adresse, arbeid"
 
-msgid "add column"
-msgstr "legg til kolonne"
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-msgid "move left"
-msgstr "flytt venstre"
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
 
-msgid "move right"
-msgstr "flytt høgre"
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
 
-msgid "remove column"
-msgstr "fjern kolonne"
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
+
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
+
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
+
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "Bla gjennom"
+
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "Slett"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "Import/eksport"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "List"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Adresseboklisting"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Legg til ny kontakt"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "Søk"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
 
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "Eksporter adressebok"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/po/ko_KR.po
+++ mod/po/ko_KR.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Turba 2.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-02-10 02:08+0100\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2001-11-10 02:40+0900\n"
 "Last-Translator: Jinhyok Heo <novembre at ournature.org>\n"
 "Language-Team: i18n at lists.horde.org\n"
@@ -15,76 +15,131 @@
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Pine ÁÖ¼Ò·Ï"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "¼±ÅÃµÈ ÁÖ¼Ò·ÏÀ¸·Î"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, fuzzy, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "'%s'´Â ¸®½ºÆ®À̹ǷΠº¹»çµÇÁö ¾ÊÀ½"
+
+#: browse.php:124
+#, fuzzy, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "'%s'´Â ¸®½ºÆ®À̹ǷΠ¿Å°ÜÁöÁö ¾ÊÀ½"
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "À̸§ ¼º(¿¹: John Doe)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "¼º, À̸§(¿¹: Doe, John)"
 
-#: add.php:96
+#: add.php:109
+#, php-format
 msgid "%s added."
 msgstr "%s Ãß°¡µÊ."
 
-#: data.php:256
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "%s ÆÄÀÏÀ» ¼º°øÀûÀ¸·Î °¡Á®¿Ô½À´Ï´Ù."
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
+#, php-format
 msgid "%s to %s of %s"
 msgstr "%s ~ %s, Àüü %s °³"
 
-#: browse.php:146
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s'´Â ¸®½ºÆ®À̹ǷΠº¹»çµÇÁö ¾ÊÀ½"
-
-#: browse.php:144
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s'´Â ¸®½ºÆ®À̹ǷΠ¿Å°ÜÁöÁö ¾ÊÀ½"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Pine ÁÖ¼Ò·Ï"
 
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
 msgstr "iFrameÀ» Áö¿øÇÏ´Â ºê¶ó¿ìÁ®°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
 msgstr ""
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "_v°í±Þ °Ë»ö"
+#: view.php:52
+#, fuzzy, php-format
+msgid "Access denied to %s"
+msgstr "%s°¡ %s¿¡ ¼º°øÀûÀ¸·Î Ãß°¡µÊ"
 
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Ãß°¡"
 
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "À߸øµÈ ÁÖ¼Ò·Ï"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "ÁÖ¼Ò·Ï '%s' ¼±ÅÃ"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Ä®·³ Ãß°¡"
 
-#: templates/browse/actions.inc:33
+#: edit.php:128
+msgid "Add file"
+msgstr ""
+
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "Ãß°¡"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Pine ÁÖ¼Ò·Ï"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "ÁÖ¼Ò·Ï ¸®½ºÆ®"
 
-#: add.php:95
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Pine ÁÖ¼Ò·Ï"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "ÁÖ¼Ò·Ï ÀÔ·Â"
 
-#: lib/Driver.php:496
-msgid "Address book is read-only."
-msgstr "ÁÖ¼Ò·ÏÀº Àбâ Àü¿ëÀÔ´Ï´Ù."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "ÁÖ¼Ò·ÏÀÌ ¼º°øÀûÀ¸·Î ºñ¿öÁü"
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "ÁÖ¼Ò·Ï ÀÔ·Â"
+
+#: templates/prefs/addressbookselect.inc:170
+#, fuzzy
+msgid "Address books that will not be displayed:"
+msgstr "ÁÖ¼Ò·ÏÀ» ºñ¿ï ¼ö ¾ø½À´Ï´Ù: %s"
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "°í±Þ °Ë»ö"
 
@@ -92,103 +147,107 @@
 msgid "Alias"
 msgstr "º°¸í"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "¸ðµÎ ¼±ÅÃ"
 
-#: lib/api.php:372
+#: lib/api.php:552
 msgid "Already Exists"
 msgstr "ÀÌ¹Ì Á¸ÀçÇÔ"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
+#, fuzzy, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "%¸¦ Á¤¸» Áö¿ì°Ú½À´Ï±î?"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "¼±ÅÃÇÑ °ÍµéÀ» Á¤¸» Áö¿ì°Ú½À´Ï±î?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "¿À¸§Â÷¼ø"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "°¡´ÉÇÑ Ç׸ñ:"
-
-#: templates/browse/actions.inc:55
-msgid "Ba_ck to %s"
-msgstr "_c%s·Î µ¹¾Æ°¡±â"
-
-#: templates/browse/actions.inc:55
-msgid "Back to %s"
-msgstr "%s·Î µ¹¾Æ°¡±â"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "_c±âº» °Ë»ö"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
 msgstr "±âº» °Ë»ö"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
 msgstr ""
 
-#: lib/Driver/ldap.php:82 lib/Driver/ldap.php:85
-#, php-format
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, fuzzy, php-format
 msgid "Bind failed: (%s) %s"
-msgstr ""
+msgstr "¼öÁ¤ ½ÇÇ¥: (%s) %s"
 
 #: config/attributes.php.dist:178
 msgid "Birthday"
 msgstr "»ýÀÏ"
 
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "_BŽ»ö"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr ""
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "_l°Ë»öÇ׸ñ ÃʱâÈ­"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "¼±ÅÃ"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr "±âº» µð·ºÅ丮 ¼±ÅÃ"
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "ÁÖ¼Ò·Ï ¼±ÅÃ"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "ÁÖ¼Ò·Ï ¼±ÅÃ"
 
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "ÁÖ¼Ò·Ï ¼±ÅÃ"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "ÁÖ¼Ò·Ï ¼±ÅÃ"
+
 #: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
 msgstr "ÁÖ¼Ò ¸ñ·ÏÀÇ Ä®·³ Ç¥½Ã ¼ø¼­ ¼±ÅÃ"
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "°Ë»öÇ׸ñ ÃʱâÈ­"
-
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Ä÷³ ¿É¼Ç"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "ÄÞ¸¶·Î ±¸ºÐµÈ °ª"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "ÄÞ¸¶·Î ±¸ºÐµÈ °ª(¾Æ¿ô·è ¿ë)"
 
@@ -200,64 +259,82 @@
 msgid "Company Address"
 msgstr "ȸ»ç ÁÖ¼Ò"
 
-#: lib/api.php:611 lib/api.php:800
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, php-format
 msgid "Connection failed: %s"
 msgstr "¿¬°á ½ÇÆÐ: %s"
 
-#: lib/Driver/ldap.php:63
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "¿¬°á ½ÇÆÐ"
 
-#: browse.php:85
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "%s ¸®½ºÆ®ÀÇ ¿¬¶ôó ¸ñ·Ï"
+
+#: browse.php:60
+#, fuzzy
 msgid "Contact removed from list."
-msgstr ""
+msgstr "¸®½ºÆ®¿¡¼­ Á¦°Å"
 
-#: browse.php:279
+#: browse.php:266
+#, php-format
 msgid "Contacts in list: %s"
 msgstr "%s ¸®½ºÆ®ÀÇ ¿¬¶ôó ¸ñ·Ï"
 
-#: browse.php:301
-msgid "Contents of %s"
-msgstr "'%s'ÀÇ ³»¿ë"
-
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:12
 msgid "Copy"
 msgstr "º¹»ç"
 
-#: lib/ObjectView.php:134
-msgid "Created"
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
 msgstr "»ý¼º"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "±âº» Ç¥½Ã"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "°³ÀÎ ÁÖ¼Ò·Ï"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "±âº» µð·ºÅ丮 ¼±ÅÃ"
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
 
-#: config/prefs.php.dist:72
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "»ý¼º"
+
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "±âº» Á¤·Ä ¹æ¹ý"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "»èÁ¦"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "ÁÖ¼Ò·Ï ¼±ÅÃ"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "»èÁ¦ È®ÀÎ"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "»èÁ¦ ¹öÆ° µ¿ÀÛ"
 
-#: lib/Driver/ldap.php:274
+#: lib/Driver/ldap.php:270
+#, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "»èÁ¦ ½ÇÆÐ: (%s) %s"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "»èÁ¦ ½ÇÆÐ"
 
@@ -265,37 +342,59 @@
 msgid "Department"
 msgstr "ºÎ¼­"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "³»¸²Â÷¼ø"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "µð·ºÅ丮"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "È­¸é ¼³Á¤"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "È­¸é ¼³Á¤"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
 msgstr "Áö¿ï ¶§ È®ÀÎÇϱâ"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
+msgstr "vCard ³»·Á¹Þ±â"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "vCard ³»·Á¹Þ±â"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "¼öÁ¤"
 
-#: templates/browse/contactrow.inc:33
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "¼öÁ¤ '%s'"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "ÁÖ¼Ò·Ï ³»º¸³»±â"
+
+#: edit.php:78 edit.php:154
+#, php-format
 msgid "Edit entry for %s"
 msgstr "%s Ç׸ñ ¼öÁ¤"
 
@@ -303,53 +402,78 @@
 msgid "Email"
 msgstr "À̸ÞÀÏ"
 
-#: edit.php:79
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
+#, php-format
 msgid "Entry for %s updated."
 msgstr "%s ¼öÁ¤µÊ"
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s ÆÄÀÏÀ» ¼º°øÀûÀ¸·Î °¡Á®¿Ô½À´Ï´Ù."
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "ÁÖ¼Ò·Ï Á¢±Ù ½ÇÆÐ: %s"
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "³»º¸³»±â"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "ÁÖ¼Ò·Ï ³»º¸³»±â"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr ""
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr ""
 
-#: data.php:110 data.php:228 browse.php:62 browse.php:120 browse.php:135
-#: add.php:72 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, php-format
 msgid "Failed to access the address book: %s"
 msgstr "ÁÖ¼Ò·Ï Á¢±Ù ½ÇÆÐ: %s"
 
-#: browse.php:154
+#: browse.php:139
+#, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "%s¸¦ %s¿¡ Ãß°¡ ½ÇÆÐ : %s"
 
-#: browse.php:284
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "¸®½ºÆ® Ž»ö ½ÇÆÐ"
 
-#: browse.php:315
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "µð·ºÅ丮 °Ë»ö½ÇÆÐ"
 
-#: lib/Driver/ldap.php:312
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 
-#: browse.php:140
+#: browse.php:120
+#, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Ãß°¡ÇÒ ´ë»óÀ» ãÁö ¸øÇÔ:%s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "ÁÖ¼Ò·Ï Á¢±Ù ½ÇÆÐ: %s"
+
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "µð·ºÅ丮 °Ë»ö ½ÇÆÐ: %s"
 
@@ -357,10 +481,20 @@
 msgid "Fax"
 msgstr "Æѽº"
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Á¦¸ñ"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "ã±â"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "ã±â"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "À̸§"
@@ -369,15 +503,15 @@
 msgid "Freebusy URL"
 msgstr ""
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "À§Ä¡"
 
-#: config/sources.php.dist:532
+#: config/sources.php.dist:604
 msgid "Global Address Book"
 msgstr "Àüü ÁÖ¼Ò·Ï"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr ""
 
@@ -409,61 +543,62 @@
 msgid "Home Street Address"
 msgstr "Áý ÁÖ¼Ò"
 
-#: config/sources.php.dist:468
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr ""
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "ÁÖ¼Ò·Ï ¸®½ºÆ®"
+
+#: templates/data/import.inc:7
+#, php-format
 msgid "Import Address Book, Step %d"
 msgstr "ÁÖ¼Ò·Ï °¡Á®¿À±â, ´Ü°è %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "ÁÖ¼Ò·Ï °¡Á®¿À±â/³»º¸³»±â"
 
-#: lib/api.php:358 lib/api.php:577
-#, fuzzy
-msgid "Invalid Content-Type"
-msgstr "À߸øµÈ À̸§."
-
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:596 lib/api.php:683
 #, fuzzy
 msgid "Invalid ID"
 msgstr "À߸øµÈ À̸§."
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:871
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
 msgstr "À߸øµÈ ÁÖ¼Ò·Ï"
 
-#: lib/api.php:875 lib/api.php:946 lib/api.php:999
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
 msgstr "À߸øµÈ À̸ÞÀÏ."
 
-#: lib/api.php:883
+#: lib/api.php:1089
 #, fuzzy
 msgid "Invalid entry"
 msgstr "À߸øµÈ À̸§."
 
-#: lib/Driver/ldap.php:270
+#: lib/Driver/ldap.php:266
 #, fuzzy
 msgid "Invalid key specified."
 msgstr "¹®ÀÚ¿­ ÀÔ·Â ¿À·ù"
 
-#: lib/api.php:879
+#: lib/api.php:1085
 msgid "Invalid name"
 msgstr "À߸øµÈ À̸§."
 
-#: lib/api.php:560
+#: lib/api.php:735
 msgid "Invalid objectId"
 msgstr "À߸øµÈ °´Ã¼ ¾ÆÀ̵ð"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "¸¶Áö¸· ¼öÁ¤"
 
@@ -471,23 +606,33 @@
 msgid "Last Name"
 msgstr "¼º"
 
-#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "¸®½ºÆ®"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "ã´Â ¹®ÀÚ¿­"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "ÃÖ´ë ÆäÀÌÁö¼ö"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "ÃÖ´ë ÆäÀÌÁö¼ö"
 
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "»õ ¸®½ºÆ®"
+
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
 msgstr "°£´ÜÇÑ °Ë»ö"
 
-#: lib/Driver/ldap.php:306
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr ""
 
@@ -495,60 +640,67 @@
 msgid "Mobile Phone"
 msgstr "ÇÚµåÆù"
 
-#: lib/Driver/ldap.php:335 lib/Driver/ldap.php:352
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "¼öÁ¤ ½ÇÇ¥: (%s) %s"
 
-#: lib/api.php:985
+#: lib/api.php:1193
 msgid "More than 1 entry found"
 msgstr ""
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:11
 msgid "Move"
 msgstr "À̵¿"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "¿ÞÂÊÀ¸·Î À̵¿"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "¿À¸¥ÂÊÀ¸·Î À̵¿"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry ÁÖ¼Ò·Ï"
 
-#: lib/api.php:905
+#: lib/api.php:1113
+#, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr "%s ÁÖ¼Ò¸¦ °¡Áø »ç¶÷Àº ÀÌ¹Ì ÀÖÀ¸³ª, %s À̸§À¸·Î Á¸ÀçÇÏ´Â °ÍÀº ¾øÀ½"
 
-#: config/sources.php.dist:174 config/sources.php.dist:304
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "³» ÁÖ¼Ò·Ï"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
 msgstr "³» ÁÖ¼Ò·Ï"
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "À̸§"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "À̸§ Çü½Ä"
 
-#: config/sources.php.dist:78
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr ""
 
-#: add.php:45 add.php:112 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "»õ·Î¿î ¿¬¶ôó Ãß°¡"
 
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "»õ ¸®½ºÆ®"
-
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
 msgstr "´ÙÀ½"
 
@@ -556,24 +708,24 @@
 msgid "Nickname"
 msgstr "º°¸í"
 
-#: lib/api.php:987 lib/api.php:1036
-#, php-format
+#: lib/api.php:1195 lib/api.php:1244
+#, fuzzy, php-format
 msgid "No %s entry found for %s"
-msgstr ""
+msgstr "%s Ç׸ñ ¼öÁ¤"
 
-#: lib/api.php:955
+#: lib/api.php:1163
 msgid "No address books found."
 msgstr "ÁÖ¼Ò·Ï ¾øÀ½"
 
-#: minisearch.php:87
+#: minisearch.php:83
 msgid "No contacts found"
 msgstr "¿¬¶ôó ¾øÀ½"
 
-#: lib/api.php:338
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
 msgstr "vCard Á¤º¸ ãÁö ¸øÇÔ"
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "¼±ÅÃÇÏÁö ¾ÊÀ½"
 
@@ -581,11 +733,11 @@
 msgid "Notes"
 msgstr "ÂüÁ¶"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "ÆäÀÌÁö´ç °á°ú °¹¼ö"
 
-#: lib/api.php:436
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
 msgstr "ãÁö ¸øÇÔ"
 
@@ -593,7 +745,18 @@
 msgid "Office"
 msgstr ""
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "±âŸ ¼³Á¤"
 
@@ -601,69 +764,87 @@
 msgid "PGP Public Key"
 msgstr ""
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:728 lib/api.php:889
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
 msgstr "±ÇÇÑ ¾øÀ½"
 
-#: lib/Driver.php:454
+#: lib/Driver.php:543
 msgid "Permission denied"
 msgstr "±ÇÇÑ ¾øÀ½"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "±ÇÇÑ ¾øÀ½"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine ÁÖ¼Ò·Ï"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
 msgstr "»õ·Î¿î ¸®½ºÆ®ÀÇ À̸§À» ÀÔ·ÂÇϼ¼¿ä:"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "µð·ºÅ丮 ¼±ÅÃ:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-#: config/sources.php.dist:384
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "°³ÀÎ ÁÖ¼Ò·Ï"
 
-#: lib/Driver/ldap.php:146
+#: lib/Driver/ldap.php:147
+#, php-format
 msgid "Query failed: (%s) %s"
 msgstr "°Ë»ö ½ÇÆÐ: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "»¡¸® ã±â"
 
-#: lib/Driver/ldap.php:190 lib/Driver/ldap.php:198 lib/Driver/ldap.php:432
-#, php-format
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, fuzzy, php-format
 msgid "Read failed: (%s) %s"
+msgstr "°Ë»ö ½ÇÆÐ: (%s) %s"
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
 msgstr ""
 
-#: templates/browse/footer.inc:6
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Ç¥½Ã"
 
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "ÁÖ¼Ò·Ï ¼±ÅÃ"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Ä®·³ »èÁ¦"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "¸®½ºÆ®¿¡¼­ Á¦°Å"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
+#, fuzzy
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
 "°¡Á®¿Â °ÍÀ¸·Î ±âÁ¸ ÁÖ¼Ò·ÏÀ» ¹Ù²Ü±î¿ä? <b>ÁÖÀÇ: ÀÌ°ÍÀº ÇöÀç ÁÖ¼Ò·ÏÀÇ ¸ðµç Ç׸ñ"
 "À» Áö¿ó´Ï´Ù.</b>"
 
-#: lib/Driver.php:344
+#: lib/Driver.php:438
+#, fuzzy
 msgid "Requested object not found."
-msgstr ""
+msgstr "ãÁö ¸øÇÔ"
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
 msgstr "ÃʱâÈ­"
 
@@ -671,162 +852,196 @@
 msgid "S/MIME Public Certificate"
 msgstr ""
 
-#: lib/Driver/ldap.php:74
-#, php-format
+#: lib/Driver/ldap.php:69
+#, fuzzy, php-format
 msgid "STARTTLS failed: (%s) %s"
-msgstr ""
+msgstr "°Ë»ö ½ÇÆÐ: (%s) %s"
 
-#: edit.php:57 add.php:46
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "°Ë»ö"
 
-#: browse.php:264 minisearch.php:66
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "°Ë»ö °á°ú"
 
-#: lib/api.php:805
+#: lib/api.php:1011
 msgid "Search failed"
 msgstr "°Ë»ö ½ÇÆÐ"
 
-#: lib/api.php:895 lib/api.php:901 lib/api.php:910 lib/api.php:923
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
 msgid "Search failed: %s"
 msgstr "°Ë»ö ½ÇÆÐ: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "°Ë»ö ¿É¼Ç"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "ã´ÂÁß..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "ÁÖ¼Ò·Ï ¼±ÅÃ"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "³»º¸³¾ ÁÖ¼Ò·Ï ¼±ÅÃ:"
 
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "¸®½ºÆ® ¼±ÅÃ"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "°¡Á®¿Ã ÁÖ¼Ò·Ï ¼±ÅÃ:"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "³»º¸³¾ ÁÖ¼Ò·Ï ¼±ÅÃ:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "°¡Á®¿Ã ÁÖ¼Ò·Ï ¼±ÅÃ:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "¼Ò½º ÆÄÀÏ Æ÷¸Ë ¼±ÅÃ"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "³»º¸³»±â Çü½Ä ¼±ÅÃ"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "ÀÓÆ÷Æ®ÇÒ ÆÄÀÏ ¼±ÅÃ:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "¼Ò½º ÆÄÀÏ Æ÷¸Ë ¼±ÅÃ"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "À̸§ Ç¥½Ã Çü½Ä ¼±ÅÃ:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "±âº» Ç¥½Ã ¼±ÅÃ"
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "ÁÖ¼Ò ¸®½ºÆ®¿¡ Ç¥½ÃÇÒ Ç׸ñ ¼±ÅÃ"
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "À̸§ Ç¥½Ã Çü½Ä ¼±ÅÃ"
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "¼±ÅÃµÈ Ç׸ñ"
-
-#: add.php:59
-msgid "Selected address book '%s'."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
 msgstr "ÁÖ¼Ò·Ï '%s' ¼±ÅÃ"
 
-#: config/sources.php.dist:239
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "°øÀ¯ µð·ºÅ丮"
 
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "_w¸ðµÎ º¸±â"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr ""
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "¸®½ºÆ® º¸±â"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "¸ðµÎ º¸±â"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "¿¬¶ôó º¸±â"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "¸®½ºÆ® º¸±â"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "_c¿¬¶ôó º¸±â"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "_l¸®½ºÆ® º¸±â"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "Á¤·Ä ¹æ¹ý"
 
-#: lib/api.php:154
+#: lib/api.php:198
 msgid "Sources"
 msgstr "¼Ò½º"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
 msgstr ""
 
-#: browse.php:156
+#: browse.php:141
+#, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s°¡ %s¿¡ ¼º°øÀûÀ¸·Î Ãß°¡µÊ"
 
-#: data.php:29
+#: browse.php:222
+#, fuzzy, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "%s°¡ %s¿¡ ¼º°øÀûÀ¸·Î Ãß°¡µÊ"
+
+#: data.php:50
+#, fuzzy
 msgid "TSV"
-msgstr ""
+msgstr "CSV"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "ÅÇÀ¸·Î ±¸ºÐµÈ °ª"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "ÁÖ¼Ò·ÏÀ» ºñ¿ï ¼ö ¾ø½À´Ï´Ù: %s"
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "ÁÖ¼Ò·ÏÀÌ ¼º°øÀûÀ¸·Î ºñ¿öÁü"
+
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "ÁÖ¼Ò·ÏÀÌ ¼º°øÀûÀ¸·Î ºñ¿öÁü"
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "ÁÖ¼Ò·ÏÀÌ ¼º°øÀûÀ¸·Î ºñ¿öÁü"
+
+#: data.php:303
+#, php-format
 msgid "The address book could not be purged: %s"
 msgstr "ÁÖ¼Ò·ÏÀ» ºñ¿ï ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "¿äûÇÑ ¿¬¶ôó°¡ ¾ø½À´Ï´Ù."
 
-#: browse.php:58
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s ÆÄÀÏÀ» ¼º°øÀûÀ¸·Î °¡Á®¿Ô½À´Ï´Ù."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Ž»ö°¡´ÉÇÑ ÁÖ¼Ò·ÏÀÌ ¾ø½À´Ï´Ù."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -835,31 +1050,43 @@
 "»õ·Î¿î Ç׸ñÀ» Ãß°¡ÇÒ ¼ö ÀÖµµ·Ï ¼³Á¤µÈ ÁÖ¼Ò·ÏÀÌ ¾ø½À´Ï´Ù. ¸¸¾à ÀÌ°ÍÀÌ ¿À·ù¶ó"
 "°í »ý°¢ÇϽŴٸé, °ü¸®ÀÚ¿¡°Ô ¹®ÀÇÇϽñ⠹ٶø´Ï´Ù."
 
-#: add.php:108
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr "Ãß°¡Çϴµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù. °ü¸®ÀÚ¿¡°Ô µµ¿òÀ» ¿äûÇϽñ⠹ٶø´Ï´Ù."
 
-#: browse.php:212
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "»èÁ¦ ¿À·ù"
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "»õ·Î¿î ¸®½ºÆ® ¸¸µé±â ¿À·ù"
 
-#: browse.php:163
-msgid "There was an error deleting %s from the source address book."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "¼öÁ¤ ¿À·ù: %s"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "»èÁ¦ ¿À·ù: %s"
 
-#: delete.php:31
+#: delete.php:37
+#, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "»èÁ¦ ¿À·ù : %s"
 
-#: browse.php:93
+#: browse.php:72
 msgid "There was an error deleting this object."
 msgstr "»èÁ¦ ¿À·ù"
 
-#: browse.php:294
+#: browse.php:278
 #, fuzzy
-msgid "There was an error displaying the select List"
+msgid "There was an error displaying the list"
 msgstr ""
 "#-#-#-#-#  compendium.po (IMP 4.0-cvs)  #-#-#-#-#\n"
 "#-#-#-#-#  compendium.po (IMP 4.0-cvs)  #-#-#-#-#\n"
@@ -881,67 +1108,98 @@
 "#-#-#-#-#  ko_KR.po (IMP 4.0-cvs)  #-#-#-#-#\n"
 "¸Þ¼¼Áö º¸³»±â ¿À·ù"
 
-#: data.php:249
+#: data.php:335
+#, php-format
 msgid "There was an error importing the data: %s"
 msgstr "µ¥ÀÌŸ °¡Á®¿À±â ¿À·ù: %s"
 
-#: lib/api.php:334
+#: lib/api.php:507 lib/api.php:761
 msgid "There was an error importing the iCalendar data."
 msgstr "iCalendar µ¥ÀÌÅÍ °¡Á®¿À±â ¿À·ù"
 
-#: browse.php:83
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "»õ·Î¿î ¸®½ºÆ® ¸¸µé±â ¿À·ù"
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Á¦°Å ¿À·ù"
 
-#: edit.php:84
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "¼öÁ¤ ¿À·ù: %s"
+
+#: edit.php:158
+#, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "¼öÁ¤ ¿À·ù: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "°¡Á®¿Ã ¼ö ÀÖ´Â ÁÖ¼Ò°¡ ¾ø½À´Ï´Ù."
 
-#: lib/Driver.php:404 lib/Driver.php:445
-msgid "This address book is read-only"
-msgstr "ÀÌ ÁÖ¼Ò·ÏÀº Àбâ Àü¿ëÀÔ´Ï´Ù."
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr ""
 
-#: lib/api.php:914 lib/api.php:927
+#: lib/api.php:1122 lib/api.php:1135
+#, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "'%s'´Â ÀÌ¹Ì ÁÖ¼Ò·Ï¿¡ µî·ÏµÇ¾î ÀÖ½À´Ï´Ù."
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Á¦¸ñ"
 
-#: lib/Driver.php:825
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "%s Á¤ÀǸ¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
 msgstr "º¯°æ»çÇ× µÇµ¹¸®±â"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
-msgstr ""
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, fuzzy, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "À߸øµÈ À̸§."
 
-#: config/sources.php.dist:139
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign µð·ºÅ丮"
 
-#: templates/browse/contactrow.inc:27
-msgid "View '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
 msgstr "'%s' º¸±â"
 
-#: minisearch.php:82
+#: minisearch.php:78
 msgid "View Contact"
 msgstr "¿¬¶ôó º¸±â"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "ù ±âº» È­¸é"
 
@@ -977,59 +1235,88 @@
 msgid "Work Street Address"
 msgstr "Á÷Àå ÁÖ¼Ò"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "»õ·Î¿î ¸®½ºÆ®¸¦ ¸¸µì´Ï´Ù."
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-#: edit.php:44 display.php:48
+#: edit.php:69 display.php:58 view.php:36
+#, fuzzy
 msgid "You do not have permission to view this contact."
-msgstr ""
+msgstr "ÀÌ ¸ñ·ÏÀ» º¼ ¼ö ÀÖ´Â ±ÇÇѸ¸ ÀÖ½À´Ï´Ù."
 
 #: vcard.php:40
+#, fuzzy
 msgid "You do not have permission to view this object."
-msgstr ""
+msgstr "ÀÌ ¸ñ·ÏÀ» º¼ ¼ö ÀÖ´Â ±ÇÇѸ¸ ÀÖ½À´Ï´Ù."
 
-#: templates/browse/javascript.inc:41
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "ÁÖ¼Ò·ÏÀ» ¼±ÅÃÇØ¾ß ÇÕ´Ï´Ù."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
 msgstr "¸®½ºÆ®¸¦ ¼±ÅÃÇØ¾ß ÇÕ´Ï´Ù."
 
-#: templates/browse/javascript.inc:58
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "¿¬¶ôó¸¦ ¸ÕÀú ¼±ÅÃÇϼ¼¿ä."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "¿¬¶ôó¸¦ ¸ÕÀú ¼±ÅÃÇϼ¼¿ä."
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
 msgstr "ÀÌ ¸ñ·ÏÀ» º¼ ¼ö ÀÖ´Â ±ÇÇѸ¸ ÀÖ½À´Ï´Ù."
 
-#: templates/browse/contactrow.inc:12
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[°ª ¾øÀ½]"
 
-#: lib/Turba.php:275
-msgid "_Add"
-msgstr "_AÃß°¡"
-
-#: lib/Turba.php:274
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "_BŽ»ö"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "_c¿¬¶ôó º¸±â"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
 msgstr "_D»èÁ¦"
 
-#: lib/Turba.php:280
+#: lib/Turba.php:493
 msgid "_Import/Export"
 msgstr "_I°¡Á®¿À±â/³»º¸³»±â"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "¸®½ºÆ®"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "³» ÁÖ¼Ò·Ï"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "»õ·Î¿î ¿¬¶ôó Ãß°¡"
+
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
 msgstr "_RÀÌ ¸®½ºÆ®¿¡¼­ Áö¿ì±â"
 
-#: lib/Turba.php:276
+#: lib/Turba.php:489
 msgid "_Search"
 msgstr "_S°Ë»ö"
 
@@ -1037,19 +1324,35 @@
 msgid "contact.vcf"
 msgstr ""
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr ""
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr ""
 
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
+#: data.php:219
+#, fuzzy
+msgid "contacts.vcf"
+msgstr "¿¬¶ôó ¾øÀ½"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "¼±ÅÃÇÏÁö ¾ÊÀ½"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "¿¬¶ôó º¸±â"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
 msgstr "¼±ÅÃµÈ ÁÖ¼Ò·ÏÀ¸·Î"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/po/nb_NO.po
+++ mod/po/nb_NO.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 1.2\n"
-"POT-Creation-Date: 2002-07-22 13:11+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2004-05-18 23:37+0200\n"
 "Last-Translator: Andreas Gunleikskaas <andreas at gunleikskaas.no>\n"
 "Language-Team: Norwegian (Bokmal) <i18n at lists.horde.org>\n"
@@ -15,527 +16,1370 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Velg adressebok"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "til valgt adressebok"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "Import av %s filen var vellykket"
 
-msgid "Add Contact ..."
-msgstr "Legg til kontakt ..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "Legg til en ny kontakt"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Velg adressebok"
 
-msgid "Add failed"
-msgstr "Kunne ikke legge til"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
+
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
 
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Legg til"
 
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Ugyldig adressebok."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Det finnes ingen skrivbare adressebøker."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "Legg til kolonne"
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "Kunne ikke legge til"
+
+#: templates/browse/actions.inc:22
+msgid "Add to"
+msgstr "Legg til..."
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Velg adressebok"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Adressebokliste"
 
-msgid "Addressbook is read-only."
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Adressebokliste"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "Adresseboken er skrivebeskyttet."
+
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "Import av %s filen var vellykket"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
 msgstr "Adresseboken er skrivebeskyttet."
 
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Alias"
 
-msgid "An illegal value was specified."
-msgstr "En ugyldig verdi var valgt."
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr "Alle"
 
-msgid "Available Columns:"
-msgstr "Tilgjengelige kolonner:"
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
+
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
+
+#: search.php:85 templates/browse/search.inc:36
+msgid "Basic Search"
+msgstr "Standard søk"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
 
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Liste"
 
-msgid "Cancel"
-msgstr "Avbryt"
+#: config/attributes.php.dist:173
+#, fuzzy
+msgid "Business Category"
+msgstr "Kategori"
 
-msgid "Cell Phone"
-msgstr "Mobiltelefon"
+#: data.php:49
+msgid "CSV"
+msgstr ""
 
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Velg rekkefølgen av kolonnene som skal bli vist i adresse listen."
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "Det finnes ingen skrivbare adressebøker."
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Det finnes ingen skrivbare adressebøker."
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
 
-msgid "Clear Search"
-msgstr "Nytt søk"
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr "Velg rekkefølgen av kolonnene som skal bli vist i adresse listen."
 
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Kolonnevalg"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Firma"
 
-#, c-format
-msgid "Contents of %s"
-msgstr "Inneholdet av %s"
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Hjemmeadresse"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Slettingen feilet"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "Slettingen feilet"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+#, fuzzy
+msgid "Contact removed from list."
+msgstr "Slett fra denne listen"
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+msgid "Copy"
+msgstr "Kopier"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
 
-msgid "Default Display"
-msgstr "Standardvisning"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Velg adressebok"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
 
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Slett"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Velg adressebok"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Slettingen feilet"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Slettingen feilet"
 
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "Bruker valg"
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Katalog"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Visnings valg"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Visnings valg"
 
-msgid "Edit '%s'"
-msgstr "Rediger"
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
+msgstr "Last ned vCard"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr "Last ned vCard"
 
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Rediger"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Rediger"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Velg adressebok"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "Epost"
 
-msgid "Error"
-msgstr "Feil"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Export Addressbook"
-msgstr "Eksporter adressebok"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "Import av %s filen var vellykket"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Det finnes ingen skrivbare adressebøker."
 
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Eksporter"
 
-msgid "Failed to access the specified address book."
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "Eksporter adressebok"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
 msgstr "Kunne ikke koble til den angitte katalogen."
 
-#, c-format
-msgid "Failed to browse %s."
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Feilet å søke etter %s."
+
+#: browse.php:272
+#, fuzzy
+msgid "Failed to browse list"
 msgstr "Feilet å søke etter %s."
 
-msgid "Failed to connect to the specified directory."
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
+msgstr "Kunne ikke søke i katalogen: %s"
+
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "Kunne ikke søke i katalogen: %s"
+
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
 msgstr "Kunne ikke koble til den angitte katalogen."
 
-#, c-format
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Kunne ikke søke i katalogen: %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Telefaks"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Tittel"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Finn"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Finn"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Fra"
 
-msgid "Help"
-msgstr "Hjelp"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Velg adressebok"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
 
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "Telefon hjemme"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Telefon hjemme"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "Ved import av CSV-data: Inneholder den første raden feltnavn?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Telefon hjemme"
 
-msgid "Illegal or malformed form data."
-msgstr "Ulovlige eller misutformede data."
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "Telefon hjemme"
 
-msgid "Import Addressbook"
-msgstr "Importer adressebok"
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Hjemmeadresse"
+
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
+
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Adressebokliste"
 
-msgid "Import"
-msgstr "Importer"
+#: templates/data/import.inc:7
+#, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Importer adressebok, steg %d"
 
-msgid "Import/Export Addressbooks"
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "Importer/Eksporter adressebok"
 
-msgid "Import/Export"
-msgstr "Import/Eksport"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Ugyldig navn."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "Ugyldig adressebok."
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "Ugyldig epostadresse."
 
-msgid "Invalid name."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
 msgstr "Ugyldig navn."
 
-msgid "Language"
-msgstr "Språk"
-
-msgid "List"
-msgstr "Liste"
-
-msgid "Matching"
-msgstr "Kobling"
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "En ugyldig verdi var valgt."
 
-msgid "Message"
-msgstr "Melding"
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "Ugyldig navn."
 
-msgid "Name"
-msgstr "Navn"
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "Ugyldig navn."
 
+#: lib/Driver/ldap.php:30
 msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+"LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
-"Ingen av de tilgjengelige adressebøkene tillater deg å legge til nye "
-"oppføringer. Hvis du mener dette er feil, vennlist kontakt system "
-"administratoren din."
-
-msgid "Notes"
-msgstr "Notater"
 
-msgid "Options"
-msgstr "Valg"
-
-msgid "Please choose an address book to add a contact to."
-msgstr "Vennligst velg adresseboken du vil legge kontakten til."
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
 
-msgid "Please select a directory:"
-msgstr "Kunne ikke søke i katalogen: %s"
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Navn"
 
-msgid "Problem?"
-msgstr "Problem?"
+#: templates/browse/column_headers.inc:16
+msgid "List"
+msgstr "Liste"
 
-msgid "Reset"
-msgstr "Nullstill"
+#: templates/browse/search.inc:77
+msgid "Matching"
+msgstr "Kobling"
 
-msgid "Save Changes"
-msgstr "Lagre endringer"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
 
-msgid "Save"
-msgstr "Lagre"
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
 
-msgid "Search Results"
-msgstr "Søkeresultater"
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Ny liste"
 
-msgid "Search"
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
 msgstr "Søk"
 
-msgid "Search&nbsp;Results"
-msgstr "Søkeresultat"
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
 
-msgid "Select the destination to import to:"
-msgstr "Velg mål å importere til:"
+#: config/attributes.php.dist:162
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
 
-msgid "Select the file to import:"
-msgstr "Velg filen som skal importeres:"
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
 
-msgid "Select the format to export to:"
-msgstr "Velg format på eksporten:"
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
 
-msgid "Select the format to import from:"
-msgstr "Velg format på importen:"
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr "Flytt"
 
-msgid "Select the format of the source file:"
-msgstr "Velg format på kilden:"
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "Flytt til venstre"
 
-msgid "Select the source to export from:"
-msgstr "Velg kilde som det skal eksporteres fra:"
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "Flytt til høyre"
 
-msgid "Select view to display by default."
-msgstr "Velg standardvisning."
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "Velg adressebok"
 
-msgid "Select which fields to display in the address lists."
-msgstr "Velg hvilke felter som skal vises i adresse listen."
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
 
-msgid "Select your preferred language:"
-msgstr "Velg ditt foretrukne språk:"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Velg adressebok"
 
-msgid "Selected Columns:"
-msgstr "Velg kolonner:"
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Velg adressebok"
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "Send epost til %s"
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
+msgid "Name"
+msgstr "Navn"
 
-msgid "Set your preferred display language."
-msgstr "Sett ditt foretrukne visnings-språk."
+#: config/prefs.php.dist:31
+msgid "Name Format"
+msgstr "Navneformat"
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Noen av Turbas konfigurasjonsfiler mangler:"
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
 
-msgid "Success"
-msgstr "Suksess"
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+msgid "New Contact"
+msgstr "Ny kontakt"
 
-msgid "The data got lost"
-msgstr "Dataene ble borte"
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr "Neste"
 
-msgid "The data got lost."
-msgstr "Dataene ble borte."
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Navn"
 
-msgid "The file contained no data."
-msgstr "Filen inneholdt ikke data."
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
 
-msgid "There are no browseable address books."
-msgstr "Det finnes ingen skrivbare adressebøker."
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "Adresseboken er skrivebeskyttet."
 
-msgid "There are no entries in %s."
-msgstr "Det finnes ingen skrivbare adressebøker."
+#: minisearch.php:83
+#, fuzzy
+msgid "No contacts found"
+msgstr "Vis kontakter"
 
-msgid "There are no writeable address books."
-msgstr "Det finnes ingen skrivbare adressebøker."
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: templates/browse/footer.inc:7
+msgid "None"
+msgstr "Ingen"
+
+#: config/attributes.php.dist:184
+msgid "Notes"
+msgstr "Notater"
+
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
 msgstr ""
-"Det oppstod et problem med filopplastingen. Filen kan ha vært større enn "
-"maksimalt tillatt størrelse."
 
-msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
+
+#: config/attributes.php.dist:223
+msgid "Office"
 msgstr ""
-"Det oppstod en feil idet objektet skulle legges til. Kontakt "
-"systemadministratoren din for ytterligerere hjelp."
 
+#: templates/prefs/imsp_opt.inc:23
 msgid ""
-"There was an error deleting this object. Contact your system administrator "
-"for further help."
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
 msgstr ""
-"Det oppstod en feil idet objektet skulle slettes. Kontakt "
-"systemadministratoren din for ytterligerere hjelp."
 
-msgid "There was an error importing the data."
-msgstr "Det oppstod en feil ved import av dataene."
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
 
-msgid "There was an error importing the uploaded file"
-msgstr "Det oppstod en feil når den opplastede filen skulle importeres"
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "Bruker valg"
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr "PGP offentlig nøkkel"
+
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
 msgstr ""
-"Denne filen kontrollerer standardinstillinger for Turba, og kontrollerer "
-"hvilke instillinger brukerne kan endre."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: lib/Driver.php:543
+msgid "Permission denied"
 msgstr ""
-"Denne filen kontrollerer stilarket som bestemmer farger og skrifttyper. I "
-"tillegg overstyrer den standardinstillingene i Horde."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
+#: templates/addressbooks.inc:99
+msgid "Permissions"
 msgstr ""
-"Denne filen definerer de globale navnene og typene på atributtene i Turba - "
-"navn, epost, adresser, osv."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "Denne filen definerer listen over tilgjengelige kilder for Turba."
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "Velg adressebok"
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
 msgstr ""
-"Dette er Turbas hovedkonfigurasjonsfil. Den inneholder stier og valg for "
-"Turbaskriptene."
-
-msgid "This number must be at least one."
-msgstr "Dette nummeret må være minst 1."
 
-msgid "This person is already in your addressbook."
-msgstr "Denne personen finnes allerede i adresseboken din."
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-msgid "This value must be a number."
-msgstr "Dette valget må være et nummer."
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Velg adressebok"
 
-msgid "Title"
-msgstr "Tittel"
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
 
-msgid "Turba is not properly configured"
-msgstr "Turba er ikke ordentlig satt opp"
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Standard søk"
 
-#, c-format
-msgid "Unable to load the definition of %s."
-msgstr "Kan ikke laste detfinisjonen av %s."
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
 
-msgid "User Options"
-msgstr "Bruker valg"
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
 
-msgid "View to display by default:"
-msgstr "Standardvisning:"
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr "Antal i visning:"
 
-msgid "Warning"
-msgstr "Advarsel"
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Importer adressebok"
 
-msgid "Work Address"
-msgstr "Firmaadresse"
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "fjern kolonne"
 
-msgid "Work Phone"
-msgstr "Telefon Arbeid"
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr "Slett fra denne listen"
 
+#: templates/data/import.inc:21
+#, fuzzy
 msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Du koblet ikke noen felt fra den importerte filen mot de korresponderende "
-"feltene i Turba."
+"Erstatt ekisterende adressebok med den importerte ? <b>Advarsel: Dette "
+"sletter alt innhold i din adressebok.</b>"
 
-msgid "Your Information"
-msgstr "Din informasjon"
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Dine valg har blitt oppdatert:"
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr "Tøm skjema"
 
-msgid "[Edit]"
-msgstr "[Rediger]"
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
 
-msgid "add column"
-msgstr "Legg til kolonne"
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
 
-msgid "move left"
-msgstr "Flytt til venstre"
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
+msgid "Save"
+msgstr "Lagre"
 
-msgid "move right"
-msgstr "Flytt til høyre"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "Søk"
 
-msgid "remove column"
-msgstr "fjern kolonne"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
+msgstr "Søkeresultater"
 
-msgid "Show Lists"
-msgstr "Vis lister"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "Søk"
 
-msgid "Show Contacts"
-msgstr "Vis kontakter"
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
 
-msgid "Show All"
-msgstr "Vis alle"
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "Søk"
 
-msgid "Select"
-msgstr "Velg"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Velg adressebok"
 
-msgid "All"
-msgstr "Alle"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Velg adressebok"
 
-msgid "Add to"
-msgstr "Legg til..."
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Velg kilde som det skal eksporteres fra:"
 
-msgid "None"
-msgstr "Ingen"
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
+msgstr "Velg mål å importere til:"
 
-msgid "Name Format"
-msgstr "Navneformat"
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Velg format på kilden:"
 
-msgid "Select which format to display names."
-msgstr "Velg hva slags visningsformat navn skal ha."
+#: templates/data/export.inc:10
+msgid "Select the export format:"
+msgstr "Velg formatet du vil eksportere til:"
 
+#: templates/data/import.inc:43
+msgid "Select the file to import:"
+msgstr "Velg filen som skal importeres:"
+
+#: templates/data/import.inc:11
+msgid "Select the format of the source file:"
+msgstr "Velg format på kilden:"
+
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Velg visningsformatet som skal benyttes:"
 
-msgid "Select List"
-msgstr "Velg liste"
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
+msgstr "Velg standardvisning."
 
-msgid "New List"
-msgstr "Ny liste"
+#: config/prefs.php.dist:18
+msgid "Select which fields to display in the address lists."
+msgstr "Velg hvilke felter som skal vises i adresse listen."
 
-msgid "Remove from this list"
-msgstr "Slett fra denne listen"
+#: config/prefs.php.dist:32
+msgid "Select which format to display names."
+msgstr "Velg hva slags visningsformat navn skal ha."
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "til valgt adressebok"
 
-msgid "Date of Birth (dd/mm/yyyy)"
-msgstr "Fødselsdag (dd/mm/åååå)"
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Katalog"
 
-msgid "Category"
-msgstr "Kategori"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "Vis"
 
-msgid "_Add"
-msgstr "Legg til"
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr "Vis alle"
 
-msgid "_Browse"
-msgstr "Bla gjennom"
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr "Vis kontakter"
 
-msgid "_Search"
-msgstr "Søk"
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr "Vis lister"
 
-msgid "_Import/Export"
-msgstr "Importer/Eksporter"
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "Katalog"
 
-msgid "_Options"
-msgstr "Valg"
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
+msgstr "Suksess"
 
-msgid "_Help"
-msgstr "Hjelp"
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
 
-msgid "_Log out"
-msgstr "Logg ut"
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
 
-msgid "Basic Search"
-msgstr "Standard søk"
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
 
-msgid "Ad_vanced Search"
-msgstr "Avansert søk"
+#: data.php:50
+msgid "TSV"
+msgstr ""
 
-msgid "_Delete"
-msgstr "Slett"
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
 
-msgid "Records displayed:"
-msgstr "Antal i visning:"
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
 
-msgid "Download vCard"
-msgstr "Last ned vCard"
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
 
-msgid "New Contact"
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Import av %s filen var vellykket"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
+msgid "There are no browseable address books."
+msgstr "Det finnes ingen skrivbare adressebøker."
+
+#: add.php:29
+#, fuzzy
+msgid ""
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
+msgstr ""
+"Ingen av de tilgjengelige adressebøkene tillater deg å legge til nye "
+"oppføringer. Hvis du mener dette er feil, vennlist kontakt system "
+"administratoren din."
+
+#: add.php:121
+#, fuzzy
+msgid ""
+"There was an error adding the new contact. Contact your system administrator "
+"for further help."
+msgstr ""
+"Det oppstod en feil idet objektet skulle legges til. Kontakt "
+"systemadministratoren din for ytterligerere hjelp."
+
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Det oppstod en feil når den opplastede filen skulle importeres"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Det oppstod en feil når den opplastede filen skulle importeres"
+
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Det oppstod en feil når den opplastede filen skulle importeres"
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Det oppstod en feil når den opplastede filen skulle importeres"
+
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "Det oppstod en feil ved import av dataene."
+
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Det finnes ingen skrivbare adressebøker."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
+
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
+msgstr "Denne personen finnes allerede i adresseboken din."
+
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
+#: config/attributes.php.dist:70
+msgid "Title"
+msgstr "Tittel"
+
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
+#, php-format
+msgid "Unable to load the definition of %s."
+msgstr "Kan ikke laste detfinisjonen av %s."
+
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "Lagre endringer"
+
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Katalog"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
 msgstr "Ny kontakt"
 
-msgid "Reset to Defaults"
-msgstr "Tøm skjema"
+#: config/prefs.php.dist:124
+msgid "View to display by default:"
+msgstr "Standardvisning:"
 
-msgid "Copy"
-msgstr "Kopier"
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
 
-msgid "Move"
-msgstr "Flytt"
+#: config/attributes.php.dist:113
+msgid "Work Address"
+msgstr "Firmaadresse"
 
-msgid "to Selected Address Book"
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "Telefon Arbeid"
+
+#: config/attributes.php.dist:156
+msgid "Work Phone"
+msgstr "Telefon Arbeid"
+
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Telefon Arbeid"
+
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "Telefon Arbeid"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Firmaadresse"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
+
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
+
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
+
+#: templates/browse/javascript.inc:55
+#, fuzzy
+msgid "You must select a target address book."
 msgstr "til valgt adressebok"
 
-msgid "Show _Lists"
-msgstr "Vis lister"
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
+
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
+
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
 
-msgid "Show _Contacts"
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+msgid "_Browse"
+msgstr "Bla gjennom"
+
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
 msgstr "Vis kontakter"
 
-msgid "Sho_w All"
-msgstr "Vis alt"
+#: templates/browse/actions.inc:2
+msgid "_Delete"
+msgstr "Slett"
+
+#: lib/Turba.php:493
+msgid "_Import/Export"
+msgstr "Importer/Eksporter"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Liste"
 
-msgid "Select Address Book"
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
 msgstr "Velg adressebok"
 
-msgid "Show"
-msgstr "Vis"
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Ny kontakt"
 
-msgid "PGP Public Key"
-msgstr "PGP offentlig nøkkel"
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Remove from this list"
+msgstr "Slett fra denne listen"
 
-msgid "C_lear Search"
-msgstr "Tøm søk"
+#: lib/Turba.php:489
+msgid "_Search"
+msgstr "Søk"
 
-msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+#: vcard.php:46
+msgid "contact.vcf"
 msgstr ""
-"Erstatt ekisterende adressebok med den importerte ? <b>Advarsel: Dette "
-"sletter alt innhold i din adressebok.</b>"
 
-msgid "Next"
-msgstr "Neste"
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
 
-msgid "Select the export format:"
-msgstr "Velg formatet du vil eksportere til:"
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
 
-msgid "Import Address Book, Step %d"
-msgstr "Importer adressebok, steg %d"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "Ingen"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "Vis kontakter"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "til valgt adressebok"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/po/fr_FR.po
+++ mod/po/fr_FR.po
@@ -5,14 +5,14 @@
 # Updates and fixes: Ronnie Garcia <ronnie at mk2.net>, 2002.
 # Pierre Lachance <pl at pierrelachance.net> et Benoit St-André <ben at benoitst-andre.net>, 2003, 2004.
 # Benoit St-André <ben at benoitst-andre.net>, 2004.
-# Thierry Thomas <thierry at pompo.net>, 2002, 2003, 2005.
+# Thierry Thomas <thierry at pompo.net>, 2002, 2003, 2005, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: fr_FR\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-07-19 14:29+0200\n"
-"PO-Revision-Date: 2005-07-19 14:38+0200\n"
+"POT-Creation-Date: 2006-02-18 22:38+0100\n"
+"PO-Revision-Date: 2006-02-19 09:55+0100\n"
 "Last-Translator: Thierry Thomas <thierry at pompo.net>\n"
 "Language-Team: Français <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,20 +21,43 @@
 "<ben at benoitst-andre.net>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr "Ajouter un carnet d'adresses IMSP"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr "Supprimer un carnet d'adresses IMSP"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "« %s » existait déjà et n'a pas été importé."
+
+#: browse.php:140
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "« %s » n'a pas été copié parce que c'est une liste."
+
+#: browse.php:138
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "« %s » n'a pas été déplacé parce que c'est une liste."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
-msgstr "\"Prénom Nom\"  (c. à d.. Michel Tremblay)"
+msgstr "« Prénom Nom »  (c. à d.. Michel Tremblay)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
-msgstr "\"Nom, Prénom\"  (c. à d.. Tremblay, Michel)"
+msgstr "« Nom, Prénom »  (c. à d.. Tremblay, Michel)"
 
-#: add.php:96
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s ajouté."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "fichier %s importé avec succès"
@@ -44,58 +67,81 @@
 msgid "%s to %s of %s"
 msgstr "%s à %s sur %s"
 
-#: browse.php:120
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "« %s » n'a pas été copié parce qu'il s'agit d'une liste."
-
-#: browse.php:118
+#: lib/Turba.php:458
 #, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "« %s » n'a pas été déplacé parce qu'il s'agit d'une liste."
+msgid "%s's Address Book"
+msgstr "Carnet d'adresses de %s"
 
-#: lib/Block/minisearch.php:45
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
-msgstr "Un navigateur supportant les cadres est requis"
+msgstr "Un navigateur supportant les cadres (iFrames) est requis"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "Au-dessus du formulaire de recherche"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Recherche a_vancée"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "Accès à %s refusé"
 
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "Ajouter"
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "Ajouter un carnet d'adresses"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "Ajouter et supprimer des carnets d'adresses IMSP"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Ajouter une colonne"
 
-#: templates/browse/actions.inc:22
+#: edit.php:135
+msgid "Add file"
+msgstr "Ajouter un fichier"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Ajouter à"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "L'ajout de contacts n'est pas disponible."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "Carnet d'adresses"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Liste des annuaires"
 
-#: add.php:95
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Carnets d'adresses"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Données du carnet d'adresses"
 
-#: lib/Driver.php:478
-msgid "Address book is read-only."
-msgstr "Annuaire en lecture seule."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Carnet d'adresses nettoyé avec succès."
 
-#: search.php:98 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "Carnet d'adresses à supprimer "
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "Carnet d'adresses qui ne seront pas affichés :"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
@@ -103,108 +149,102 @@
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr "Tout"
 
-#: lib/api.php:393
+#: lib/api.php:554
 msgid "Already Exists"
 msgstr "Existe déjà"
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Êtes-vous certain de vouloir supprimer %s ?"
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Êtes-vous certain de vouloir supprimer les entrées sélectionnées ?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Colonnes disponibles :"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Re_venir à %s"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "Retour à %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Recher_che simple"
-
-#: search.php:95 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Recherche simple"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "Au dessous du formulaire de recherche"
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
-msgstr "Échec du lien (%s) : %s"
+msgstr "Échec du lien (%s): %s"
 
 #: config/attributes.php.dist:178
 msgid "Birthday"
 msgstr "Anniversaire"
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "Parcourir"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Catégorie affaire"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "Annuler _la recherche"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "Impossible d'ajouter un groupe à lui-même."
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Vérifier _Tout/Rien"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Choisir un répertoire par défaut pour votre carnet d'adresses  personnel, "
-"listes de contacts, et recherches."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "Choisir un nom"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Choisir un carnet d'adresses"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Choisissez l'ordre des colonnes à afficher dans la liste des adresses."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "Choisir un carnet d'adresses :"
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "Annuler la recherche"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr "Choisir quels carnets d'adresses afficher, et dans quel ordre :"
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "Choisir quel carnet d'adresses utiliser."
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "Choisissez quelles colonnes afficher et dans quel ordre :"
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Options des colonnes"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Colonnes qui ne seront pas affichées :"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Valeurs séparées par des virgules"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Valeurs séparées par des virgules (Microsoft Outlook)"
 
@@ -216,72 +256,77 @@
 msgid "Company Address"
 msgstr "Adresse professionnelle"
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:382 lib/api.php:452
-#: lib/api.php:542 lib/api.php:588 lib/api.php:636 lib/api.php:823
-#: lib/api.php:916
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:840
+#: lib/api.php:1037 lib/api.php:1125
 #, php-format
 msgid "Connection failed: %s"
 msgstr "La connexion a échoué : %s"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Échec de la connexion"
 
-#: browse.php:60
-msgid "Contact removed from list."
-msgstr "Contact retiré de la liste."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Recherche de contacts"
 
-#: browse.php:257
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Contacts dans la liste : %s"
 
-#: browse.php:281
-#, php-format
-msgid "Contents of %s"
-msgstr "Contenu de %s"
-
-#: templates/browse/actions.inc:12
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "Copier"
 
-#: lib/ObjectView.php:134
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Créer"
+
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "Créer un carnet d'adresses"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Créer une nouvelle liste de contacts dans :"
+
+#: lib/ObjectView.php:133
 msgid "Created"
 msgstr "Créé"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Affichage par défaut"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr ""
-"Répertoire par défaut pour votre carnet d'adresses personnel, listes de "
-"contacts, et recherches."
-
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Ordre de tri par défaut :"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Effacer"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "Supprimer un carnet d'adresses"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Confirmation de suppression"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Comportement du bouton de suppression"
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Échec de la suppression : (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "La suppression des contacts n'est pas disponible."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Échec de la suppression"
 
@@ -289,38 +334,55 @@
 msgid "Department"
 msgstr "Département"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Descendant"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Description"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Répertoire"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Affichage"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Options d'affichage"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "Voulez-vous confirmer la suppression des entrées ?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Télécharger"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "Télécharger vCard"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Éditer"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
-msgid "Edit '%s'"
-msgstr "Éditer '%s'"
+msgid "Edit \"%s\""
+msgstr "Éditer « %s »"
+
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "Éditer les carnets d'adresses"
 
-#: edit.php:53 edit.php:80
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Modifier les informations pour « %s »"
@@ -329,59 +391,105 @@
 msgid "Email"
 msgstr "Courriel"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+"Entrée de %s mise à jour, mais échec de la sauvegarde du fichier "
+"téléchargé : %s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Mise à jour de %s effectuée."
 
-#: templates/data/export.inc:46 templates/browse/actions.inc:6
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "Erreur lors de l'ajout de %d contact(s) à la liste."
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr "Erreur lors de l'ajout à la liste de %d sur %d contact(s) demandé(s)."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Erreur lors de la suppression de %d contact(s)."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "Erreur lors de la suppression de %d contact(s) sur %d."
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "Erreur lors du retrait de %d contact(s) de la liste."
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr "Erreur lors du retrait de la liste de %d contact(s) sur %d."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "Erreur lors de la recherche dans le carnet d'adresse : %s"
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exporter"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Exporter l'annuaire"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "N'exporter que les contacts sélectionnés."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Exporter en totalité le carnet d'adresses suivant."
 
-#: browse.php:37 browse.php:94 browse.php:109 add.php:72 data.php:110
-#: data.php:228 search.php:52
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
-msgstr "Impossible d'accéder au carnet d'adresse : %s"
+msgstr "Impossible d'accéder au carnet d'adresses : %s"
 
-#: browse.php:128
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Impossible d'ajouter %s à %s : %s"
 
-#: browse.php:263
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "Impossible d'accéder à cette liste"
 
-#: browse.php:297
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "Impossible d'accéder à ce répertoire"
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 "Impossible de modifier le nom : (%s) %s ; ancien DN = %s, nouveau DN = %s, "
 "racine = %s"
 
-#: browse.php:114
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
-msgstr "Impossible de trouver l'objet à ajouter : %s"
+msgstr "Impossible de trouver un sujet à ajouter: %s"
 
-#: data.php:124 search.php:89
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "Impossible d'effectuer une recherche dans ce carnet d'adresses : %s"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Impossible d'effectuer une recherche dans ce répertoire : %s"
@@ -390,10 +498,18 @@
 msgid "Fax"
 msgstr "Télécopie"
 
-#: templates/browse/search.inc:72
+#: edit.php:131 display.php:100
+msgid "Files"
+msgstr "Fichiers"
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr "Rechercher"
 
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "Terminer"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Prénom"
@@ -402,15 +518,15 @@
 msgid "Freebusy URL"
 msgstr "URL des disponibilités"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "Dans"
 
-#: config/sources.php.dist:556
+#: config/sources.php.dist:606
 msgid "Global Address Book"
 msgstr "Carnet d'adresses global"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Groupe"
 
@@ -442,56 +558,60 @@
 msgid "Home Street Address"
 msgstr "Rue"
 
-#: templates/data/import.inc:9
+#: config/sources.php.dist:508
+msgid "IMSP"
+msgstr "IMSP"
+
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "Administration des annuaires IMSP (Internet Message Support Protocol)"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Importer un carnet d'adresses, étape %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Importer/Exporter carnet d'adresses"
 
-#: lib/api.php:376 lib/api.php:602
-msgid "Invalid Content-Type"
-msgstr "Type de contenu invalide"
-
-#: lib/api.php:439 lib/api.php:529
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "Identifiant invalide"
 
-#: lib/api.php:191 lib/api.php:334 lib/api.php:435 lib/api.php:525
-#: lib/api.php:578 lib/api.php:893
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1108
 msgid "Invalid address book"
 msgstr "Carnet d'adresses invalide"
 
-#: lib/api.php:897 lib/api.php:971 lib/api.php:1024
+#: lib/api.php:1112 lib/api.php:1185 lib/api.php:1238
 msgid "Invalid email"
 msgstr "Courriel invalide"
 
-#: lib/api.php:905
+#: lib/api.php:1120
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Clef spécifiée invalide."
 
-#: lib/api.php:901
+#: lib/api.php:1116
 msgid "Invalid name"
 msgstr "Nom invalide"
 
-#: lib/api.php:582
+#: lib/api.php:753
 msgid "Invalid objectId"
 msgstr "ObjectId invalide"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "Le support LDAP est requis mais le module LDAP est inaccessible ou non "
 "chargé."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Dernière modification"
 
@@ -499,23 +619,27 @@
 msgid "Last Name"
 msgstr "Nom"
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Liste"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "Contenant"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "Nombre maximal de contacts"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Nombre maximal de pages"
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Recherche simplifiée"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Menu"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "DN manquant dans la configuration de la source LDAP."
 
@@ -523,32 +647,34 @@
 msgid "Mobile Phone"
 msgstr "Tél. mobile"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Échec de la modification : (%s) %s"
 
-#: lib/api.php:1010
+#: lib/api.php:1224
 msgid "More than 1 entry found"
 msgstr "Plus d'une entrée trouvée"
 
-#: templates/browse/actions.inc:11
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Déplacer"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Déplacer à gauche"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Déplacer à droite"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Annuaire Mulberry"
 
-#: lib/api.php:930
+#: lib/api.php:1144
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
@@ -556,31 +682,31 @@
 "Plusieurs personnes avec l'adresse [%s], mais aucune avec le nom [%s] "
 "existent déjà"
 
-#: config/sources.php.dist:87 config/sources.php.dist:221
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+msgid "My Address Book"
 msgstr "Mon annuaire"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr "Mes annuaires"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nom"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Format de nom"
 
-#: config/sources.php.dist:295
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Répertoire Membre Netcenter"
 
-#: add.php:45 add.php:112 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "Nouvelle liste"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Suivant"
 
@@ -588,20 +714,20 @@
 msgid "Nickname"
 msgstr "Surnom"
 
-#: lib/api.php:1012 lib/api.php:1061
+#: lib/api.php:1226 lib/api.php:1275
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Aucune entrée %s trouvée pour %s. "
 
-#: lib/api.php:980
+#: lib/api.php:1194
 msgid "No address books found."
 msgstr "Aucun carnet d'adresses trouvé."
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr "Aucun contact trouvé"
 
-#: lib/api.php:356
+#: lib/api.php:513 lib/api.php:784
 msgid "No vCard data was found."
 msgstr "Aucune donnée vCard trouvée."
 
@@ -613,11 +739,11 @@
 msgid "Notes"
 msgstr "Notes"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Nombre d'items par page"
 
-#: lib/api.php:458
+#: lib/api.php:632 lib/api.php:765
 msgid "Object not found"
 msgstr "Sujet non trouvé"
 
@@ -625,7 +751,21 @@
 msgid "Office"
 msgstr "Bureau"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+"Après avoir sauver cette page d'options, le carnet d'adresses sera supprimé "
+"définitivement. Si ce n'est pas ce que vous voulez, vous devez changer votre "
+"sélection en « Aucun »."
+
+#: lib/api.php:792
+msgid "Only one vcard supported."
+msgstr "Une seule vCard est supportée."
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Autres options"
 
@@ -633,32 +773,36 @@
 msgid "PGP Public Key"
 msgstr "Clé publique PGP"
 
-#: lib/api.php:340 lib/api.php:445 lib/api.php:535 lib/api.php:594
-#: lib/api.php:751 lib/api.php:911
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:965
+#: lib/api.php:1129
 msgid "Permission Denied"
 msgstr "Permission refusée"
 
-#: lib/Driver.php:436
+#: lib/Driver.php:550
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Droits d'accès"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Annuaire Pine"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
-msgstr "Veuillez entrer le nom de la nouvelle liste :"
-
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Sélectionnez un répertoire :"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "Veuillez nommer la nouvelle liste de contacts :"
+
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "Précédent"
 
-#: config/sources.php.dist:399
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Annuaire privé"
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Échec de la requête : (%s) %s"
@@ -667,15 +811,27 @@
 msgid "Quick Search"
 msgstr "Recherche simplifiée"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Échec de lecture : (%s) %s"
 
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "La lecture des contacts n'est pas disponible."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "Supprimer ce contact définitivement ?"
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Enregistrements affichés :"
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "Supprimer un carnet d'adresses"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Retirer la colonne"
@@ -684,19 +840,20 @@
 msgid "Remove from this list"
 msgstr "Retirer de la liste"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Remplacer le carnet d'adresses existant par celui importé ? <b>Attention : "
-"cela supprimera toutes vos entrées du présent carnet d'adresses.</b>"
+"Remplacer le carnet d'adresses existant par celui importé ? "
+"<strong>Attention : cela supprimera toutes vos entrées du présent carnet "
+"d'adresses.</strong>"
 
-#: lib/Driver.php:330
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Sujet non trouvé."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Remettre à la configuration par défaut"
 
@@ -704,274 +861,349 @@
 msgid "S/MIME Public Certificate"
 msgstr "Certificat public S/MIME"
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr "Échec de STARTTLS : (%s) %s"
 
-#: edit.php:57 add.php:46
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Enregistrer"
 
-#: templates/block/minisearch.inc:23 templates/browse/search.inc:98
-#: templates/browse/search.inc:125 config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "L'enregistrement des contacts n'est pas disponible"
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Rechercher"
 
-#: browse.php:241 minisearch.php:66
-msgid "Search Results"
-msgstr "Résultats de la recherche"
-
-#: lib/api.php:827
+#: lib/api.php:1042
 msgid "Search failed"
 msgstr "La recherche a échoué"
 
-#: lib/api.php:920 lib/api.php:926 lib/api.php:935 lib/api.php:948
+#: lib/api.php:1134 lib/api.php:1140 lib/api.php:1149 lib/api.php:1162
 #, php-format
 msgid "Search failed: %s"
 msgstr "Échec de la recherche : %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Options de recherche"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "La recherche n'est pas disponible"
 
-#: templates/block/minisearch.inc:24
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Recherche en cours..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Sélectionnez un annuaire"
-
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "Sélectionnez une liste"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "Sélectionnez le carnet d'adresses à supprimer :"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "Sélectionnez le carnet d'adresses à éditer :"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Sélectionnez le carnet d'adresses pour l'exportation :"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Sélectionnez le carnet d'adresses pour l'importation :"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Sélectionnez le jeu de caractères du fichier source :"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Choisissez le format d'exportation :"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Sélectionnez le fichier à importer :"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Choisissez le format du fichier source :"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Sélectionnez le format à utiliser pour afficher les noms :"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Sélectionnez la vue à afficher par défaut."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
+"Sélectionnez la vue à afficher par défaut, ainsi que les options de tri et "
+"de pagination."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Sélectionnez les champs à afficher dans la liste des adresses."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Sélectionnez le format utilisé pour afficher les noms."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Sélectionnez les colonnes :"
-
-#: add.php:59
+#: add.php:54
 #, php-format
-msgid "Selected address book '%s'."
+msgid "Selected address book \"%s\"."
 msgstr "Carnet d'adresses sélectionné : %s."
 
-#: config/sources.php.dist:154
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Répertoire partagé"
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "Afficher _tout"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Afficher"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "Afficher %s"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Afficher tout"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Afficher contacts"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Afficher listes"
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "Afficher _contacts"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "Afficher _listes"
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
-msgstr "Ordre de tri"
+msgstr "Sens du tri"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "Sources"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr ""
 "Spécifier l'endroit où le résultat de la recherche avancée doit s'afficher."
 
-#: browse.php:130
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "%d contact(s) ajouté(s) à la liste."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "« %s » a bien été ajouté(e) à %s."
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "La liste « %s » a bien été créée."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "Suppression de %d contact(s)."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "%d contact(s) retiré(s) de la liste."
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Valeurs séparées par tabulation"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+"Le module VFS doit être configuré pour permettre le téléchargement des "
+"pièces jointes."
+
+#: lib/Driver.php:1076
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Le carnet d'adresses « %s » n'existe pas."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Le carnet d'adresses « %s » a été créé."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Le carnet d'adresses « %s » a été supprimé."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Le carnet d'adresses « %s » a été mis à jour."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Le carnet d'adresses n'a pas pu être purgé : %s"
 
-#: edit.php:24 display.php:23 vcard.php:22
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "Le contact demandé n'existe pas."
 
-#: browse.php:33
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Le fichier « %s » a été supprimé."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "L'importation s'est terminée malgré les avertissements."
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Aucun carnet d'adresses disponible en lecture."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
 "is an error, please contact your system administrator."
 msgstr ""
-"Aucun des annuaires disponibles ne sont configurés pour vous permettre "
+"Aucun des annuaires disponibles n'est configuré pour vous permettre "
 "d'ajouter un nouveau contact. Si vous pensez que ceci est une erreur, "
 "contactez votre administrateur système."
 
-#: add.php:108
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
 "Une erreur est survenue lors de l'ajout de ce contact. Contactez votre "
-"administrateur système pour plus d'information."
+"administrateur système pour plus d'informations."
 
-#: browse.php:185
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "Une erreur est survenue lors de la création de cette liste."
 
-#: browse.php:136
+#: addressbooks.php:38
 #, php-format
-msgid "There was an error deleting %s from the source address book."
+msgid "There was an error creating this address book: %s"
+msgstr ""
+"Une erreur est survenue lors de la création de ce carnet d'adresses : %s"
+
+#: browse.php:166
+#, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr ""
 "Une erreur est survenue lors de l'effacement de %s du carnet d'adresses "
 "d'origine."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Une erreur est survenue lors de la suppression de ce contact : %s"
 
-#: browse.php:68
-msgid "There was an error deleting this object."
-msgstr "Une erreur est survenue lors de l'effacement de cet objet."
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "Une erreur est survenue lors de l'affichage de la liste"
 
-#: browse.php:273
-msgid "There was an error displaying the select List"
-msgstr "Une erreur est survenue lors de l'affichage de la liste sélectionnée"
-
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Une erreur est survenue lors de l'importation des données : %s"
 
-#: lib/api.php:352
+#: lib/api.php:509 lib/api.php:779
 msgid "There was an error importing the iCalendar data."
 msgstr "Une erreur est survenue lors de l'importation des données iCalendar."
 
-#: browse.php:58
-msgid "There was an error removing this object."
-msgstr "Une erreur est survenue lors du retrait de cet objet."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr ""
+"Une erreur est survenue lors de la suppression de ce carnet d'adresses : %s"
+
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr ""
+"Une erreur est survenue lors de la mise à jour de ce carnet d'adresses : %s"
 
-#: edit.php:84
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Une erreur est survenue lors de la mise à jour de l'entrée : %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Il n'y a pas de carnet d'adresses à exporter."
 
-#: lib/Driver.php:390 lib/Driver.php:427
-msgid "This address book is read-only"
-msgstr "Ce carnet d'adresses est en lecture seule"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "Ces carnets d'adresses seront affichés dans cet ordre :"
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Ces colonnes seront affichées dans cet ordre :"
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Ce format de fichier n'est pas supporté."
 
-#: lib/api.php:939 lib/api.php:952
+#: lib/api.php:1153 lib/api.php:1166
 #, php-format
 msgid "This person already has a %s entry in the address book"
-msgstr "Cette personne est déjà une entrée %s dans le carnet d'adresses."
+msgstr "Cette personne a déjà une entrée %s dans le carnet d'adresses."
+
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+"Ce sera le carnet d'adresses par défaut pour l'ajout ou l'importation de "
+"contacts."
 
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Fonction"
 
-#: lib/Driver.php:834
+#: lib/Turba.php:443
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr ""
+"Impossible de créer un nouveau partage. Il manque le type de la source."
+
+#: lib/Driver.php:1000
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Impossible de charger la définition de %s."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Défaire les modifications"
 
-#: lib/api.php:487
-msgid "Unsupported Content-Type."
-msgstr "Type de contenu non supporté."
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Type de contenu non-supporté : %s"
 
-#: config/sources.php.dist:358
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Répertoire Verisign"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
-msgid "View '%s'"
+msgid "View \"%s\""
 msgstr "Voir « %s »"
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
 msgstr "Afficher le contact"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Affichage par défaut :"
 
@@ -981,7 +1213,7 @@
 
 #: config/attributes.php.dist:113
 msgid "Work Address"
-msgstr "Adresse du bureau"
+msgstr "Adresse bureau"
 
 #: config/attributes.php.dist:124
 msgid "Work City"
@@ -1007,11 +1239,12 @@
 msgid "Work Street Address"
 msgstr "Rue du bureau"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "Vous créez une liste de diffusion."
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "Vous n'êtes pas autorisé à créer plus de %d contacts dans « %s »."
 
-#: edit.php:44 display.php:58
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Vous n'êtes pas autorisé à consulter ce contact."
 
@@ -1019,7 +1252,11 @@
 msgid "You do not have permission to view this object."
 msgstr "Vous n'êtes pas autorisé à consulter cet objet."
 
-#: templates/browse/javascript.inc:51
+#: lib/Turba.php:531
+msgid "You do not have permissions to delete this source."
+msgstr "Vous n'avez pas l'autorisation de supprimer cette source."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Il faut d'abord sélectionner un carnet d'adresse cible."
 
@@ -1027,44 +1264,60 @@
 msgid "You must select a target list."
 msgstr "Vous devez d'abord sélectionner une liste cible."
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "Vous devez d'abord sélectionner au moins un contact."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Vous devez d'abord sélectionner au moins une entrée."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr "Vous êtes seulement autorisé à consulter ce contact."
 
-#: browse.php:284
-msgid "Your default addressbook is not browseable."
+#: browse.php:318
+msgid "Your default address book is not browseable."
 msgstr "Impossible de parcourir votre carnet d'adresses par défaut."
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[Pas de valeur]"
 
-#: lib/Turba.php:286
-msgid "_Add"
-msgstr "_Ajouter"
-
-#: lib/Turba.php:283
+#: lib/Turba.php:554
 msgid "_Browse"
 msgstr "_Lister"
 
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "_Contacts"
+
 #: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "S_upprimer"
 
-#: lib/Turba.php:292
+#: lib/Turba.php:563
 msgid "_Import/Export"
 msgstr "_Importer/Exporter"
 
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "_Listes"
+
+#: lib/Turba.php:551
+msgid "_My Address Books"
+msgstr "_Mes annuaires"
+
+#: lib/Turba.php:557
+msgid "_New Contact"
+msgstr "_Nouveau contact"
+
 #: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "_Retirer de la liste"
 
-#: lib/Turba.php:288
+#: lib/Turba.php:559
 msgid "_Search"
 msgstr "_Recherche"
 
@@ -1072,19 +1325,35 @@
 msgid "contact.vcf"
 msgstr "contact.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contacts.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contacts.tsv"
 
-#: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
-msgstr "vers le carnet d'adresses sélectionné"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "contacts.vcf"
+
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr "Aucun formatage"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "aucun"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "vers une liste de contacts"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "vers un autre carnet d'adresses"
 
-#: data.php:30 templates/data/import.inc:20 templates/data/export.inc:20
-#: templates/browse/column_headers.inc:7
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/templates/browse/search_criteria.inc
+++ mod/templates/browse/search_criteria.inc
@@ -3,8 +3,8 @@
     if (substr($name, 0, 2) != '__') {
 ?>
  <tr>
-  <td width="1%" nowrap="nowrap" class="light" align="right"><b><?php echo $attributes[$name]['label'] ?></b></td>
-  <td align="left"><input type="text" size="30" name="<?php echo $name ?>" /></td>
+  <td width="1%" nowrap="nowrap" class="light rightAlign" ><strong><?php echo $attributes[$name]['label'] ?></strong></td>
+  <td class="leftAlign"><input type="text" size="30" name="<?php echo $name ?>" value="<?php echo isset($criteria[$name]) ? htmlspecialchars($criteria[$name]) : '' ?>" /></td>
  </tr>
 <?php
     }


--- orig/po/turba.pot
+++ mod/po/turba.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-10-13 17:13+0200\n"
+"POT-Creation-Date: 2006-03-06 12:47+0100\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"
@@ -16,30 +16,43 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: browse.php:120
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:140
 #, php-format
 msgid "\"%s\" was not copied because it is a list."
 msgstr ""
 
-#: browse.php:118
+#: browse.php:138
 #, php-format
 msgid "\"%s\" was not moved because it is a list."
 msgstr ""
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr ""
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr ""
 
-#: add.php:87
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr ""
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr ""
@@ -49,48 +62,81 @@
 msgid "%s to %s of %s"
 msgstr ""
 
-#: lib/Block/minisearch.php:45
+#: lib/Turba.php:458
+#, php-format
+msgid "%s's Address Book"
+msgstr ""
+
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr ""
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr ""
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
 msgstr ""
 
-#: add.php:52
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr ""
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr ""
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr ""
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr ""
 
-#: templates/browse/actions.inc:22
+#: edit.php:135
+msgid "Add file"
+msgstr ""
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr ""
 
-#: browse.php:30 config/prefs.php.dist:99
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr ""
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr ""
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr ""
 
-#: add.php:86
-msgid "Address book entry"
+#: config/prefs.php.dist:10
+msgid "Address Books"
 msgstr ""
 
-#: lib/Driver.php:478
-msgid "Address book is read-only."
+#: add.php:108
+msgid "Address book entry"
 msgstr ""
 
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr ""
 
-#: search.php:97 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr ""
 
@@ -98,55 +144,37 @@
 msgid "Alias"
 msgstr ""
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr ""
 
-#: lib/api.php:395
+#: lib/api.php:553
 msgid "Already Exists"
 msgstr ""
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr ""
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr ""
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr ""
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr ""
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr ""
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr ""
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr ""
-
-#: search.php:94 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr ""
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr ""
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr ""
@@ -155,49 +183,63 @@
 msgid "Birthday"
 msgstr ""
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr ""
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr ""
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr ""
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
 msgstr ""
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr ""
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
 msgstr ""
 
-#: add.php:44
+#: add.php:48
 msgid "Choose an address book"
 msgstr ""
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
 msgstr ""
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
 msgstr ""
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr ""
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr ""
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr ""
 
@@ -209,70 +251,77 @@
 msgid "Company Address"
 msgstr ""
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:384 lib/api.php:454
-#: lib/api.php:544 lib/api.php:590 lib/api.php:638 lib/api.php:825
-#: lib/api.php:918
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:492
+#: lib/api.php:618 lib/api.php:705 lib/api.php:758 lib/api.php:839
+#: lib/api.php:1036 lib/api.php:1124
 #, php-format
 msgid "Connection failed: %s"
 msgstr ""
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr ""
 
-#: browse.php:60
-msgid "Contact removed from list."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
 msgstr ""
 
-#: browse.php:257
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr ""
 
-#: browse.php:281
-#, php-format
-msgid "Contents of %s"
+#: templates/browse/actions.inc:18
+msgid "Copy"
 msgstr ""
 
-#: templates/browse/actions.inc:12
-msgid "Copy"
+#: templates/addressbooks.inc:53
+msgid "Create"
 msgstr ""
 
-#: lib/ObjectView.php:134
-msgid "Created"
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
 msgstr ""
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
 msgstr ""
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
+#: lib/ObjectView.php:133
+msgid "Created"
 msgstr ""
 
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr ""
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr ""
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr ""
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr ""
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr ""
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr ""
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr ""
 
@@ -280,38 +329,55 @@
 msgid "Department"
 msgstr ""
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr ""
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr ""
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr ""
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr ""
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr ""
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr ""
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr ""
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
 msgid "Edit \"%s\""
 msgstr ""
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr ""
+
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr ""
@@ -320,57 +386,101 @@
 msgid "Email"
 msgstr ""
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr ""
 
-#: templates/browse/actions.inc:6 templates/data/export.inc:46
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr ""
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr ""
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr ""
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr ""
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr ""
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr ""
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr ""
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr ""
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr ""
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr ""
 
-#: data.php:110 data.php:228 browse.php:37 browse.php:94 browse.php:109
-#: add.php:63 search.php:52
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr ""
 
-#: browse.php:128
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr ""
 
-#: browse.php:263
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr ""
 
-#: browse.php:297
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr ""
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 
-#: browse.php:114
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr ""
 
-#: data.php:124 search.php:88
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr ""
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr ""
@@ -379,10 +489,18 @@
 msgid "Fax"
 msgstr ""
 
-#: templates/browse/search.inc:72
+#: edit.php:131 display.php:102
+msgid "Files"
+msgstr ""
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr ""
 
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr ""
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr ""
@@ -391,15 +509,15 @@
 msgid "Freebusy URL"
 msgstr ""
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr ""
 
-#: config/sources.php.dist:562
+#: config/sources.php.dist:606
 msgid "Global Address Book"
 msgstr ""
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr ""
 
@@ -431,58 +549,58 @@
 msgid "Home Street Address"
 msgstr ""
 
-#: config/sources.php.dist:487
+#: config/sources.php.dist:508
 msgid "IMSP"
 msgstr ""
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr ""
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr ""
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr ""
 
-#: lib/api.php:378 lib/api.php:604
-msgid "Invalid Content-Type"
-msgstr ""
-
-#: lib/api.php:441 lib/api.php:531
+#: lib/api.php:613 lib/api.php:700
 msgid "Invalid ID"
 msgstr ""
 
-#: lib/api.php:191 lib/api.php:334 lib/api.php:437 lib/api.php:527
-#: lib/api.php:580 lib/api.php:895
+#: lib/api.php:232 lib/api.php:404 lib/api.php:487 lib/api.php:609
+#: lib/api.php:696 lib/api.php:748 lib/api.php:1107
 msgid "Invalid address book"
 msgstr ""
 
-#: lib/api.php:899 lib/api.php:973 lib/api.php:1026
+#: lib/api.php:1111 lib/api.php:1185 lib/api.php:1238
 msgid "Invalid email"
 msgstr ""
 
-#: lib/api.php:907
+#: lib/api.php:1119
 msgid "Invalid entry"
 msgstr ""
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr ""
 
-#: lib/api.php:903
+#: lib/api.php:1115
 msgid "Invalid name"
 msgstr ""
 
-#: lib/api.php:584
+#: lib/api.php:752
 msgid "Invalid objectId"
 msgstr ""
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr ""
 
@@ -490,23 +608,27 @@
 msgid "Last Name"
 msgstr ""
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr ""
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr ""
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr ""
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
 msgstr ""
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr ""
 
@@ -514,62 +636,64 @@
 msgid "Mobile Phone"
 msgstr ""
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr ""
 
-#: lib/api.php:1012
+#: lib/api.php:1224
 msgid "More than 1 entry found"
 msgstr ""
 
-#: templates/browse/actions.inc:11
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr ""
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr ""
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr ""
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr ""
 
-#: lib/api.php:932
+#: lib/api.php:1143
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
 
-#: config/sources.php.dist:87 config/sources.php.dist:221
+#: config/sources.php.dist:107 config/sources.php.dist:243
 msgid "My Address Book"
 msgstr ""
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr ""
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr ""
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr ""
 
-#: config/sources.php.dist:295
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr ""
 
-#: add.php:36 add.php:102 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr ""
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr ""
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr ""
 
@@ -577,20 +701,20 @@
 msgid "Nickname"
 msgstr ""
 
-#: lib/api.php:1014 lib/api.php:1063
+#: lib/api.php:1226 lib/api.php:1275
 #, php-format
 msgid "No %s entry found for %s"
 msgstr ""
 
-#: lib/api.php:982
+#: lib/api.php:1194
 msgid "No address books found."
 msgstr ""
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr ""
 
-#: lib/api.php:356
+#: lib/api.php:512 lib/api.php:783
 msgid "No vCard data was found."
 msgstr ""
 
@@ -602,11 +726,11 @@
 msgid "Notes"
 msgstr ""
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr ""
 
-#: lib/api.php:460
+#: lib/api.php:631 lib/api.php:764
 msgid "Object not found"
 msgstr ""
 
@@ -614,7 +738,18 @@
 msgid "Office"
 msgstr ""
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:791
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr ""
 
@@ -622,49 +757,65 @@
 msgid "PGP Public Key"
 msgstr ""
 
-#: lib/api.php:340 lib/api.php:447 lib/api.php:537 lib/api.php:596
-#: lib/api.php:753 lib/api.php:913
+#: lib/api.php:496 lib/api.php:622 lib/api.php:709 lib/api.php:964
+#: lib/api.php:1128
 msgid "Permission Denied"
 msgstr ""
 
-#: lib/Driver.php:436
+#: lib/Driver.php:551
 msgid "Permission denied"
 msgstr ""
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr ""
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
 msgstr ""
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
 msgstr ""
 
-#: config/sources.php.dist:399
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr ""
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr ""
 
-#: templates/block/minisearch.inc:18
+#: templates/block/minisearch.inc:15
 msgid "Quick Search"
 msgstr ""
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr ""
 
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr ""
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr ""
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr ""
@@ -673,17 +824,17 @@
 msgid "Remove from this list"
 msgstr ""
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
 
-#: lib/Driver.php:330
+#: lib/Driver.php:439
 msgid "Requested object not found."
 msgstr ""
 
-#: add.php:37 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr ""
 
@@ -691,162 +842,205 @@
 msgid "S/MIME Public Certificate"
 msgstr ""
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr ""
 
-#: edit.php:57 add.php:37
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr ""
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
-msgid "Search"
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
 msgstr ""
 
-#: browse.php:241 minisearch.php:66
-msgid "Search Results"
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:18 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
 msgstr ""
 
-#: lib/api.php:829
+#: lib/api.php:1041
 msgid "Search failed"
 msgstr ""
 
-#: lib/api.php:922 lib/api.php:928 lib/api.php:937 lib/api.php:950
+#: lib/api.php:1133 lib/api.php:1139 lib/api.php:1148 lib/api.php:1161
 #, php-format
 msgid "Search failed: %s"
 msgstr ""
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
 msgstr ""
 
-#: templates/block/minisearch.inc:24
+#: templates/block/minisearch.inc:19
 msgid "Searching..."
 msgstr ""
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
 msgstr ""
 
-#: templates/browse/actions.inc:24
-msgid "Select List"
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
 msgstr ""
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr ""
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr ""
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr ""
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr ""
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr ""
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr ""
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr ""
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
 msgstr ""
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr ""
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr ""
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr ""
-
-#: add.php:50
+#: add.php:54
 #, php-format
 msgid "Selected address book \"%s\"."
 msgstr ""
 
-#: config/sources.php.dist:154
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr ""
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr ""
-
-#: templates/browse/select.inc:11
-msgid "Show"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
 msgstr ""
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr ""
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr ""
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr ""
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr ""
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr ""
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr ""
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr ""
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr ""
 
-#: browse.php:130
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr ""
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr ""
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr ""
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr ""
+
+#: data.php:50
 msgid "TSV"
 msgstr ""
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr ""
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1077
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr ""
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr ""
 
-#: browse.php:33
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr ""
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr ""
 
@@ -857,100 +1051,122 @@
 "is an error, please contact your system administrator."
 msgstr ""
 
-#: add.php:99
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
 
-#: browse.php:185
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr ""
 
-#: browse.php:136
+#: addressbooks.php:38
 #, php-format
-msgid "There was an error deleting %s from the source address book."
+msgid "There was an error creating this address book: %s"
 msgstr ""
 
-#: delete.php:31
+#: browse.php:166
 #, php-format
-msgid "There was an error deleting this contact: %s"
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr ""
 
-#: browse.php:68
-msgid "There was an error deleting this object."
+#: delete.php:37
+#, php-format
+msgid "There was an error deleting this contact: %s"
 msgstr ""
 
-#: browse.php:273
-msgid "There was an error displaying the select List"
+#: browse.php:311
+msgid "There was an error displaying the list"
 msgstr ""
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr ""
 
-#: lib/api.php:352
+#: lib/api.php:508 lib/api.php:778
 msgid "There was an error importing the iCalendar data."
 msgstr ""
 
-#: browse.php:58
-msgid "There was an error removing this object."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr ""
+
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
 msgstr ""
 
-#: edit.php:84
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr ""
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr ""
 
-#: lib/Driver.php:390 lib/Driver.php:427
-msgid "This address book is read-only"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
 msgstr ""
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr ""
 
-#: lib/api.php:941 lib/api.php:954
+#: lib/api.php:1152 lib/api.php:1165
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr ""
 
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr ""
 
-#: lib/Driver.php:835
+#: lib/Turba.php:443
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr ""
+
+#: lib/Driver.php:1001
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr ""
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr ""
 
-#: lib/api.php:489
-msgid "Unsupported Content-Type."
+#: lib/api.php:541 lib/api.php:660 lib/api.php:796
+#, php-format
+msgid "Unsupported Content-Type: %s"
 msgstr ""
 
-#: config/sources.php.dist:358
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr ""
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
 msgid "View \"%s\""
 msgstr ""
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
 msgstr ""
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr ""
 
@@ -986,11 +1202,12 @@
 msgid "Work Street Address"
 msgstr ""
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
 msgstr ""
 
-#: edit.php:44 display.php:59
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr ""
 
@@ -998,7 +1215,11 @@
 msgid "You do not have permission to view this object."
 msgstr ""
 
-#: templates/browse/javascript.inc:51
+#: lib/Turba.php:531
+msgid "You do not have permissions to delete this source."
+msgstr ""
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr ""
 
@@ -1006,44 +1227,60 @@
 msgid "You must select a target list."
 msgstr ""
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr ""
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr ""
 
-#: browse.php:284
-msgid "Your default addressbook is not browseable."
+#: browse.php:318
+msgid "Your default address book is not browseable."
 msgstr ""
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr ""
 
-#: lib/Turba.php:286
-msgid "_Add"
+#: lib/Turba.php:554
+msgid "_Browse"
 msgstr ""
 
-#: lib/Turba.php:283
-msgid "_Browse"
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
 msgstr ""
 
 #: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr ""
 
-#: lib/Turba.php:292
+#: lib/Turba.php:563
 msgid "_Import/Export"
 msgstr ""
 
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr ""
+
+#: lib/Turba.php:551
+msgid "_My Address Books"
+msgstr ""
+
+#: lib/Turba.php:557
+msgid "_New Contact"
+msgstr ""
+
 #: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr ""
 
-#: lib/Turba.php:288
+#: lib/Turba.php:559
 msgid "_Search"
 msgstr ""
 
@@ -1051,19 +1288,35 @@
 msgid "contact.vcf"
 msgstr ""
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr ""
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr ""
 
-#: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
 msgstr ""
 
-#: data.php:30 templates/browse/column_headers.inc:7
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr ""


--- orig/edit.php
+++ mod/edit.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: turba/edit.php,v 1.70.4.3 2005/10/12 20:31:52 chuck Exp $
+ * $Horde: turba/edit.php,v 1.70.4.6 2006/01/01 21:29:15 jan Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -12,24 +12,53 @@
 require_once TURBA_BASE . '/lib/base.php';
 require_once TURBA_BASE . '/lib/Renderer.php';
 require_once TURBA_BASE . '/lib/ObjectView.php';
+require_once TURBA_BASE . '/lib/List.php';
+require_once TURBA_BASE . '/lib/ListView.php';
 require_once 'Horde/Form.php';
 require_once 'Horde/Variables.php';
 
 $renderer = &new Turba_Renderer();
 $vars = &Variables::getDefaultVariables();
-
-$url = $vars->get('url');
 $source = $vars->get('source');
+$original_source = $vars->get('original_source');
+$key = $vars->get('key');
+$groupedit = $vars->get('actionID') == 'groupedit';
+$objectkeys = $vars->get('objectkeys');
+$url = $vars->get('url', Horde::applicationUrl($prefs->getValue('initial_page'), true));
+
+/* Edit the first of a list of contacts? */
+if ($groupedit && (!$key || $key == '**search')) {
+    if (!count($objectkeys)) {
+        $notification->push(_("You must select at least one contact first."), 'horde.warning');
+        header('Location: ' . $url);
+        exit;
+    }
+    if ($key == '**search') {
+        $original_source = $key;
+    }
+    list($source, $key) = explode(':', $objectkeys[0], 2);
+    if (strpos($key, ':')) {
+        list($owner, $key) = explode(':', $key, 2);
+        $source .= ':' . $owner;
+    }
+    if (empty($original_source)) {
+        $original_source = $source;
+    }
+    $vars->set('original_source', $original_source);
+}
+
 if ($source === null || !isset($cfgSources[$source])) {
     $notification->push(_("The contact you requested does not exist."));
-    header('Location: ' . Horde::applicationUrl($prefs->getValue('initial_page'), true));
+    header('Location: ' . $url);
     exit;
 }
 
-$driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+$driver = &Turba_Driver::singleton($source);
 
 /* Set the contact from the key requested. */
-$key = $vars->get('key');
+if (strpos($key, ':')) {
+    list($owner, $key) = explode(':', $key, 2);
+}
 $object = $driver->getObject($key);
 if (is_a($object, 'PEAR_Error')) {
     $notification->push($object->getMessage(), 'horde.error');
@@ -39,22 +68,43 @@
 
 /* Check permissions on this contact. */
 $editdone = false;
-if (!Turba::hasPermission($object, 'object', PERMS_EDIT)) {
-    if (!Turba::hasPermission($object, 'object', PERMS_READ)) {
-        $notification->push(_("You do not have permission to view this contact."), 'horde.error');
-        header('Location: ' . Horde::applicationUrl($prefs->getValue('initial_page'), true));
-        exit;
-    } else {
-        $notification->push(_("You only have permission to view this contact."), 'horde.error');
-        $editdone = true;
-    }
+if (!$object->hasPermission(PERMS_EDIT)) {
+   if (!$object->hasPermission(PERMS_READ)) {
+       $notification->push(_("You do not have permission to view this contact."), 'horde.error');
+       header('Location: ' . Horde::applicationUrl($prefs->getValue('initial_page'), true));
+       exit;
+   } else {
+       $notification->push(_("You only have permission to view this contact."), 'horde.error');
+       $uri = Horde::applicationUrl('display.php', true);
+       $uri = Util::addParameter($uri, array('source' => $original_source, 'key' => $key), null, false);
+       header('Location: ' . $uri);
+       exit;
+   }
 }
 
 $title = sprintf(_("Edit entry for %s"), $object->getValue('name'));
 
 /* Get the form object. */
 $form = &Horde_Form::singleton('', $vars, $title);
-$form->setButtons(_("Save"), _("Undo Changes"));
+if ($groupedit) {
+    $form->addHidden('', 'objectkeys', 'text', false);
+    $form->addHidden('', 'original_source', 'text', false);
+    $form->addHidden('', 'actionID', 'text', false);
+    if ($source . ':' . $key == $objectkeys[0]) {
+        /* First contact */
+        $form->setButtons(_("Next"), _("Undo Changes"));
+    } elseif ($source . ':' . $key == $objectkeys[count($objectkeys) - 1]) {
+        /* Last contact */
+        $form->setButtons(_("Previous"), _("Undo Changes"));
+    } else {
+        /* Inbetween */
+        $form->setButtons(_("Previous"), _("Undo Changes"));
+        $form->appendButtons(_("Next"));
+    }
+    $form->appendButtons(_("Finish"));
+} else {
+    $form->setButtons(_("Save"), _("Undo Changes"));
+}
 $form->addHidden('', 'url', 'text', false);
 $form->addHidden('', 'source', 'text', true);
 $form->addHidden('', 'key', 'text', false);
@@ -63,6 +113,28 @@
 $view = &new Turba_ObjectView($object);
 $view->setupForm($form);
 
+if ($conf['documents']['type'] != 'none') {
+    if (Util::getFormData('actionID') == 'delete_vfs') {
+        $file = Util::getFormData('file');
+        $result = $object->deleteFile($file);
+        if (is_a($result, 'PEAR_Error')) {
+            $notification->push($result, 'horde.error');
+        } else {
+            $notification->push(sprintf(_("The file \"%s\" has successfully been deleted."), $file), 'horde.success');
+        }
+    }
+
+    $files = $object->listFiles();
+    if (is_a($files, 'PEAR_Error')) {
+        $notification->push($files, 'horde.error');
+    } else {
+        $v = $form->addVariable(_("Files"), '__vfs', 'html', false);
+        $v->disable();
+        $vars->set('__vfs', implode('<br />', array_map(array($object, 'vfsEditUrl'), $files)));
+    }
+    $form->addVariable(_("Add file"), 'vfs', 'file', false);
+}
+
 if ($form->validate($vars)) {
     /* Form valid, save data. */
     $form->getInfo($vars, $info);
@@ -76,7 +148,16 @@
     $success = $object->store();
     $key = $object->getValue('__key');
     if (!is_a($success, 'PEAR_Error')) {
-        $notification->push(sprintf(_("Entry for %s updated."), $object->getValue('name')), 'horde.success');
+        if ($conf['documents']['type'] != 'none' && isset($info['vfs'])) {
+            $success = $object->addFile($info['vfs']);
+            if (is_a($success, 'PEAR_Error')) {
+                $notification->push(sprintf(_("Entry for %s updated, but saving the uploaded file failed: %s"), $object->getValue('name'), $success->getMessage()), 'horde.warning');
+            } else {
+                $notification->push(sprintf(_("Entry for %s updated."), $object->getValue('name')), 'horde.success');
+            }
+        } else {
+            $notification->push(sprintf(_("Entry for %s updated."), $object->getValue('name')), 'horde.success');
+        }
         $form->setTitle(sprintf(_("Edit entry for %s"), $object->getValue('name')));
         $editdone = true;
     } else {
@@ -94,6 +175,48 @@
     $vars->set('url', $url);
     $vars->set('source', $source);
     $vars->set('key', $key);
+    if ($groupedit) {
+        $vars->set('objectkeys', $objectkeys);
+        $vars->set('actionID', 'groupedit');
+    }
+}
+
+if ($groupedit && $editdone) {
+    $next_page = Horde::applicationUrl('edit.php', true);
+    $next_page = Util::addParameter($next_page,
+                                    array('source' => $source,
+                                          'original_source' => $original_source,
+                                          'objectkeys' => $objectkeys,
+                                          'url' => $url,
+                                          'actionID' => 'groupedit'),
+                                    null, false);
+    $objectkey = array_search($source . ':' . $key, $objectkeys);
+    if ($vars->get('submitbutton') == _("Finish")) {
+        $next_page = Horde::url('browse.php', true);
+        if ($original_source == '**search') {
+            $next_page = Util::addParameter($next_page, 'key', $original_source, false);
+        } else {
+            $next_page = Util::addParameter($next_page, 'source', $original_source, false);
+        }
+    } elseif ($vars->get('submitbutton') == _("Previous") && $source . ':' . $key != $objectkeys[0]) {
+        /* Previous contact */
+        $form->setButtons(_("Undo Changes"));
+        list(, $previous_key) = explode(':', $objectkeys[$objectkey - 1]);
+        $next_page = Util::addParameter($next_page, 'key', $previous_key, false);
+        if ($form->getOpenSection()) {
+            $next_page = Util::addParameter($next_page, '__formOpenSection', $form->getOpenSection(), false);
+        }
+    } elseif ($vars->get('submitbutton') == _("Next") &&
+              $source . ':' . $key != $objectkeys[count($objectkeys) - 1]) {
+        /* Next contact */
+        list(, $next_key) = explode(':', $objectkeys[$objectkey + 1]);
+        $next_page = Util::addParameter($next_page, 'key', $next_key, false);
+        if ($form->getOpenSection()) {
+            $next_page = Util::addParameter($next_page, '__formOpenSection', $form->getOpenSection(), false);
+        }
+    }
+    header('Location: ' . $next_page);
+    exit;
 }
 
 if ($editdone) {
@@ -108,7 +231,21 @@
     exit;
 }
 
+if ($groupedit) {
+    /* Read the columns to display from the preferences. */
+    $sources = Turba::getColumns();
+    $columns = isset($sources[$source]) ? $sources[$source] : array();
+    $results = &new Turba_List($objectkeys);
+    $listView = &new Turba_ListView($results, array('Group' => true));
+}
+
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
 $form->renderActive($renderer, $vars, 'edit.php', 'post');
+
+if (isset($listView) && is_object($listView)) {
+    echo '<br />';
+    $listView->displayPage();
+}
+
 require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/po/ro_RO.po
+++ mod/po/ro_RO.po
@@ -3,12 +3,11 @@
 # Eugen Hoanca <eugenh at urban-grafx.ro>, 2003.
 # Marius Dragulescu <mariusd at urban-grafx.ro>, 2003.
 #
-
 msgid ""
 msgstr ""
-
 "Project-Id-Version: TURBA 1.1\n"
-"POT-Creation-Date: 2003-02-24 14:50+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-03-01 12:00+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh at urban-grafx.ro>\n"
 "Language-Team: Romanian <u18m at lists.horde.org>\n"
@@ -16,390 +15,1370 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "Fisierul %s a fost importat cu succes"
 
-msgid "Add Contact ..."
-msgstr "Adauga contact ..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "Adauga contact nou"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Listare agenda"
 
-msgid "Add failed"
-msgstr "Adaugare esuata"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
 
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Adaugare"
 
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Agenda invalida."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Nu exista agende in care sa se scrie."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "adaugare coloana"
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "Adaugare esuata"
+
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "Adaugare"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Listare agenda"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Listare agenda"
 
-msgid "Addressbook is read-only."
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Listare agenda"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
 msgstr "Agenda doar in citire"
 
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "Fisierul %s a fost importat cu succes"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Agenda doar in citire"
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Cautare avansata"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Alias"
 
-msgid "An illegal value was specified."
-msgstr "S-a specificat o valoare invalida."
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
+
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
+
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "Cautare"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
 
-msgid "Available Columns:"
-msgstr "Coloane disponibile:"
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
 
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Rasfoire"
 
-msgid "Cancel"
-msgstr "Renuntare"
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "Telefon mobil"
+#: data.php:49
+msgid "CSV"
+msgstr ""
 
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Alege ordinea afisarii coloanelor in lista de adrese."
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
 
-msgid "Clear Search"
-msgstr "Sterge cautare"
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "Nu exista agende pentru rasfoit."
 
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Nu exista agende pentru rasfoit."
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr "Alege ordinea afisarii coloanelor in lista de adrese."
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Optiuni coloana"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Companie"
 
-#, c-format
-msgid "Contents of %s"
-msgstr "Continut %s"
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Adresa acasa"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Stergere esuata"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "Stergere esuata"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
 
-msgid "Default Display"
-msgstr "Afisaj implicit"
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
 
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "Companie"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Exportare agenda"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
+
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Stergere"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Exportare agenda"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Stergere esuata"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Stergere esuata"
 
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "Optiuni utilizator"
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Director"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Optiuni afisaj "
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Optiuni afisaj "
 
-#, c-format
-msgid "Edit '%s'"
-msgstr "Editare '%s'"
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
 
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Editare"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Editare '%s'"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Exportare agenda"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "E-mail"
 
-msgid "Error"
-msgstr "Eroare"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
 
-msgid "Export Addressbook"
-msgstr "Exportare agenda"
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "Fisierul %s a fost importat cu succes"
 
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Nu exista agende in care sa se scrie."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportare"
 
-msgid "Failed to access the specified address book."
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "Exportare agenda"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
 msgstr "Nu s-a putut accesa agenda specificata."
 
-#, c-format
-msgid "Failed to browse %s."
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Rasfoire esuata pentru %s."
+
+#: browse.php:272
+#, fuzzy
+msgid "Failed to browse list"
 msgstr "Rasfoire esuata pentru %s."
 
-msgid "Failed to connect to the specified directory."
-msgstr "Conectare esuata la directorul specificat."
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
+msgstr "Cautare esuata in directorul: %s"
 
-#, c-format
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "Cautare esuata in directorul: %s"
+
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Nu s-a putut accesa agenda specificata."
+
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Cautare esuata in directorul: %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fax"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Titlu"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Cautare"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Cautare"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "De la"
 
-msgid "Help"
-msgstr "Ajutor"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Exportare agenda"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
 
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Adresa acasa"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "Telefon acasa"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Telefon acasa"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "Daca se importa date CSV: contine primul rand numele campului?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Telefon acasa"
 
-msgid "Illegal or malformed form data."
-msgstr "Data invalida sau corupta."
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "Telefon acasa"
 
-msgid "Import Addressbook"
-msgstr "Importare agenda"
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Adresa acasa"
 
-msgid "Import"
-msgstr "Importare"
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
+
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Listare agenda"
 
-msgid "Import/Export Addressbooks"
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Importare agenda"
+
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "Importare/Exportare agende"
 
-msgid "Import/Export"
-msgstr "Importare/Exportare"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Nume invalid."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "Agenda invalida."
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "Adresa de e-mail invalida."
 
-msgid "Invalid name."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
 msgstr "Nume invalid."
 
-msgid "Language"
-msgstr "Limba"
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "S-a specificat o valoare invalida."
 
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "Nume invalid."
+
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "Nume invalid."
+
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Nume"
+
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Lista"
 
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Corespunzator(oare)"
 
-msgid "Message"
-msgstr "Mesaj"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Lista"
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "Cautare"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Telefon acasa"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "mutare stanga"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "mutare dreapta"
 
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "Exportare agenda"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Listare agenda"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Listare agenda"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nume"
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+#: config/prefs.php.dist:31
+msgid "Name Format"
 msgstr ""
-"Mici una din agendele disponibile nu e configurata pentru adaugare de noi "
-"intrari. Daca se considera ca este o greseala, contactati administratorul "
-"de sistem."
 
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "Adauga contact nou"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Nume"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
+
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "Agenda doar in citire"
+
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "Notite"
+
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Notite"
 
-msgid "Options"
-msgstr "Optiuni"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
 
-msgid "Please choose an address book to add a contact to."
-msgstr "Alege o agenda in care sa se adauge contactul."
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
+
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
-msgid "Please select a directory:"
-msgstr "Selectati un director:"
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
 
-msgid "Problem?"
-msgstr "Problema?"
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "Optiuni utilizator"
 
-msgid "Reset"
-msgstr "Resetare"
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
 
-msgid "Save Changes"
-msgstr "Salvare schimbari"
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "Listare agenda"
+
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
+
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
+
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Exportare agenda"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Cautare"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Importare agenda"
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "stergere coloana"
+
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
 
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Salvare"
 
-msgid "Search Results"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "Cautare"
+
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Rezultate cautare"
 
-msgid "Search"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
 msgstr "Cautare"
 
-msgid "Search&nbsp;Results"
-msgstr "Cautare&nbsp;Rezultate"
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
 
-msgid "Select the destination to import to:"
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "Cautare"
+
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Alege o agenda in care sa se adauge contactul."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Alege o agenda in care sa se adauge contactul."
+
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Selecteaza sursa din care se exporta:"
+
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "Selecteaza destinatia spre care se importa:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Selecteaza sursa din care se exporta:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "Selecteaza sursa din care se exporta:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Selecteaza fisierul care se importa:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "Selecteaza formatul in care se exporta:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "Selecteaza formatul din care se importa:"
 
-msgid "Select the source to export from:"
-msgstr "Selecteaza sursa din care se exporta:"
-
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Selecteaza vizualizarea implicita."
 
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Selecteaza campurile ce vor fi afisate in listele de adrese."
 
-msgid "Select your preferred language:"
-msgstr "Selecteaza limba preferata:"
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "Selecteaza campurile ce vor fi afisate in listele de adrese."
+
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "Agenda invalida."
+
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Director"
 
-msgid "Selected Columns:"
-msgstr "Coloane selectate:"
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "Trimitere mail catre %s"
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr ""
 
-msgid "Set your preferred display language."
-msgstr "Setare limbaj pentru afisare."
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Anumite fisiere de configurare Turba lipsesc:"
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr ""
 
-msgid "Success"
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "Director"
+
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
 msgstr "Succes"
 
-msgid "The data got lost"
-msgstr "Datele au fost pierdute"
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
 
-msgid "The data got lost."
-msgstr "Datele au fost pierdute"
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
 
-msgid "The file contained no data."
-msgstr "Fisierul nu contine date"
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
 
-msgid "There are no browseable address books."
-msgstr "Nu exista agende pentru rasfoit."
+#: data.php:50
+msgid "TSV"
+msgstr ""
 
-#, c-format
-msgid "There are no entries in %s."
-msgstr "Nu exista intrari in %s."
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
 
-msgid "There are no writeable address books."
-msgstr "Nu exista agende in care sa se scrie."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
+
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Fisierul %s a fost importat cu succes"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
 msgstr ""
-"A aparut o problema cu uploadul fisierului. Fisierul s-ar putea sa fie mai "
-"mare decat este acceptat."
 
+#: browse.php:31
+msgid "There are no browseable address books."
+msgstr "Nu exista agende pentru rasfoit."
+
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"A aparut o problema la aceasta adaugare. Contactati administratorul de "
-"sistem pentru asistenta."
+"Mici una din agendele disponibile nu e configurata pentru adaugare de noi "
+"intrari. Daca se considera ca este o greseala, contactati administratorul de "
+"sistem."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error deleting this object. Contact your system administrator "
+"There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
-"A aparut o eroare la aceasta stergere. Contactati administratorul de "
+"A aparut o problema la aceasta adaugare. Contactati administratorul de "
 "sistem pentru asistenta."
 
-msgid "There was an error importing the data."
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
 msgstr "A aparut o eroare la importarea datelor."
 
-msgid "There was an error importing the uploaded file"
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
+msgstr "A aparut o eroare la importarea datelor."
+
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
 msgstr "A aparut o eroare la uploadul fisierului"
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
-msgstr ""
-"Acest fisier controleaza preferintele implicite ale Turba, precum si "
-"alte preferinte pentru utilizatori."
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "A aparut o eroare la uploadul fisierului"
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr ""
-"Acest fisier controleaza schema de culori si fonturi diferite de cele "
-"implicite Horde."
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "A aparut o eroare la importarea datelor."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
-msgstr ""
-"Acest fisier defineste atributele globale Turba, nume si tipuri - nume, "
-"e-mail, adrese, etc."
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "A aparut o eroare la importarea datelor."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "Acest fisier defineste o lista cu sursele disponibile pentru Turba."
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "A aparut o eroare la importarea datelor."
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "A aparut o eroare la importarea datelor."
+
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "A aparut o eroare la importarea datelor."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "A aparut o eroare la importarea datelor."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "A aparut o eroare la uploadul fisierului"
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "A aparut o eroare la uploadul fisierului"
+
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "A aparut o eroare la importarea datelor."
+
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Nu exista agende in care sa se scrie."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
 msgstr ""
-"Acesta e principalul fisier de configurare Turba. Contine caile si optiunile "
-"pentru scripturile Turba."
 
-msgid "This number must be at least one."
-msgstr "Acest numar trebuie sa fie minim 1."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
 
-msgid "This person is already in your addressbook."
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
+
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "Aceasta persoana este deja in agenda ta. "
 
-msgid "This value must be a number."
-msgstr "Aceasta valoare trebuie sa fie numerica."
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titlu"
 
-msgid "Turba is not properly configured"
-msgstr "Turba nu este configurat corect"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Nu se pot incarca definitiile %s."
 
-msgid "User Options"
-msgstr "Optiuni utilizator"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "Salvare schimbari"
+
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Director"
 
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "Adauga contact nou"
+
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Afisare implicita:"
 
-msgid "Warning"
-msgstr "Avertisment"
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
 
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Adresa birou"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "Telefon birou"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Telefon birou"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Telefon birou"
+
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "Telefon birou"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Adresa birou"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
 msgstr ""
-"Nu ati mapat campurile din fisierul importat cu campurile corespunzatoare "
-"in Turba"
 
-msgid "Your Information"
-msgstr "Detalii personale"
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Optiunile tale au fost salvate."
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
 
-msgid "[Edit]"
-msgstr "[Editare]"
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
 
-msgid "add column"
-msgstr "adaugare coloana"
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
 
-msgid "move left"
-msgstr "mutare stanga"
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
 
-msgid "move right"
-msgstr "mutare dreapta"
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
 
-msgid "remove column"
-msgstr "stergere coloana"
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "Rasfoire"
+
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "Stergere"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "Importare/Exportare"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Lista"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Listare agenda"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Adauga contact nou"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "Cautare"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "Exportare agenda"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/po/pt_BR.po
+++ mod/po/pt_BR.po
@@ -1,15 +1,15 @@
 # translation of turba.po to Brazilian Portuguese
-# This file is distributed under the same license as the horde package.
-# Copyright (C) YEAR Horde Project.
-# Fabio Gomes <flgomes at fazenda.sp.gov.br>, 2005.
+# Copyright (C) YEAR Horde Project
+# This file is distributed under the same license as the Turba package.
 #
+# Fabio Gomes <flgoms at uol.com.br>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: turba\n"
+"Project-Id-Version: Turba\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-02-10 02:08+0100\n"
-"PO-Revision-Date: 2005-03-01 18:10-0300\n"
-"Last-Translator: Fabio Gomes <flgomes at fazenda.sp.gov.br>\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2006-02-16 17:49-0200\n"
+"Last-Translator: Fabio Gomes <flgoms at uol.com.br>\n"
 "Language-Team: Brazilian Portuguese <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -17,81 +17,127 @@
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr " Adicionar um Catálogo de endereços IMSP"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr "Excluir o Catálogo de Endereços IMSP"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "\"%s\" já existe e não foi importado."
+
+#: browse.php:140
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "'%s' não foi copiado porque é uma lista."
+
+#: browse.php:138
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "'%s' não foi movido porque é uma lista."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Nome Sobrenome\"  (ex. João Ninguém)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Sobrenome, Nome\" (ex. Ninguém, João)"
 
-#: add.php:96
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s adicionado."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "Arquivo %s importado com sucesso"
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "%s a %s de %s"
 
-#: browse.php:146
+#: lib/Turba.php:464
 #, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s' não foi copiado porque é uma lista."
+msgid "%s's Address Book"
+msgstr "Catálogo de Endereços de %s"
 
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s' não foi movido porque é uma lista."
-
-#: lib/Block/minisearch.php:45
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr "É obrigatório um navegador que suporte iFrames"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "Formulário de pesquisa acima"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Pesquisa A_vançada"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "Acesso negado a %s"
 
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "Adicionar"
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "Adicionar catálogo de endereços"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "Adicionar e Excluir catálogo de endereços IMSP"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Adicionar coluna"
 
-#: templates/browse/actions.inc:33
+#: edit.php:135
+msgid "Add file"
+msgstr "Adicionar arquivo"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Adicionar em"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "Adição de contatos não está disponível."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "Catálogo de Endereços"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
-msgstr "Listagem do Catálogo de Endereços"
+msgstr "Listagem de Catálogos de Endereços"
 
-#: add.php:95
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Catálogos de Endereços"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Registro do catálogo de endereços"
 
-#: lib/Driver.php:496
-msgid "Address book is read-only."
-msgstr "O catálogo de endereços é somente-leitura."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "O catálogo de endereços foi limpo com sucesso."
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "Catálogo de endereços para excluir"
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "Catálogo de endereços que não serão exibidos:"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
@@ -99,55 +145,37 @@
 msgid "Alias"
 msgstr "Apelido"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
-msgstr "Todas"
+msgstr "Todos"
 
-#: lib/api.php:372
+#: lib/api.php:554
 msgid "Already Exists"
-msgstr "Já existe"
+msgstr "Já Existe"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Você tem certeza que quer excluir %s?"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Você tem certeza que quer excluir os registros selecionados?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Colunas Disponíveis:"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "_Retornar para %s"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "Retornar para %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Pesquisa _Simples"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Pesquisa Simples"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "Formulário de pesquisa abaixo"
 
-#: lib/Driver/ldap.php:82 lib/Driver/ldap.php:85
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "A conexão falhou: (%s) %s"
@@ -156,51 +184,63 @@
 msgid "Birthday"
 msgstr "Aniversário"
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "_Exibir"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Categoria de Negócios"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "_Limpar Pesquisa"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "Impossível adicionar um grupo nele mesmo."
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
-msgstr "Marcar Todas/Nenhuma"
+msgstr "Marcar Todas/_Nenhuma"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Escolha um diretório padrão para o seu catálogo de endereços pessoal, lista "
-"de contatos e pesquisas."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "Escolha um nome"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Escolha um catálogo de endereços"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Escolha a ordem das colunas para exibir na listagem de endereços."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "Escolha um catálogo de endereços:"
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "Limpar Pesquisa"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr "Escolha quais catálogos de endereço exibir e em qual ordem:"
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "Escolha qual catálogo de endereços utilizar."
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "Escolha quais colunas exibir e em qual ordem:"
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Opções de Coluna"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Colunas que não serão exibidas:"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Valores separados por vírgula"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Valores separados por vírgulas (Microsoft Outlook)"
 
@@ -212,70 +252,77 @@
 msgid "Company Address"
 msgstr "Endereço da Empresa"
 
-#: lib/api.php:611 lib/api.php:800
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:837
+#: lib/api.php:1024 lib/api.php:1112
 #, php-format
 msgid "Connection failed: %s"
 msgstr "A conexão falhou: %s"
 
-#: lib/Driver/ldap.php:63
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Falha de conexão"
 
-#: browse.php:85
-msgid "Contact removed from list."
-msgstr "Contato removido da lista."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Pesquisar Contato"
 
-#: browse.php:279
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Contatos na lista: %s"
 
-#: browse.php:301
-#, php-format
-msgid "Contents of %s"
-msgstr "Conteúdo de %s"
-
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "Copiar"
 
-#: lib/ObjectView.php:134
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Criar"
+
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "Criar Catálogo de Endereços"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Criar uma nova Lista de Contatos em:"
+
+#: lib/ObjectView.php:133
 msgid "Created"
 msgstr "Criado"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Exibição Padrão"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr ""
-"Diretório padrão para o seu catálogo de endereços pessoal, lista de contatos "
-"e pesquisas."
-
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Direção de ordenação padrão:"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Excluir"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "Excluir o Catálogo de Endereços"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Confirmação de Exclusão"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Comportamento do botão de exclusão"
 
-#: lib/Driver/ldap.php:274
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "A exclusão falhou: (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "Exclusão de contatos não está disponível."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "A exclusão falhou"
 
@@ -283,109 +330,178 @@
 msgid "Department"
 msgstr "Departamento"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Descendente"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Descrição"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Diretório"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Exibir"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Opções de Exibição"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "Você deseja confirmar a exclusão de registros?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Baixar"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "Baixar vCard"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
-msgid "Edit '%s'"
+msgid "Edit \"%s\""
 msgstr "Editar '%s'"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "Exportar Catálogo de Endereços"
+
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Editar registro de %s"
 
 #: config/attributes.php.dist:58
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr "O registro de %s foi atualizado, mas falhou ao ser enviado: %s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Registro de %s foi atualizado."
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "Erro ao adicionar %d contato(s) à lista."
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr "Erro ao adicionar %d de %d contato(s) solicitado(s) à lista."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Erro ao excluir %d contato(s)."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "Erro ao excluir %d de %d contato(s) solicitado(s)."
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "Erro ao excluir %d contato(s) da lista."
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr "Erro ao excluir %d de %d contato(s) da lista."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "Falha ao pesquisar no catálogo de endereços: %s"
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportar"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Exportar Catálogo de Endereços"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Exportar somente os contatos selecionados."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Exportar os seguintes catálogos de endereços completamente."
 
-#: data.php:110 data.php:228 browse.php:62 browse.php:120 browse.php:135
-#: add.php:72 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Falha ao acessar o catálogo de endereços: %s"
 
-#: browse.php:154
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Falha ao adicionar %s em %s: %s"
 
-#: browse.php:284
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "Falha ao exibir a listagem"
 
-#: browse.php:315
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "Falha ao exibir o diretório"
 
-#: lib/Driver/ldap.php:312
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 "Falha ao alterar o nome: (%s) %s; Antigo DN = %s, Novo DN = %s, Raiz = %s"
 
-#: browse.php:140
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
-msgstr "Falhou ao encontrar o objeto a ser adicionado: %s"
+msgstr "Falhou em encontrar o objeto a ser adicionado: %s"
+
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "Falha ao pesquisar no catálogo de endereços"
 
-#: data.php:124 search.php:85
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
-msgstr "Falhou a busca no diretório: %s"
+msgstr "Falhou em pesquisar no diretório: %s"
 
 #: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72
+#: edit.php:131 display.php:100
+msgid "Files"
+msgstr "Arquivos"
+
+#: templates/browse/search.inc:71
 msgid "Find"
-msgstr "Pesquisar"
+msgstr "Encontrar"
+
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "Finalizar"
 
 #: config/attributes.php.dist:48
 msgid "First Name"
@@ -395,15 +511,15 @@
 msgid "Freebusy URL"
 msgstr "URL Livre/Ocupado"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "De"
 
-#: config/sources.php.dist:532
+#: config/sources.php.dist:606
 msgid "Global Address Book"
 msgstr "Catálogo de Endereços Global"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Grupo"
 
@@ -435,60 +551,60 @@
 msgid "Home Street Address"
 msgstr "Endereço Residencial"
 
-#: config/sources.php.dist:468
+#: config/sources.php.dist:508
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "Administração de Catálogo de Endereços IMSP"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Importar Catálogo de Endereços, Passo %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Importar/Exportar Catálogo de Endereços"
 
-#: lib/api.php:358 lib/api.php:577
-msgid "Invalid Content-Type"
-msgstr "Content-Type Inválido"
-
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "ID Inválido"
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:871
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1095
 msgid "Invalid address book"
 msgstr "Catálogo de endereços inválido"
 
-#: lib/api.php:875 lib/api.php:946 lib/api.php:999
+#: lib/api.php:1099 lib/api.php:1172 lib/api.php:1225
 msgid "Invalid email"
 msgstr "E-mail inválido"
 
-#: lib/api.php:883
+#: lib/api.php:1107
 msgid "Invalid entry"
 msgstr "Registro inválido"
 
-#: lib/Driver/ldap.php:270
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Chave especificada inválida."
 
-#: lib/api.php:879
+#: lib/api.php:1103
 msgid "Invalid name"
 msgstr "Nome inválido"
 
-#: lib/api.php:560
+#: lib/api.php:753
 msgid "Invalid objectId"
 msgstr "ObjectId inválido"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "É obrigatório suporte a LDAP mas o módulo LDAP não está disponível ou não "
 "foi carregado."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Última Modificação"
 
@@ -496,23 +612,27 @@
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Lista"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "Comparando"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "Número Máximo de Contatos"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Número máximo de páginas"
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Mini Busca"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Lista de Menu"
 
-#: lib/Driver/ldap.php:306
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "DN faltando na fonte de configuração de LDAP."
 
@@ -520,63 +640,65 @@
 msgid "Mobile Phone"
 msgstr "Telefone Celular"
 
-#: lib/Driver/ldap.php:335 lib/Driver/ldap.php:352
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
-msgstr "Modificação falhou: (%s) %s"
+msgstr "A alteração falhou: (%s) %s"
 
-#: lib/api.php:985
+#: lib/api.php:1211
 msgid "More than 1 entry found"
 msgstr "Mais de 1 registro encontrado"
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Mover"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Mover à esquerda"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Mover à direita"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Catálogo de Endereços Mulberry"
 
-#: lib/api.php:905
+#: lib/api.php:1131
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
 "Múltiplas pessoas com o endereço [%s], mas nenhuma com nome [%s] já existe"
 
-#: config/sources.php.dist:174 config/sources.php.dist:304
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+msgid "My Address Book"
 msgstr "Meu Catálogo de Endereços"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr "Meus Catálogos de Endereços"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nome"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Formato do Nome"
 
-#: config/sources.php.dist:78
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Diretório de Membros Netcenter"
 
-#: add.php:45 add.php:112 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Novo Contato"
 
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "Nova Lista"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Próxima"
 
@@ -584,24 +706,24 @@
 msgid "Nickname"
 msgstr "Apelido"
 
-#: lib/api.php:987 lib/api.php:1036
+#: lib/api.php:1213 lib/api.php:1262
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Nenhum registro %s foi encontrado para %s"
 
-#: lib/api.php:955
+#: lib/api.php:1181
 msgid "No address books found."
 msgstr "Nenhum catálogo de endereços encontrado."
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr "Nenhum contato encontrado"
 
-#: lib/api.php:338
+#: lib/api.php:513 lib/api.php:784
 msgid "No vCard data was found."
 msgstr "Nenhum dado vCard foi encontrado."
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "Nenhuma"
 
@@ -609,11 +731,11 @@
 msgid "Notes"
 msgstr "Anotações"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Número de ítens por página"
 
-#: lib/api.php:436
+#: lib/api.php:632 lib/api.php:765
 msgid "Object not found"
 msgstr "Objeto não encontrado"
 
@@ -621,7 +743,21 @@
 msgid "Office"
 msgstr "Escritório"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+"Uma vez que você salve esta página de opções, o catálogo de endereços será "
+"permanentemente excluído. Se isto não é o que você quer, então você deve "
+"alterar sua seleção para \"Nenhum\"."
+
+#: lib/api.php:792
+msgid "Only one vcard supported."
+msgstr "Somente um vcard é suportado."
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Outras Opções"
 
@@ -629,70 +765,86 @@
 msgid "PGP Public Key"
 msgstr "Chave Pública PGP"
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:728 lib/api.php:889
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:952
+#: lib/api.php:1116
 msgid "Permission Denied"
 msgstr "Permissão Negada"
 
-#: lib/Driver.php:454
+#: lib/Driver.php:550
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Permissões"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Catálogo de Endereços do Pine"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
-msgstr "Por favor forneça um nome para a nova lista:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "Por favor forneça um nome para a nova lista de contatos:"
+
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "Anterior"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Por favor selecione um diretório:"
-
-#: config/sources.php.dist:384
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Catálogo de Endereços Privado"
 
-#: lib/Driver/ldap.php:146
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "A consulta falhou: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
-msgstr "Busca Rápida"
+msgstr "Pesquisa Rápida"
 
-#: lib/Driver/ldap.php:190 lib/Driver/ldap.php:198 lib/Driver/ldap.php:432
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "A leitura falhou: (%s) %s"
 
-#: templates/browse/footer.inc:6
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "A leitura de contatos não está disponível."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "Deseja realmente excluir este contato?"
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Registros exibidos:"
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "Escolha um catálogo de endereços"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Remover coluna"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:3
 msgid "Remove from this list"
 msgstr "Remover desta lista"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Substituir o catálogo de endereços pelo importado? <b>Atenção: Isto excluirá "
-"todos os registros do seu catálogo de endereços atual.</b>"
+"Substituir o catálogo de endereços pelo importado? <strong>Atenção: Isto "
+"excluirá todos os registros do seu catálogo de endereços atual.</strong>"
 
-#: lib/Driver.php:344
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "O objeto solicitado não foi encontrado."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Retornar para os padrões"
 
@@ -700,167 +852,213 @@
 msgid "S/MIME Public Certificate"
 msgstr "Certificado Público S/MIME"
 
-#: lib/Driver/ldap.php:74
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr "O STARTTLS falhou: (%s) %s"
 
-#: edit.php:57 add.php:46
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Salvar"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "O salvamento de contatos não está disponível."
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Pesquisar"
 
-#: browse.php:264 minisearch.php:66
-msgid "Search Results"
-msgstr "Resultados da Pesquisa"
-
-#: lib/api.php:805
+#: lib/api.php:1029
 msgid "Search failed"
 msgstr "A pesquisa falhou"
 
-#: lib/api.php:895 lib/api.php:901 lib/api.php:910 lib/api.php:923
+#: lib/api.php:1121 lib/api.php:1127 lib/api.php:1136 lib/api.php:1149
 #, php-format
 msgid "Search failed: %s"
 msgstr "A pesquisa falhou: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Opções de Pesquisa"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "Pesquisa não está disponível."
 
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Pesquisando..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Selecione o Catálogo de Endereços"
-
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "Lista de Seleção"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "Selecione um catálogo de endereços para excluir"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "Selecione um catálogo de endereços para editar"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Selecione o catálogo de endereços para exportar:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Selecione o catálogo de endereços para importar:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Selecione o conjunto de caracteres do arquivo de origem:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Selecione o formato para exportar:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
-msgstr "Selecione arquivo para importar:"
+msgstr "Selecione o arquivo para importar:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Selecione o formato do arquivo de origem:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Selecione o formato utilizado para exibir os nomes:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Selecione a visualização para exibir por padrão."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
+"Selecione a visualização para exibir por padrão, opções de ordenação e "
+"opções de paginação."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Selecione quais campos exibir nas listas de endereços."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Selecione em qual formato exibir nomes."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Colunas Selecionadas:"
-
-#: add.php:59
+#: add.php:54
 #, php-format
-msgid "Selected address book '%s'."
+msgid "Selected address book \"%s\"."
 msgstr "Catálogo de endereços selecionado '%s'."
 
-#: config/sources.php.dist:239
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Diretório Compartilhado"
 
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "E_xibir Todas"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Exibir"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "Exibir %s"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Exibir Todas"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Exibir Contatos"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Exibir Listas"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "Exibir _Contatos"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "Exibir _Listas"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr "Direção de Ordenação"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "Fontes"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr ""
 "Especifique onde você quer que os resultados da pesquisa avançada apareçam."
 
-#: browse.php:156
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "%d contato(s) adicionados com sucesso à lista."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s adicionado com sucesso à %s"
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Lista de contatos \"%s\" criada com sucesso."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "%d contato(s) excluído(s) com sucesso."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "%d contato(s) excluídos com sucesso da lista."
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
-msgstr "Valores separados por Tabulações"
+msgstr "Valores separados por tabulações"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+"O conector VFS necessita ser configurado para habilitar o envio de anexos."
+
+#: lib/Driver.php:1076
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "O catálogo de endereços \"%s\" não existe."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "O catálogo de endereços \"%s\" foi criado com sucesso."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "O catálogo de endereços \"%s\" foi excluído com sucesso."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "O catálogo de endereços \"%s\" foi atualizado com sucesso."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "O catálogo de endereços não pôde ser limpo: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "O contato que você solicitou não existe."
 
-#: browse.php:58
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "O arquivo \"%s\" foi excluído com sucesso."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "A importação pode ser finalizada independente dos avisos."
+
+#: browse.php:31
 msgid "There are no browseable address books."
-msgstr "Não existem catálogos de endereços visualizáveis."
+msgstr "Não existem catálogos de endereços que possam ser exibidos."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -871,7 +1069,7 @@
 "registros. Se você acredita que isto é um erro, por favor entre em contato "
 "com o administrador do sistema."
 
-#: add.php:108
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -879,94 +1077,117 @@
 "Houve um erro ao adicionar o novo contato. Entre em contato com o "
 "administrador do sistema para maiores detalhes."
 
-#: browse.php:212
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "Houve um erro ao criar uma nova lista."
 
-#: browse.php:163
+#: addressbooks.php:38
+#, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Houve um erro ao criar este catálogo de endereços: %s"
+
+#: browse.php:166
 #, php-format
-msgid "There was an error deleting %s from the source address book."
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "Houve um erro ao excluir %s do catálogo de endereços de origem."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Houve um erro ao excluir este contato: %s"
 
-#: browse.php:93
-msgid "There was an error deleting this object."
-msgstr "Houve um erro ao excluir este objeto."
-
-#: browse.php:294
-msgid "There was an error displaying the select List"
-msgstr "Houve um erro ao exibir a lista selecionada"
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "Houve um erro ao exibir a lista"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Houve um erro ao importar os dados: %s"
 
-#: lib/api.php:334
+#: lib/api.php:509 lib/api.php:779
 msgid "There was an error importing the iCalendar data."
 msgstr "Houve um erro ao importar os dados do iCalendar."
 
-#: browse.php:83
-msgid "There was an error removing this object."
-msgstr "Houve um erro ao remover este objeto."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Houve um erro ao excluir este catálogo de endereços: %s"
 
-#: edit.php:84
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Houve um erro ao atualizar este registro: %s"
+
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Houve um erro ao atualizar este registro: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Não existiam endereços para exportar."
 
-#: lib/Driver.php:404 lib/Driver.php:445
-msgid "This address book is read-only"
-msgstr "Este catálogo de endereços é somente-leitura"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "Estes catálogos de endereços serão exibidos na seguinte ordem:"
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Estas colunas serão exibidas na seguinte ordem:"
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Este formato de arquivo não é suportado."
 
-#: lib/api.php:914 lib/api.php:927
+#: lib/api.php:1140 lib/api.php:1153
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Esta pessoa já tem um registro %s no catálogo de endereços"
 
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+"Este será o catálogo de endereços padrão para adicionar e importar contatos."
+
 #: config/attributes.php.dist:70
 msgid "Title"
-msgstr "Cargo"
+msgstr "Título"
+
+#: lib/Turba.php:449
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr "Impossível criar um novo compartilhamento. Tipo de origem faltando."
 
-#: lib/Driver.php:825
+#: lib/Driver.php:1000
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Impossível carregar a definição de %s."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Desfazer Alterações"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
-msgstr "Content-Type não suportado."
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Content-Type não suportado: %s"
 
-#: config/sources.php.dist:139
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Diretório Verisign"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
-msgid "View '%s'"
-msgstr "Visualizar '%s'"
+msgid "View \"%s\""
+msgstr "Visualizar \"%s\""
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
 msgstr "Visualizar Contato"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Visualização para exibir por padrão:"
 
@@ -1002,11 +1223,12 @@
 msgid "Work Street Address"
 msgstr "Endereço Comercial"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "Você está criando uma lista de distribuição."
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "Você não está autorizado a criar mais de %d contatos em \"%s\"."
 
-#: edit.php:44 display.php:48
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Você não tem permissão para visualizar este contato."
 
@@ -1014,47 +1236,72 @@
 msgid "You do not have permission to view this object."
 msgstr "Você não tem permissão para visualizar este objeto."
 
-#: templates/browse/javascript.inc:41
+#: lib/Turba.php:537
+msgid "You do not have permissions to delete this source."
+msgstr "Você não tem permissão para excluir esta fonte."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
-msgstr "Você deve selecionar um catálogo de endereços."
+msgstr "Você deve selecionar um catálogo de endereços destino."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
-msgstr "Você deve selecionar uma lista."
+msgstr "Você deve selecionar uma lista de destino."
 
-#: templates/browse/javascript.inc:58
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "Você deve selecionar pelo menos um contato primeiro."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Você deve selecionar pelo menos um registro."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr "Você somente tem permissão de visualizar este contato."
 
-#: templates/browse/contactrow.inc:12
+#: browse.php:318
+msgid "Your default address book is not browseable."
+msgstr "Seu catálogo de endereços padrão não é navegável."
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[sem valor]"
 
-#: lib/Turba.php:275
-msgid "_Add"
-msgstr "_Incluir"
-
-#: lib/Turba.php:274
+#: lib/Turba.php:560
 msgid "_Browse"
 msgstr "_Exibir"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "Exibir _Contatos"
+
+#: templates/browse/actions.inc:3
 msgid "_Delete"
-msgstr "E_xcluir"
+msgstr "Exc_luir"
 
-#: lib/Turba.php:280
+#: lib/Turba.php:569
 msgid "_Import/Export"
-msgstr "_Importar/Exportar"
+msgstr "Importar/E_xportar"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "Lista"
+
+#: lib/Turba.php:557
+msgid "_My Address Books"
+msgstr "Meus Catálogos de Endereços"
+
+#: lib/Turba.php:563
+msgid "_New Contact"
+msgstr "N_ovo Contato"
+
+#: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "_Remover desta lista"
 
-#: lib/Turba.php:276
+#: lib/Turba.php:565
 msgid "_Search"
 msgstr "_Pesquisar"
 
@@ -1062,19 +1309,35 @@
 msgid "contact.vcf"
 msgstr "contatos.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contatos.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contatos.tsv"
 
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
-msgstr "para o Catálogo de Endereços Selecionado"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "contatos.vcf"
+
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr "sem formatação"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "nenhuma"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "para uma Lista de Contatos"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "para um Catálogo de Endereços diferente"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/display.php
+++ mod/display.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: turba/display.php,v 1.64.2.4 2005/07/23 22:47:44 chuck Exp $
+ * $Horde: turba/display.php,v 1.64.2.8 2006/03/03 23:00:30 chuck Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -19,13 +19,13 @@
 $vars = &Variables::getDefaultVariables();
 
 $source = $vars->get('source');
-if (!isset($cfgSources[$source])) {
+if (!isset($GLOBALS['cfgSources'][$source])) {
     $notification->push(_("The contact you requested does not exist."));
     header('Location: ' . Horde::applicationUrl($prefs->getValue('initial_page'), true));
     exit;
 }
 
-$driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+$driver = &Turba_Driver::singleton($source);
 
 /* Get the form object. */
 $form = &Horde_Form::singleton('', $vars);
@@ -54,8 +54,7 @@
 }
 
 /* Check permissions on this contact. */
-$readonly = false;
-if (!Turba::hasPermission($object, 'object', PERMS_READ)) {
+if (!$object->hasPermission(PERMS_READ)) {
     $notification->push(_("You do not have permission to view this contact."), 'horde.error');
     header('Location: ' . Horde::applicationUrl($prefs->getValue('initial_page'), true));
     exit;
@@ -65,7 +64,7 @@
 $view = &new Turba_ObjectView($object);
 
 $values = array();
-/* Get the values through the AbstractObject class. */
+/* Get the values through the Turba_Object class. */
 foreach ($object->driver->getCriteria() as $info_key => $info_val) {
     $values[$info_key] = $object->getValue($info_key);
 }
@@ -74,30 +73,55 @@
 if ($object->getValue('__uid')) {
     $history = &Horde_History::singleton();
     $log = $history->getHistory('turba:' . ($object->getValue('__owner') ? $object->getValue('__owner') : Auth::getAuth()) . ':' . $object->getValue('__uid'));
-    foreach ($log->getData() as $entry) {
-        switch ($entry['action']) {
-        case 'add':
-            $view->set('created', true);
-            $values['__created'] = strftime($prefs->getValue('date_format'), $entry['ts']) . ' ' . date($prefs->getValue('twentyFour') ? 'G:i' : 'g:i a', $entry['ts']);
-            break;
-
-        case 'modify':
-            $view->set('modified', true);
-            $values['__modified'] = strftime($prefs->getValue('date_format'), $entry['ts']) . ' ' . date($prefs->getValue('twentyFour') ? 'G:i' : 'g:i a', $entry['ts']);
-            break;
+    if ($log && !is_a($log, 'PEAR_Error')) {
+        foreach ($log->getData() as $entry) {
+            switch ($entry['action']) {
+            case 'add':
+                $view->set('created', true);
+                $values['__created'] = strftime($prefs->getValue('date_format'), $entry['ts']) . ' ' . date($prefs->getValue('twentyFour') ? 'G:i' : 'g:i a', $entry['ts']);
+                break;
+
+            case 'modify':
+                $view->set('modified', true);
+                $values['__modified'] = strftime($prefs->getValue('date_format'), $entry['ts']) . ' ' . date($prefs->getValue('twentyFour') ? 'G:i' : 'g:i a', $entry['ts']);
+                break;
+            }
         }
     }
 }
 
 $view->setupForm($form);
 
-$vars = &new Variables(array('object' => $values));
+$vars = new Variables(array('object' => $values));
+
+if ($conf['documents']['type'] != 'none') {
+    $files = $object->listFiles();
+    if (is_a($files, 'PEAR_Error')) {
+        $notification->push($files, 'horde.error');
+    } else {
+        $form->addVariable(_("Files"), '__vfs', 'html', false);
+        $vars->set('__vfs', implode('<br />', array_map(array($object, 'vfsDisplayUrl'), $files)));
+    }
+}
+
 $title = $vars->get('object[name]');
 if (!empty($title) || $title == '0') {
     $form->setTitle($title);
 }
 
+if (!empty($conf['comments']['allow']) && $registry->hasMethod('forums/doComments')) {
+    $comments = $registry->call('forums/doComments', array('turba', $source . '.' . $key, 'commentCallback'));
+}
+
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
 $form->renderInactive($renderer, $vars);
+
+if (!empty($comments['threads'])) {
+    echo '<br />' . $comments['threads'];
+}
+if (!empty($comments['comments'])) {
+    echo '<br />' . $comments['comments'];
+}
+
 require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,3 +1,9 @@
+turba2 (2.1-1) unstable; urgency=low
+
+  * New upstream release, compatible with horde 3.1
+
+ -- Lionel Elie Mamane <lmamane at debian.org>  Thu,  6 Apr 2006 19:21:17 +0200
+
 turba2 (2.0.5-1) unstable; urgency=high
 
   * New upstream release that correct a number of cross site scripting


--- orig/locale/fi_FI/help.xml
+++ mod/locale/fi_FI/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: turba/locale/fi_FI/help.xml,v 1.4.10.1 2005/03/16 15:34:18 jan Exp $ -->
+<!-- $Horde: turba/locale/fi_FI/help.xml,v 1.4.10.3 2006/02/20 11:20:44 jan Exp $ -->
 <help>
   <entry id="Overview" md5="290506ade4e6f749246f77bbe5d48835" state="uptodate">
     <title>Yleiskuva</title>


--- orig/vcard.php
+++ mod/vcard.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: turba/vcard.php,v 1.12.10.2 2005/03/05 23:15:55 chuck Exp $
+ * $Horde: turba/vcard.php,v 1.12.10.4 2006/01/01 21:29:15 jan Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -24,7 +24,7 @@
     exit;
 }
 
-$driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+$driver = &Turba_Driver::singleton($source);
 
 /* Set the contact from the key requested. */
 $key = $vars->get('key');
@@ -36,7 +36,7 @@
 }
 
 /* Check permissions on this contact. */
-if (!Turba::hasPermission($object, 'object', PERMS_READ)) {
+if (!$object->hasPermission(PERMS_READ)) {
     $notification->push(_("You do not have permission to view this object."), 'horde.error');
     header('Location: ' . Horde::applicationUrl($prefs->getValue('initial_page'), true));
     exit;


--- orig/templates/browse/actions.inc
+++ mod/templates/browse/actions.inc
@@ -1,54 +1,51 @@
-<div class="control">
- <span style="float:left" class="nowrap">
- <?php echo Horde::widget('', $listType == 'list' ? _("Remove from this list") : _("Delete"), 'widget', '', "Submit('delete'); return false;", $listType == 'list' ? _("_Remove from this list") : _("_Delete")) ?>
-
+<div class="control nowrap">
+<?php if (!empty($hasDelete)) {
+          echo Horde::widget('#', $this->getType() == 'list' ? _("Remove from this list") : _("Delete"), 'widget', '', "Submit('delete'); return false;", $this->getType() == 'list' ? _("_Remove from this list") : _("_Delete")) . '|';
+      }
+      if (!empty($hasEdit)) {
+          echo Horde::widget('#', _("Edit"), 'widget', '', "document.contacts.action='" . Horde::applicationUrl('edit.php') . "'; Submit('groupedit'); return false;", _("Edit")) . '|';
+      }
+?>
  <?php if ($conf['menu']['import_export']): ?>
- | <?php echo Horde::widget('', _("Export"), 'widget', '', "document.contacts.action='" . Horde::applicationUrl('data.php') . "'; Submit('select'); return false;", _("Export")) ?>
+ <?php echo Horde::widget('#', _("Export"), 'widget', '', "document.contacts.action='" . Horde::applicationUrl('data.php') . "'; Submit('select'); return false;", _("Export")) ?>
  <?php endif; ?>
-
  <?php if (!empty($add_source_options)): $id = md5(mt_rand()); ?>
-  <form style="display:inline" name="f<?php echo $id ?>" action="javascript:void(0);" onsubmit="return false;">
-  <?php echo Horde::link('', _("Move"), 'widget', '', "CopyMove('move', document.f" . $id . '.s' . $id . "); return false;") . _("Move") . '</a> ';
-        echo Horde::link('', _("Copy"), 'widget', '', "CopyMove('copy', document.f" . $id . '.s' . $id . "); return false;") . _("Copy") . '</a>' ?>
+ <form style="display:inline" name="f<?php echo $id ?>" action="javascript:void(0);" onsubmit="return false;">
+ | <?php
+         if (!empty($hasDelete)) {
+             echo Horde::link('#', _("Move"), 'widget', '', "CopyMove('move', document.f" . $id . '.s' . $id . "); return false;") . _("Move") . '</a>, ';
+         }
+         echo Horde::link('#', _("Copy"), 'widget', '', "CopyMove('copy', document.f" . $id . '.s' . $id . "); return false;") . _("Copy") . '</a>';
+   ?>
   <select name="s<?php echo $id ?>" id="s<?php echo $id ?>">
-   <option value=""><?php echo _("to Selected Address Book") ?></option>
+   <option value=""><?php echo _("to a different Address Book") ?></option>
    <?php echo $add_source_options ?>
   </select>
  </form>
  <?php endif; ?>
 
- <?php if (!empty($cfgSources[$source]['map']['__type'])): $id = md5(mt_rand()); ?>
-  <form style="display:inline" name="f<?php echo $id ?>" action="javascript:void(0);" onsubmit="return false;">
-  | <?php echo Horde::link('', _("Add to"), 'widget', '', "Add(document.f" . $id . '.s' . $id . "); return false;") . _("Add to") . '</a>' ?>
-  <select name="s<?php echo $id ?>" id="s<?php echo $id ?>">
-   <option value=""><?php echo _("Select List") ?></option>
-   <option value="">-----</option>
-   <option value="*new*"><?php echo _("New List") ?></option>
-   <option value="">-----</option>
-   <?php foreach ($addToList as $list): ?>
-   <option value="<?php echo $list['key'] ?>"><?php echo $list['name'] ?></option>
-   <?php endforeach; ?>
-  </select>
-  </form>
+ <?php if ($addToList): $id = md5(mt_rand()); ?>
+ <form style="display:inline" name="f<?php echo $id ?>" action="javascript:void(0);" onsubmit="return false;">
+ | <?php echo Horde::link('#', _("Add to"), 'widget', '', "Add(document.f" . $id . '.s' . $id . "); return false;") . _("Add") . '</a>' ?>
+ <select name="s<?php echo $id ?>" id="s<?php echo $id ?>">
+  <option value=""><?php echo _("to a Contact List") ?></option>
+  <option value="">-----</option>
+  <?php foreach ($addToList as $list): ?>
+  <?php if (is_array($list)): ?>
+  <option value="<?php echo $list['source'] . ($list['key'] ? ':' . $list['key'] : (strpos($list['source'], ':') ? ':' : '')) ?>"><?php echo $list['name'] ?></option>
+  <?php else: ?>
+  <option value=""><?php echo $list ?></option>
+  <?php endif; endforeach; ?>
+ </select>
+ </form>
  <?php endif; ?>
 
- </span>
- <span style="float:right" class="nowrap">
 <?php
 $browse_link = Util::addParameter(Horde::applicationUrl('browse.php'), 'source', $source);
-if ($listType == 'directory' && !empty($cfgSources[$source]['map']['__type'])) {
-    echo Horde::widget(Util::addParameter($browse_link, 'show', 'lists'), _("Show Lists"), 'widget', '', '', _("Show _Lists")) . ' ';
-    echo ' | ' . Horde::widget(Util::addParameter($browse_link, 'show', 'contacts'), _("Show Contacts"), 'widget', '', '', _("Show _Contacts")) . ' ';
-    echo ' | ' . Horde::widget(Util::addParameter($browse_link, 'show', 'all'), _("Show All"), 'widget', '', '', _("Sho_w All"));
-} elseif ($listType == 'list' && !empty($cfgSources[$source]['map']['__type'])) {
-    echo Horde::widget(Util::addParameter($browse_link, 'show', 'all'), sprintf(_("Back to %s"), $cfgSources[$source]['title']), 'widget', '', '', sprintf(_("Ba_ck to %s"), $cfgSources[$source]['title']));
-} elseif ($listType == 'search') {
-    if ($conf['search']['cache']) {
-        $search_link = Util::addParameter(Horde::applicationUrl('search.php'), 'source', $source);
-        echo Horde::widget(Util::addParameter($search_link, 'clear', '1'), _("Clear Search"), 'widget', '', '', _("C_lear Search"));
-    }
+if ($this->getType() == 'directory' && !empty($cfgSources[$source]['map']['__type'])) {
+    printf(_("Show %s"), Horde::widget(Util::addParameter($browse_link, 'show', 'lists'), _("Show Lists"), 'widget', '', '', _("_Lists")) . ', ' .
+        Horde::widget(Util::addParameter($browse_link, 'show', 'contacts'), _("Show Contacts"), 'widget', '', '', _("_Contacts")) . ', ' .
+        Horde::widget(Util::addParameter($browse_link, 'show', 'all'), _("Show All"), 'widget', '', '', _("All")));
 }
 ?>
- </span>
- <br class="clear" />
 </div>


--- orig/lib/Driver/imsp.php
+++ mod/lib/Driver/imsp.php
@@ -5,7 +5,7 @@
 /**
  * Turba directory driver implementation for an IMSP server.
  *
- * $Horde: turba/lib/Driver/imsp.php,v 1.21.4.8 2005/06/22 18:03:40 mrubinsk Exp $
+ * $Horde: turba/lib/Driver/imsp.php,v 1.21.4.11 2005/11/10 12:44:30 mdjukic Exp $
  *
  * @author  Michael Rubinsky <mrubinsk at horde.org>
  * @package Turba
@@ -66,6 +66,8 @@
         $this->_groupField  = $params['group_id_field'];
         $this->_groupValue  = $params['group_id_value'];
         $this->_bookName    = $params['name'];
+        $this->_myRights    = $params['my_rights'];
+        $this->_perms       = $this->_aclToHordePerms($params['my_rights']);
     }
 
     /**
@@ -162,10 +164,13 @@
         $id = array_values($id);
         $idCount = count($id);
         $result = array();
+        $members = array();
+        $tmembers = array();
+
         for ($i = 0; $i < $idCount; $i++) {
             $temp = $this->_imsp->getEntry($this->_bookName, $id[$i]);
             if (is_a($temp, 'PEAR_Error')) {
-                $result = array();
+                return $temp;
             } else {
                 $temp['fullname'] = $temp['name'];
                 $isIMSPGroup = false;
@@ -177,7 +182,8 @@
                     ($temp[$this->_groupField] == $this->_groupValue)) {
                     $isIMSPGroup = true;
                 }
-
+                // Get the group members that might have been added from other
+                // IMSP applications.
                 if ($isIMSPGroup) {
                     if (isset($temp['email'])) {
                         $emailList = $this->_getGroupEmails($temp['email']);
@@ -190,10 +196,12 @@
                                 $members[] = $memberName[0];
                             }
                         }
-
-                        $temp['__members'] = serialize($members);
                     }
-
+                    if (isset($temp['__members'])) {
+                        $tmembers = unserialize($temp['__members']);
+                    }
+                    $temp['__members'] = serialize($this->_removeDuplicated(
+                                                   array($members, $tmembers)));
                     $temp['__type'] = 'Group';
                     $temp['email'] = null;
                     $result = $temp;
@@ -219,7 +227,7 @@
      */
     function _add($attributes)
     {
-        /* We need to map out Turba_Groups back to IMSP groups before
+        /* We need to map out Turba_Object_Groups back to IMSP groups before
          * writing out to the server. We need to array_values() it in
          * case an entry was deleted from the group. */
         if ($attributes['__type'] == 'Group') {
@@ -241,14 +249,15 @@
                 $result = $this->_read('name', $members, array('email'));
                 $count = count($result);
                 for ($i = 0; $i < $count; $i++) {
-                    $contact = sprintf("%s<%s>\n", $members[$i],
-                                       $result[$i]['email']);
-                    $attributes['email'] .= $contact;
+                    if (isset($result[$i]['email'])) {
+                        $contact = sprintf("%s<%s>\n", $members[$i],
+                                           $result[$i]['email']);
+                        $attributes['email'] .= $contact;
+                    }
                 }
             }
         }
 
-        unset($attributes['__members']);
         unset($attributes['__type']);
         unset($attributes['fullname']);
         if (!$this->params['contact_ownership']) {
@@ -404,7 +413,7 @@
             break;
         }
 
-        /* Are we searching for only Turba_Groups or Turba_Objects?
+        /* Are we searching for only Turba_Object_Groups or Turba_Objects?
          * This is needed so the 'Show Lists' and 'Show Contacts'
          * links work correctly in Turba. */
         if ($searchkey == '__type') {
@@ -444,7 +453,7 @@
 
         /* Finally get to the command.  Check the cache first, since each 'Turba'
            search may consist of a number of identical IMSP searchaddress calls in
-           order for the AND and OR parts to work correctly.  15 Second lifetime 
+           order for the AND and OR parts to work correctly.  15 Second lifetime
            should be reasonable for this. This should reduce load on IMSP server
            somewhat.*/
         $results = $cache->get($key, 15);
@@ -510,4 +519,42 @@
         }
         return array_unique($unames);
     }
+
+    /**
+     * Checks if the current user has the requested permission
+     * on this source.
+     *
+     * @param integer $perm  The permission to check for.
+     *
+     * @return boolean  true if user has permission, false otherwise.
+     */
+     function hasPermission($perm)
+     {
+         return $this->_perms & $perm;
+     }
+
+     /**
+      * Converts an acl string to a Horde Permissions bitmask.
+      *
+      * @param string $acl  A standard, IMAP style acl string.
+      *
+      * @return integer  Horde Permissions bitmask.
+      */
+     function _aclToHordePerms($acl)
+     {
+         $hPerms = 0;
+         if (strpos($acl, 'w') !== false) {
+             $hPerms |= PERMS_EDIT;
+         }
+         if (strpos($acl, 'r') !== false) {
+             $hPerms |= PERMS_READ;
+         }
+         if (strpos($acl, 'd') !== false) {
+             $hPerms |= PERMS_DELETE;
+         }
+         if (strpos($acl, 'l') !== false) {
+             $hPerms |= PERMS_SHOW;
+         }
+         return $hPerms;
+     }
 }


--- orig/add.php
+++ mod/add.php
@@ -2,19 +2,19 @@
 /**
  * The Turba script to add a new entry into an address book.
  *
- * $Horde: turba/add.php,v 1.54.4.8 2005/10/12 16:21:59 jan Exp $
+ * $Horde: turba/add.php,v 1.54.4.10 2006/01/01 21:29:15 jan Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
- * See the enclosed file LICENSE for license information (ASL).  If you
- * did not receive this file, see http://www.horde.org/licenses/asl.php.
+ * See the enclosed file LICENSE for license information (ASL).  If you did
+ * not receive this file, see http://www.horde.org/licenses/asl.php.
  */
 
 @define('TURBA_BASE', dirname(__FILE__));
 require_once TURBA_BASE . '/lib/base.php';
 require_once TURBA_BASE . '/lib/Renderer.php';
 require_once TURBA_BASE . '/lib/ObjectView.php';
-require_once TURBA_BASE . '/lib/AbstractObject.php';
+require_once TURBA_BASE . '/lib/Object.php';
 require_once 'Horde/Variables.php';
 require_once 'Horde/Form.php';
 require_once 'Horde/Form/Action.php';
@@ -41,13 +41,17 @@
 /* Check if a source selection box is required. */
 if (count($addSources) > 1) {
     /* Multiple sources, show a selection box. */
-    $v = &$form->addVariable(_("Choose an address book"), 'source', 'enum', true, false, null, array($addSources, true));
+    $options = array();
+    foreach ($addSources as $key => $config) {
+        $options[$key] = $config['title'];
+    }
+    $v = &$form->addVariable(_("Choose an address book"), 'source', 'enum', true, false, null, array($options, true));
     $action = &Horde_Form_Action::factory('submit');
     $v->setAction($action);
     $v->setOption('trackchange', true);
     if (is_null($vars->get('formname')) &&
-        $vars->get($v->getVarName()) != $vars->get('__old_'.$v->getVarName())) {
-        $notification->push(sprintf(_("Selected address book \"%s\"."), $addSources[$source]), 'horde.message');
+        $vars->get($v->getVarName()) != $vars->get('__old_' . $v->getVarName())) {
+        $notification->push(sprintf(_("Selected address book \"%s\"."), $addSources[$source]['title']), 'horde.message');
     }
     $form->setButtons(_("Add"));
 } else {
@@ -58,11 +62,25 @@
 
 /* A source has been selected, connect and set up the fields. */
 if ($source) {
-    $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+    $driver = &Turba_Driver::singleton($source);
     if (is_a($driver, 'PEAR_Error')) {
         $notification->push(sprintf(_("Failed to access the address book: %s"), $driver->getMessage()), 'horde.error');
     } else {
-        $object = &new Turba_AbstractObject($driver);
+        /* Check permissions. */
+        $max_contacts = Turba::hasPermission($source . ':max_contacts', 'source');
+        if ($max_contacts !== true &&
+            $max_contacts <= $driver->countContacts()) {
+            $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d contacts in \"%s\"."), $max_contacts, $cfgSources[$source]['title']), ENT_COMPAT, NLS::getCharset());
+            if (!empty($conf['hooks']['permsdenied'])) {
+                $message = Horde::callHook('_perms_hook_denied', array('turba:max_contacts'), 'horde', $message);
+            }
+            $notification->push($message, 'horde.error', array('content.raw'));
+            $url = (!empty($url) ? Horde::url($url, true) : Horde::applicationUrl('index.php', true));
+            header('Location: ' . $url);
+            exit;
+        }
+
+        $object = &new Turba_Object($driver);
         $view = &new Turba_ObjectView($object);
 
         /* Get the form and set up the variables. */
@@ -75,10 +93,14 @@
 if ($source && $form->validate($vars)) {
     /* Form valid, save data. */
     $form->getInfo($vars, $info);
-
     $source = $info['source'];
     $object = $info['object'];
 
+    /* Get share information. */
+    if ($driver->usingShares) {
+        $object['__owner'] = $driver->share->get('uid');
+    }
+
     /* Create Contact. */
     $key = $driver->add($object);
     if (!is_a($key, 'PEAR_Error')) {


--- orig/config/attributes.php.dist
+++ mod/config/attributes.php.dist
@@ -10,7 +10,7 @@
  * Contact sources are defined in 'sources.php'.
  * Default user preferences are defined in 'prefs.php'.
  *
- * $Horde: turba/config/attributes.php.dist,v 1.36.6.2 2005/07/15 08:29:45 jan Exp $
+ * $Horde: turba/config/attributes.php.dist,v 1.36.6.3 2005/10/18 12:50:04 jan Exp $
  * The syntax of this array is as follows:
  *      label    - the text that the user will see attached to this field
  *      type     - one of the following:


--- orig/scripts/sql/turba_objects.pgsql.sql
+++ mod/scripts/sql/turba_objects.pgsql.sql
@@ -1,4 +1,4 @@
--- $Horde: turba/scripts/sql/turba_objects.pgsql.sql,v 1.2.8.2 2005/08/25 07:46:59 jan Exp $
+-- $Horde: turba/scripts/sql/turba_objects.pgsql.sql,v 1.2.8.3 2005/10/18 12:50:17 jan Exp $
 -- You can simply execute this file in your database.
 -- 
 -- Run as:


--- orig/po/da_DK.po
+++ mod/po/da_DK.po
@@ -1,43 +1,55 @@
 # Turba Danish translation.
 # Copyright (C) Martin List-Petersen <martin at list-petersen.dk>, 2001.
-# Copyright (C) Brian Truelsen <horde+i18n at briantruelsen.dk>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba H3 (2.0.3)\n"
+"Project-Id-Version: Turba 2.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-10-08 15:14+0200\n"
-"PO-Revision-Date: 2005-10-09 21:47+0200\n"
-"Last-Translator: Brian Truelsen <horde+i18n at briantruelsen.dk>\n"
-"Language-Team: Danish <i18n at lists.horde.org>\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2002-01-06 13:04+0100\n"
+"Last-Translator: Martin List-Petersen <martin at list-petersen.dk>\n"
+"Language-Team: Danish <dk-horde at hulpsystems.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: browse.php:120
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
 #, php-format
 msgid "\"%s\" was not copied because it is a list."
-msgstr "\"%s\" blev ikke kopieret, fordi den er en liste."
+msgstr ""
 
-#: browse.php:118
+#: browse.php:124
 #, php-format
 msgid "\"%s\" was not moved because it is a list."
-msgstr "\"%s\" blev ikke flyttet, fordi den er en liste."
+msgstr ""
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
-msgstr "\"Fornavn Efternavn\"  (fx Jens Hansen)"
+msgstr ""
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
-msgstr "\"Efternavn, Fornavn\" (fx Hansen, Jens)"
+msgstr ""
 
-#: add.php:87
+#: add.php:109
 #, php-format
 msgid "%s added."
-msgstr "%s tilføjet"
+msgstr ""
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "Import af %s filen lykkedes"
@@ -45,50 +57,89 @@
 #: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
-msgstr "%s til %s af %s"
+msgstr ""
+
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Importer adressekartotek"
 
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
-msgstr "En browser som understøtter <em>iFrames</em> er nødvendig"
+msgstr ""
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
-msgstr "Ovenstående søgeformular"
+msgstr ""
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Udvidet søgning"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
 
-#: add.php:52
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Tilføj"
 
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Ugyldig adressekartotek"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Der findes ingen adressekartoteker, som der kan gemmes i."
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
-msgstr "Tilføj kolonne"
+msgstr ""
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "Kunne ikke tilføje"
 
 #: templates/browse/actions.inc:22
+#, fuzzy
 msgid "Add to"
-msgstr "Tilføj til"
+msgstr "Tilføj"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Importer adressekartotek"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: browse.php:28 config/prefs.php.dist:125
+#, fuzzy
 msgid "Address Book Listing"
-msgstr "Adressekartoteket-fortegnelse"
+msgstr "Adressekartoteket er skrivebeskyttet"
 
-#: add.php:86
-msgid "Address book entry"
-msgstr "Adressekartotekspost"
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Importer adressekartotek"
 
-#: lib/Driver.php:478
-msgid "Address book is read-only."
-msgstr "Adressekartoteket er skrivebeskyttet."
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "Adressekartoteket er skrivebeskyttet"
 
-#: data.php:236
+#: data.php:305
+#, fuzzy
 msgid "Address book successfully purged."
-msgstr "Adressekartotek tømt."
+msgstr "Import af %s filen lykkedes"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Adressekartoteket er skrivebeskyttet"
 
-#: search.php:97 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Udvidet søgning"
 
@@ -96,283 +147,330 @@
 msgid "Alias"
 msgstr "Kaldenavn"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
-msgstr "Alle"
+msgstr ""
 
-#: lib/api.php:395
+#: lib/api.php:552
 msgid "Already Exists"
-msgstr "Findes allerede"
+msgstr ""
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
-msgstr "Er du sikker på, at du vil slette %s?"
+msgstr ""
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
-msgstr "Er du sikker på, at du vil slette de valgte poster?"
+msgstr ""
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
-msgstr "Stigende"
-
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "TIlgængelige kolonner:"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Tilbage til %s"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "Tilbage til %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Simpel søgning"
+msgstr ""
 
-#: search.php:94 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
 msgid "Basic Search"
-msgstr "Simpel søgning"
+msgstr "Søg"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
-msgstr "Nedenstående søgeformular"
+msgstr ""
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
-msgstr "Tilkobling fejlede: (%s) %s"
+msgstr ""
 
 #: config/attributes.php.dist:178
 msgid "Birthday"
-msgstr "Fødselsdag"
+msgstr ""
+
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr ""
 
 #: config/attributes.php.dist:173
 msgid "Business Category"
-msgstr "Firmakategori"
+msgstr ""
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
-msgstr "CSV"
+msgstr ""
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "Nulstil søgning"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
-msgstr "Hak alle/ingen af"
+msgstr ""
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
 msgstr ""
-"Vælg en standard-katalog til dit personlig adressekartotek, kontaktliste og "
-"søgninger."
 
-#: add.php:44
+#: add.php:48
+#, fuzzy
 msgid "Choose an address book"
-msgstr "Vælg et adressekartotek"
+msgstr "Ugyldig adressekartotek"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Vælg rækkefølgen af kolonner i visning af adresseliste."
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Ugyldig adressekartotek"
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "Nulstil søgning"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
-msgstr "Kolonne-indstillinger"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
 
-#: templates/data/export.inc:16 templates/data/import.inc:18
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
-msgstr "Kommaseparerede værdier"
+msgstr ""
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
-msgstr "Kommaseparerede værdier (Microsoft Outlook)"
+msgstr ""
 
 #: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Firma"
 
 #: config/attributes.php.dist:144
+#, fuzzy
 msgid "Company Address"
-msgstr "Adresse (arbejde)"
+msgstr "Adresse (hjemme)"
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:384 lib/api.php:454
-#: lib/api.php:544 lib/api.php:590 lib/api.php:638 lib/api.php:825
-#: lib/api.php:918
-#, php-format
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
 msgid "Connection failed: %s"
-msgstr "Forbindelse fejlede: %s"
+msgstr "Sletning mislykkedes"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
+#, fuzzy
 msgid "Connection failure"
-msgstr "Forbindelsesfejl"
+msgstr "Sletning mislykkedes"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
 
 #: browse.php:60
 msgid "Contact removed from list."
-msgstr "Kontakt fjernet fra liste."
+msgstr ""
 
-#: browse.php:257
+#: browse.php:266
 #, php-format
 msgid "Contacts in list: %s"
-msgstr "Kontakter i liste: %s"
-
-#: browse.php:281
-#, php-format
-msgid "Contents of %s"
-msgstr "Indhold af %s"
+msgstr ""
 
 #: templates/browse/actions.inc:12
+#, fuzzy
 msgid "Copy"
-msgstr "Kopi"
+msgstr "Firma"
 
-#: lib/ObjectView.php:134
-msgid "Created"
-msgstr "Oprettet"
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Normal visning"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Eksporter adressekartotek"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
 msgstr ""
-"Standard-katalog for dit personlige adressekartotek, kontaktliste og "
-"søgninger."
 
-#: config/prefs.php.dist:72
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
-msgstr "Standard sorteringsretning:"
+msgstr ""
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Slet"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Eksporter adressekartotek"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
-msgstr "Godkend sletning"
+msgstr ""
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
-msgstr "Opførsel af slette-knap"
+msgstr ""
 
-#: lib/Driver/ldap.php:283
-#, php-format
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
 msgid "Delete failed: (%s) %s"
-msgstr "Sletning mislykkedes: (%s) %s"
+msgstr "Sletning mislykkedes"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Sletning mislykkedes"
 
 #: config/attributes.php.dist:213
 msgid "Department"
-msgstr "Afdeling"
+msgstr ""
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
-msgstr "Faldende"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
 
-#: templates/browse/search.inc:132
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Katalog"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr ""
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
-msgstr "Indstillinger for visning"
+msgstr ""
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
-msgstr "Vil du godkende sletning af poster?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
 
-#: templates/browse/contactrow.inc:25
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
-msgstr "Hent vCard"
+msgstr ""
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/browse/contactrow.inc:33
-#, php-format
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
 msgid "Edit \"%s\""
-msgstr "Redigér \"%s\""
+msgstr "Rediger"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Eksporter adressekartotek"
+
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
-msgstr "Redigér post for %s"
+msgstr ""
 
 #: config/attributes.php.dist:58
 msgid "Email"
 msgstr "eMail"
 
-#: edit.php:79
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
-msgstr "Registrering for %s opdateret."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "Import af %s filen lykkedes"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Der findes ingen adressekartoteker, som der kan gemmes i."
 
-#: templates/data/export.inc:46 templates/browse/actions.inc:6
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Eksporter"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
+#, fuzzy
 msgid "Export Address Book"
-msgstr "Eksportér adressekartotek"
+msgstr "Eksporter adressekartotek"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
-msgstr "Eksportér kun de valgte kontakter."
+msgstr ""
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
-msgstr "Eksportér hele følgende adressekartotek."
+msgstr ""
 
-#: add.php:63 browse.php:37 browse.php:94 browse.php:109 data.php:110
-#: data.php:228 search.php:52
-#, php-format
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
 msgid "Failed to access the address book: %s"
-msgstr "Kunne ikke tilgå kataloget: %s"
+msgstr "Kunne ikke søge i kataloget: %s"
 
-#: browse.php:128
-#, php-format
+#: browse.php:139
+#, fuzzy, php-format
 msgid "Failed to add %s to %s: %s"
-msgstr "Kunne ikke tilføje %s til %s: %s"
+msgstr "Kunne ikke søge i kataloget: %s"
 
-#: browse.php:263
+#: browse.php:272
 msgid "Failed to browse list"
-msgstr "Skimning af liste fejlede"
+msgstr ""
 
-#: browse.php:297
+#: browse.php:310
+#, fuzzy
 msgid "Failed to browse the directory"
-msgstr "Kunne ikke skimme fortegnelsen"
+msgstr "Kunne ikke søge i kataloget: %s"
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
-msgstr "Navnskift fejlede: (%s) %s; Gammel DN = %s, ny DN = %s, rod = %s\""
+msgstr ""
 
-#: browse.php:114
-#, php-format
+#: browse.php:120
+#, fuzzy, php-format
 msgid "Failed to find object to be added: %s"
-msgstr "Kunne ikke finde objektet, som skulle tilføjes: %s"
+msgstr "Kunne ikke søge i kataloget: %s"
 
-#: data.php:124 search.php:88
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Kunne ikke søge i kataloget: %s"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Kunne ikke søge i kataloget: %s"
@@ -381,29 +479,40 @@
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Titel"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Find"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Find"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
-msgstr "Fornavn"
+msgstr ""
 
 #: config/attributes.php.dist:202
 msgid "Freebusy URL"
-msgstr "Ledig/optaget URL"
+msgstr ""
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Fra"
 
-#: config/sources.php.dist:562
+#: config/sources.php.dist:604
+#, fuzzy
 msgid "Global Address Book"
-msgstr "Global adressekartotek"
+msgstr "Eksporter adressekartotek"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
-msgstr "Gruppe"
+msgstr ""
 
 #: config/attributes.php.dist:82
 msgid "Home Address"
@@ -411,565 +520,704 @@
 
 #: config/attributes.php.dist:93
 msgid "Home City"
-msgstr "Hjemmeby"
+msgstr ""
 
 #: config/attributes.php.dist:108
+#, fuzzy
 msgid "Home Country"
-msgstr "Land (hjemme)"
+msgstr "Telefon (hjemme)"
 
 #: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Telefon (hjemme)"
 
 #: config/attributes.php.dist:103
+#, fuzzy
 msgid "Home Postal Code"
-msgstr "Postnummer (hjemme)"
+msgstr "Telefon (hjemme)"
 
 #: config/attributes.php.dist:98
+#, fuzzy
 msgid "Home State/Province"
-msgstr "Region (hjemme)"
+msgstr "Telefon (hjemme)"
 
 #: config/attributes.php.dist:88
+#, fuzzy
 msgid "Home Street Address"
 msgstr "Adresse (hjemme)"
 
-#: config/sources.php.dist:487
+#: config/sources.php.dist:506
 msgid "IMSP"
-msgstr "IMSP"
+msgstr ""
 
-#: templates/data/import.inc:9
-#, php-format
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr ""
+
+#: templates/data/import.inc:7
+#, fuzzy, php-format
 msgid "Import Address Book, Step %d"
-msgstr "Importér adressekartotek, trin %d"
+msgstr "Importer adressekartotek"
 
-#: data.php:274
+#: data.php:361
+#, fuzzy
 msgid "Import/Export Address Books"
-msgstr "Import/eksport af adressekartoteker"
+msgstr "Import/Eksport af adressekartotek"
 
-#: lib/api.php:378 lib/api.php:604
-msgid "Invalid Content-Type"
-msgstr "Ugyldig Content-Type"
-
-#: lib/api.php:441 lib/api.php:531
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
 msgid "Invalid ID"
-msgstr "Ugyldig ID"
+msgstr "Ugyldigt navn."
 
-#: lib/api.php:191 lib/api.php:334 lib/api.php:437 lib/api.php:527
-#: lib/api.php:580 lib/api.php:895
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
 msgid "Invalid address book"
-msgstr "Ugyldigt adressekartotek"
+msgstr "Ugyldig adressekartotek"
 
-#: lib/api.php:899 lib/api.php:973 lib/api.php:1026
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
 msgid "Invalid email"
-msgstr "Ugyldig e-mail-adresse"
+msgstr "Ugyldig eMail-adresse."
 
-#: lib/api.php:907
+#: lib/api.php:1089
+#, fuzzy
 msgid "Invalid entry"
-msgstr "Ugyldig post"
+msgstr "Ugyldigt navn."
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
-msgstr "Ugyldig nøgle angivet."
+msgstr ""
 
-#: lib/api.php:903
+#: lib/api.php:1085
+#, fuzzy
 msgid "Invalid name"
-msgstr "Ugyldigt navn"
+msgstr "Ugyldigt navn."
 
-#: lib/api.php:584
+#: lib/api.php:735
+#, fuzzy
 msgid "Invalid objectId"
-msgstr "Ugyldigt objekt-id"
+msgstr "Ugyldigt navn."
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
-"LDAP understøttelse er nødvendig men LDAP-modulet er ikke tilgængelig eller "
-"ikke lastet."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
-msgstr "Sidst ændret"
+msgstr ""
 
 #: config/attributes.php.dist:53
+#, fuzzy
 msgid "Last Name"
-msgstr "Efternavn"
+msgstr "Navn"
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
-msgstr "Liste"
+msgstr ""
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Matcher"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
-msgstr "Maksimalt antal sider"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr ""
 
 #: lib/Block/minisearch.php:3
+#, fuzzy
 msgid "Mini Search"
-msgstr "Mini-søgning"
+msgstr "Søg"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
-msgstr "Mangler DN i LDAP-kilde-konfiguration."
+msgstr ""
 
 #: config/attributes.php.dist:162
+#, fuzzy
 msgid "Mobile Phone"
-msgstr "Mobil (hjemme)"
+msgstr "Telefon (hjemme)"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
-msgstr "Modifikation fejlede: (%s) %s"
+msgstr ""
 
-#: lib/api.php:1012
+#: lib/api.php:1193
 msgid "More than 1 entry found"
-msgstr "Fandt mere end 1 opslag"
+msgstr ""
 
 #: templates/browse/actions.inc:11
 msgid "Move"
-msgstr "Flyt"
+msgstr ""
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
-msgstr "Flyt til venstre"
+msgstr ""
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
-msgstr "Flyt til højre"
+msgstr ""
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
 msgid "Mulberry Address Book"
-msgstr "Adressekartoteket Mulberry"
+msgstr "Eksporter adressekartotek"
 
-#: lib/api.php:932
+#: lib/api.php:1113
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
-"Flere person med adresse [%s], men ingen med navn [%s], eksisterer allerede"
 
-#: config/sources.php.dist:87 config/sources.php.dist:221
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
 msgid "My Address Book"
-msgstr "Importér mit adressekartotek"
+msgstr "Importer adressekartotek"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Eksporter adressekartotek"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Navn"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
-msgstr "Navneformat"
+msgstr ""
 
-#: config/sources.php.dist:295
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
-msgstr "Netcenter Member Directory"
+msgstr ""
 
-#: add.php:36 add.php:103 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
 msgid "New Contact"
-msgstr "Ny kontakt"
+msgstr "Tilføj ny kontakt"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "Ny liste"
-
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
-msgstr "Næste"
+msgstr ""
 
 #: config/attributes.php.dist:218
+#, fuzzy
 msgid "Nickname"
-msgstr "Kaldenavn"
+msgstr "Navn"
 
-#: lib/api.php:1014 lib/api.php:1063
+#: lib/api.php:1195 lib/api.php:1244
 #, php-format
 msgid "No %s entry found for %s"
-msgstr "Ingen %s post fundet for %s"
+msgstr ""
 
-#: lib/api.php:982
+#: lib/api.php:1163
+#, fuzzy
 msgid "No address books found."
-msgstr "Intet adressekartoteket fundet."
+msgstr "Adressekartoteket er skrivebeskyttet"
 
-#: minisearch.php:87
+#: minisearch.php:83
 msgid "No contacts found"
-msgstr "Ingen kontakter fundet"
+msgstr ""
 
-#: lib/api.php:356
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
-msgstr "Ingen vCard-data fundet."
+msgstr ""
 
 #: templates/browse/footer.inc:7
+#, fuzzy
 msgid "None"
-msgstr "Ingen"
+msgstr "Noter"
 
 #: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Noter"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
-msgstr "Antal opslag per side"
+msgstr ""
 
-#: lib/api.php:460
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
-msgstr "Objekt ikke fundet"
+msgstr ""
 
 #: config/attributes.php.dist:223
 msgid "Office"
-msgstr "Kontor"
+msgstr ""
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: config/attributes.php.dist:190
 msgid "PGP Public Key"
-msgstr "Offentlig PGP-nøgle"
+msgstr ""
 
-#: lib/api.php:340 lib/api.php:447 lib/api.php:537 lib/api.php:596
-#: lib/api.php:753 lib/api.php:913
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
-msgstr "Tilladelse nægtet"
+msgstr ""
 
-#: lib/Driver.php:436
+#: lib/Driver.php:543
 msgid "Permission denied"
-msgstr "Tilladelse nægtet"
+msgstr ""
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
 msgid "Pine Address Book"
-msgstr "Importér adressekartotek fra Pine"
+msgstr "Importer adressekartotek"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
-msgstr "Indtast den nye listes navn:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Vælg en fortegnelse."
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-#: config/sources.php.dist:399
+#: config/sources.php.dist:416
+#, fuzzy
 msgid "Private Address Book"
-msgstr "Privat adressekartotek"
+msgstr "Eksporter adressekartotek"
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
-msgstr "Forespørgsel fejlede: (%s) %s"
+msgstr ""
 
 #: templates/block/minisearch.inc:18
+#, fuzzy
 msgid "Quick Search"
-msgstr "Hurtig søgning"
+msgstr "Søg"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
-msgstr "Læsefejl: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
 
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
-msgstr "Poster vist:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Importer adressekartotek"
 
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
-msgstr "Fjern kolonne"
+msgstr ""
 
-#: templates/browse/actions.inc:3
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
-msgstr "Fejl fra denne liste"
+msgstr ""
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Erstat det eksisterende adressekartotek med den importerede? <b>Advarsel: "
-"Dette fjerner alle poster i dit nuværende adressekartotek.</b>"
 
-#: lib/Driver.php:330
+#: lib/Driver.php:438
 msgid "Requested object not found."
-msgstr "Forespurgte objekt ikke fundet."
+msgstr ""
 
-#: add.php:37 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
-msgstr "Tilbage til standardindstillinger"
+msgstr ""
 
 #: config/attributes.php.dist:196
 msgid "S/MIME Public Certificate"
-msgstr "Offentlig S/MIME certifikat"
+msgstr ""
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
-msgstr "STARTTLS fejlede: (%s) %s"
+msgstr ""
 
-#: add.php:37 edit.php:57
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Gem"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Søg"
 
-#: browse.php:241 minisearch.php:66
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Søgeresultater"
 
-#: lib/api.php:829
+#: lib/api.php:1011
+#, fuzzy
 msgid "Search failed"
-msgstr "Søgning fejlede"
+msgstr "Søg"
 
-#: lib/api.php:922 lib/api.php:928 lib/api.php:937 lib/api.php:950
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
-msgstr "Søgning fejlede: %s"
-
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Søgeindstillinger"
+msgstr ""
 
-#: templates/block/minisearch.inc:24
+#: templates/block/minisearch.inc:22
+#, fuzzy
 msgid "Searching..."
-msgstr "Søger..."
-
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Vælg adressekartotek"
+msgstr "Søg"
 
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "Vælg liste"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Vælg venligst den adressekartotek, som du vil tilføje kontakten til."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Vælg venligst den adressekartotek, som du vil tilføje kontakten til."
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
+#, fuzzy
 msgid "Select the address book to export from:"
-msgstr "Vælg adressekartoteker, der skal eksporteres fra:"
+msgstr "Vælg kilde som der skal eksporteres fra:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
+#, fuzzy
 msgid "Select the address book to import to:"
-msgstr "Vælg adressekartoteket, der skal importeres til:"
+msgstr "Vælg stedet, du vil importere til:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Vælg kilde som der skal eksporteres fra:"
+
+#: templates/data/export.inc:10
+#, fuzzy
 msgid "Select the export format:"
-msgstr "Vælg formatet, der skal eksporteres i:"
+msgstr "Vælg kilde som der skal eksporteres fra:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Vælg filen som skal importeres:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
+#, fuzzy
 msgid "Select the format of the source file:"
-msgstr "Vælg formatet af oprindelsesfilen:"
+msgstr "Vælg eksportformat:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
+#, fuzzy
 msgid "Select the format used to display names:"
-msgstr "Vælg formatet, som navne skal vises i:"
+msgstr "Vælg importformat:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Vælg standard visning."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
-msgstr "Vælg hvilke felter, der skal vises i adresselisterne."
+msgstr ""
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
+#, fuzzy
 msgid "Select which format to display names."
-msgstr "Vælg formatet, som navne skal vises i."
+msgstr "Vælg importformat:"
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Valgte kolonner:"
-
-#: add.php:50
-#, php-format
+#: add.php:54
+#, fuzzy, php-format
 msgid "Selected address book \"%s\"."
-msgstr "Valgt adressekartotek \"%s\"."
+msgstr "Ugyldig adressekartotek"
 
-#: config/sources.php.dist:154
+#: config/sources.php.dist:173
+#, fuzzy
 msgid "Shared Directory"
-msgstr "Delt fortegnelse"
-
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "Vis alle"
+msgstr "Katalog"
 
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Vis"
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:41
 msgid "Show All"
-msgstr "Vis alle"
+msgstr ""
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
-msgstr "Vis kontakter"
+msgstr ""
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
-msgstr "Vis lister"
-
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "Vis kontakter"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "Vis lister"
+msgstr ""
 
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
 msgid "Sort Direction"
-msgstr "Sorteringsretning"
+msgstr "Katalog"
 
-#: lib/api.php:154
+#: lib/api.php:198
+#, fuzzy
 msgid "Sources"
-msgstr "Kilder"
+msgstr "Udført"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
-msgstr "Angiv hvor du ønsker at avancerede søgeresultater skal dukke op."
+msgstr ""
 
-#: browse.php:130
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
-msgstr "Har tilføjet %s til %s"
+msgstr ""
 
-#: data.php:29
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
+
+#: data.php:50
 msgid "TSV"
-msgstr "TSV"
+msgstr ""
 
-#: templates/data/export.inc:18 templates/data/import.inc:19
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
-msgstr "Tabulator-separerede værdier"
+msgstr ""
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
+
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
-msgstr "Adressekartoteket kunne ikke tømmes: %s"
+msgstr ""
 
-#: display.php:23 edit.php:24 vcard.php:22
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
-msgstr "Den forespurgte kontakt findes ikke."
+msgstr ""
 
-#: browse.php:33
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Import af %s filen lykkedes"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
+#, fuzzy
 msgid "There are no browseable address books."
-msgstr "Der findes ingen adressekartoteker, der kan skimmes."
+msgstr "Der findes ingen adressekartoteker, som der kan gemmes i."
 
 #: add.php:29
+#, fuzzy
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
 "is an error, please contact your system administrator."
 msgstr ""
-"Der er ingen skrivbare adressekartoteker. Ingen af de tilgængelige "
-"adressekartoteker er konfigureret til at tillade dig at tilføje nye poster. "
-"Hvis du mener dette er en fejl, så kontakt venligst din systemadministrator."
+"Ingen af de tilgængelige adressekartoteker tillader dig at tilføje nye "
+"emner. Hvis du mener dette er en fejl, så kontakt venligst din "
+"systemadministrator."
 
-#: add.php:99
+#: add.php:121
+#, fuzzy
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
-"Der opstod en fejl ved tilføjelse af den nye kontakt. Kontakt din "
+"Der opstod en fejl ved tilføjelse af objektet. Kontakt din "
 "systemadministrator for yderligere hjælp."
 
-#: browse.php:185
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Der opstod en fejl under importeringen af data."
+
+#: browse.php:238
+#, fuzzy
 msgid "There was an error creating a new list."
-msgstr "Der opstod en fejl under oprettelsen af en ny liste."
+msgstr "Der opstod en fejl under importeringen af data."
 
-#: browse.php:136
-#, php-format
-msgid "There was an error deleting %s from the source address book."
-msgstr ""
-"Der opstod en fejl ved fjernelse af %s fra det oprindelige adressekartotek."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Der opstod en fejl ved importering af den overførte fil"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Der opstod en fejl ved importering af den overførte fil"
 
-#: delete.php:31
-#, php-format
+#: delete.php:37
+#, fuzzy, php-format
 msgid "There was an error deleting this contact: %s"
-msgstr "Der opstod en fejl ved fjernelse af denne kontakt: %s"
+msgstr "Der opstod en fejl under importeringen af data."
 
-#: browse.php:68
+#: browse.php:72
+#, fuzzy
 msgid "There was an error deleting this object."
-msgstr "Der opstod en fejl ved sletning af dette objekt."
+msgstr "Der opstod en fejl under importeringen af data."
 
-#: browse.php:273
-msgid "There was an error displaying the select List"
-msgstr "Der opstod en fejl under visning af den valgte liste"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "Der opstod en fejl under importeringen af data."
 
-#: data.php:249
-#, php-format
+#: data.php:335
+#, fuzzy, php-format
 msgid "There was an error importing the data: %s"
-msgstr "Der opstod en fejl under importeringen af data: %s"
+msgstr "Der opstod en fejl under importeringen af data."
 
-#: lib/api.php:352
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
 msgid "There was an error importing the iCalendar data."
-msgstr "Der opstod en fejl under importeringen af iCalendar data."
+msgstr "Der opstod en fejl under importeringen af data."
 
 #: browse.php:58
-msgid "There was an error removing this object."
-msgstr "Der opstod en fejl under fjernelse af dette objekt."
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Der opstod en fejl under importeringen af data."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Der opstod en fejl ved importering af den overførte fil"
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Der opstod en fejl ved importering af den overførte fil"
 
-#: edit.php:84
-#, php-format
+#: edit.php:158
+#, fuzzy, php-format
 msgid "There was an error updating this entry: %s"
-msgstr "Der opstod en fejl under opdatering af denne post: %s"
+msgstr "Der opstod en fejl under importeringen af data."
 
-#: data.php:151
+#: data.php:179
+#, fuzzy
 msgid "There were no addresses to export."
-msgstr "Der findes ingen adresser at eksportere."
+msgstr "Der findes ingen adressekartoteker, som der kan gemmes i."
 
-#: lib/Driver.php:390 lib/Driver.php:427
-msgid "This address book is read-only"
-msgstr "Adressekartoteket er skrivebeskyttet"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
 msgid "This file format is not supported."
-msgstr "Dette filformat er ikke understøttet."
+msgstr ""
 
-#: lib/api.php:941 lib/api.php:954
-#, php-format
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
 msgid "This person already has a %s entry in the address book"
-msgstr "Denne person har allerede en %s post i adressekartoteket"
+msgstr "Denne er person findes allerede i din adressekartotek"
+
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titel"
 
-#: lib/Driver.php:834
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Kan ikke indlæse definitionen af %s."
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
 msgid "Undo Changes"
-msgstr "Genskab ændringer"
+msgstr "Gem ændringer"
 
-#: lib/api.php:489
-msgid "Unsupported Content-Type."
-msgstr "Denne Content-Type er ikke understøttet."
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
 
-#: config/sources.php.dist:358
+#: config/sources.php.dist:376
+#, fuzzy
 msgid "Verisign Directory"
-msgstr "Verisign-fortegnelse"
+msgstr "Katalog"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
 msgid "View \"%s\""
-msgstr "Se \"%s\""
+msgstr ""
 
-#: minisearch.php:82
+#: minisearch.php:78
+#, fuzzy
 msgid "View Contact"
-msgstr "Se kontakt"
+msgstr "Tilføj ny kontakt"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
-msgstr "Vælg hvad du først vi se:"
+msgstr ""
 
 #: config/attributes.php.dist:208
 msgid "Website URL"
-msgstr "Website URL"
+msgstr ""
 
 #: config/attributes.php.dist:113
 msgid "Work Address"
@@ -977,106 +1225,145 @@
 
 #: config/attributes.php.dist:124
 msgid "Work City"
-msgstr "By (arbejde)"
+msgstr ""
 
 #: config/attributes.php.dist:139
+#, fuzzy
 msgid "Work Country"
-msgstr "Land (arbejde)"
+msgstr "Telefon (arbejde)"
 
 #: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Telefon (arbejde)"
 
 #: config/attributes.php.dist:134
+#, fuzzy
 msgid "Work Postal Code"
-msgstr "Postnummer (arbejde)"
+msgstr "Telefon (arbejde)"
 
 #: config/attributes.php.dist:129
+#, fuzzy
 msgid "Work State/Province"
-msgstr "Region (arbejde)"
+msgstr "Telefon (arbejde)"
 
 #: config/attributes.php.dist:119
+#, fuzzy
 msgid "Work Street Address"
 msgstr "Adresse (arbejde)"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "Du er ved at oprette en distributionsliste."
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-#: display.php:59 edit.php:44
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
-msgstr "Du har ikke tilladelse til at se denne kontaktliste."
+msgstr ""
 
 #: vcard.php:40
 msgid "You do not have permission to view this object."
-msgstr "Du har ikke tilladelse til at se dette objekt."
+msgstr ""
 
-#: templates/browse/javascript.inc:51
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
-msgstr "Du skal vælge destinations-adressekartoteket."
+msgstr ""
 
 #: templates/browse/javascript.inc:23
 msgid "You must select a target list."
-msgstr "Du skal vælge destinationslisten."
+msgstr ""
+
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
-msgstr "Først skal du vælge mindst én post."
+msgstr ""
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
-msgstr "Du har kun tilladelse til at se denne kontakt."
+msgstr ""
 
-#: browse.php:284
-msgid "Your default addressbook is not browseable."
-msgstr "Dit standard-adressekartotek er ikke skimbar."
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
-msgstr "[ingen værdi]"
-
-#: lib/Turba.php:286
-msgid "_Add"
-msgstr "Tilføj"
+msgstr ""
 
-#: lib/Turba.php:283
+#: lib/Turba.php:484
 msgid "_Browse"
-msgstr "Skim"
+msgstr ""
+
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
 
-#: templates/browse/actions.inc:3
+#: templates/browse/actions.inc:2
+#, fuzzy
 msgid "_Delete"
 msgstr "Slet"
 
-#: lib/Turba.php:292
+#: lib/Turba.php:493
+#, fuzzy
 msgid "_Import/Export"
 msgstr "Import/Eksport"
 
-#: templates/browse/actions.inc:3
+#: templates/browse/actions.inc:39
+msgid "_Lists"
+msgstr ""
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Importer adressekartotek"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Tilføj ny kontakt"
+
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
-msgstr "Fjern fra denne liste"
+msgstr ""
 
-#: lib/Turba.php:288
+#: lib/Turba.php:489
+#, fuzzy
 msgid "_Search"
 msgstr "Søg"
 
 #: vcard.php:46
 msgid "contact.vcf"
-msgstr "contact.vcf"
+msgstr ""
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
-msgstr "contacts.csv"
+msgstr ""
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
-msgstr "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
 
 #: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
-msgstr "til valgte adressekartotek"
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "Eksporter adressekartotek"
 
-#: data.php:30 templates/data/export.inc:20 templates/data/import.inc:20
-#: templates/browse/column_headers.inc:7
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
-msgstr "vCard"
+msgstr ""


--- orig/delete.php
+++ mod/delete.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: turba/delete.php,v 1.29.4.2 2005/03/05 23:15:55 chuck Exp $
+ * $Horde: turba/delete.php,v 1.29.4.4 2006/01/01 21:29:15 jan Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -12,18 +12,24 @@
 require_once TURBA_BASE . '/lib/base.php';
 
 $source = Util::getFormData('source');
-$driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
-
 $key = Util::getFormData('key');
-if (!is_a($result = $driver->delete($key), 'PEAR_Error')) {
-    if (!empty($_SESSION['turba_search_results'])) {
-        require_once TURBA_BASE . '/lib/List.php';
-        require_once TURBA_BASE . '/lib/Object.php';
-        $list = Turba_List::unserialize($_SESSION['turba_search_results']);
-        $list->remove($key);
-        $_SESSION['turba_search_results'] = $list->serialize();
+$driver = &Turba_Driver::singleton($source);
+
+if ($conf['documents']['type'] != 'none') {
+    $object = $driver->getObject($key);
+    if (is_a($object, 'PEAR_Error')) {
+        $notification->push($object->getMessage(), 'horde.error');
+        header('Location: ' . Horde::applicationUrl($prefs->getValue('initial_page'), true));
+        exit;
     }
+    if (is_a($deleted = $object->deleteFiles(), 'PEAR_Error')) {
+        $notification->push($deleted, 'horde.error');
+        header('Location: ' . Horde::applicationUrl($prefs->getValue('initial_page'), true));
+        exit;
+    }
+}
 
+if (!is_a($result = $driver->delete($key), 'PEAR_Error')) {
     header('Location: ' . Util::getFormData('url', Horde::url($prefs->getValue('initial_page'), true)));
     exit;
 }


--- orig/config/sources.php.dist
+++ mod/config/sources.php.dist
@@ -1,84 +1,104 @@
 <?php
 /**
- * $Horde: turba/config/sources.php.dist,v 1.97.6.12 2005/10/17 20:51:49 jan Exp $
+ * $Horde: turba/config/sources.php.dist,v 1.97.6.16 2005/11/07 10:03:26 jan Exp $
  *
  * This file is where you specify the sources of contacts available to users
- * at your installation.  It contains a large number of EXAMPLES.  Please
- * remove or comment out those examples that YOU DON'T NEED.  There are a
+ * at your installation. It contains a large number of EXAMPLES. Please
+ * remove or comment out those examples that YOU DON'T NEED. There are a
  * number of properties that you can set for each server, including:
  *
- * title:    This is the common (user-visible) name that you want displayed in
- *           the contact source drop-down box.
+ * title:       This is the common (user-visible) name that you want displayed
+ *              in the contact source drop-down box.
  *
- * type:     The types 'ldap', 'sql', 'imsp' and 'prefs' are currently
- *           supported.  Preferences-based address books are not intended for
- *           production installs unless you really know what you're doing -
- *           they are not searchable, and they won't scale well if a user has
- *           a large number of entries.
+ * type:        The types 'ldap', 'sql', 'imsp' and 'prefs' are currently
+ *              supported. Preferences-based address books are not intended
+ *              for production installs unless you really know what you're
+ *              doing - they are not searchable, and they won't scale well if
+ *              a user has a large number of entries.
  *
- * params:   These are the connection parameters specific to the contact
- *           source.  See below for examples of how to set these.
+ * params:      These are the connection parameters specific to the contact
+ *              source. See below for examples of how to set these.
  *
  * Special params settings:
  *
- *   charset:  The character set that the backend stores data in.  Many LDAP
- *             servers use utf-8.  Database servers typically use iso-8859-1.
- *
- *   tls:      Only applies to LDAP servers.  If true, then try to use a TLS
- *             connection to the server.
- *
- *   scope:    Only applies to LDAP servers.  Can be set to 'one' to search
- *             one level of the LDAP directory, or 'sub' to search all levels.
- *             'one' will work for most setups and should be much faster.
- *             However we default to 'sub' for backwards compatibility.
- *
- * map:      This is a list of mappings from the standard Turba attribute
- *           names (on the left) to the attribute names by which they are
- *           known in this contact source (on the right).  Turba also supports
- *           composite fields.  A composite field is defined by mapping the
- *           field name to an array containing a list of component fields and
- *           a format string (similar to a printf() format string).  Here is
- *           an example:
- *           ...
- *           'name' => array('fields' => array('firstname', 'lastname'),
- *                           'format' => '%s %s'),
- *           'firstname' => 'object_firstname',
- *           'lastname' => 'object_lastname',
- *           ...
- *
- * tabs:     All fields can be grouped into tabs with this optional entry.
- *           This list is multidimensional hash, the keys are the tab titles.
- *           Here is an example:
- *           'tabs' => array(
- *               'Names' => array('firstname', 'lastname', 'alias'),
- *               'Addresses' => array('homeAddress', 'workAddress')
- *           );
- *
- * search:   A list of Turba attribute names that can be searched for this
- *           source.
- *
- * strict:   A list of native field/attribute names that must always be
- *           matched exactly in a search.
- *
- * public:   If set to true, this source will be available to all users.  See
- *           also 'readonly' -- public=true readonly=false means writable by
- *           all users!
- *
- * readonly: If set to true, this source can only be modified by users on the
- *           'admin' list.
- *
- * admin:    A list (array) of users that are allowed to modify this source,
- *           if it's marked 'readonly'.
- *
- * export:   If set to true, this source will appear on the Export menu,
- *           allowing users to export the contacts to a CSV (etc.) file.
+ *   charset:       The character set that the backend stores data in. Many
+ *                  LDAP servers use utf-8. Database servers typically use
+ *                  iso-8859-1.
+ *
+ *   tls:           Only applies to LDAP servers. If true, then try to use a
+ *                  TLS connection to the server.
+ *
+ *   scope:         Only applies to LDAP servers. Can be set to 'one' to
+ *                  search one level of the LDAP directory, or 'sub' to search
+ *                  all levels. 'one' will work for most setups and should be
+ *                  much faster. However we default to 'sub' for backwards
+ *                  compatibility.
+ *
+ *   checkrequired: Only applies to LDAP servers. If present, this value causes
+ *                  the driver to consult the LDAP schema for any attributes
+ *                  that are required by the given objectclass(es). Required
+ *                  attributes will be provided automatically if the
+ *                  'checkrequired_string' parameter is present.
+ *
+ *   checksyntax:   Only applies to LDAP servers. If present, this value causes
+ *                  the driver to inspect the LDAP schema for particular
+ *                  attributes by the type defined in the corresponding schema
+ *
+ * map:         This is a list of mappings from the standard Turba attribute
+ *              names (on the left) to the attribute names by which they are
+ *              known in this contact source (on the right). Turba also
+ *              supports composite fields. A composite field is defined by
+ *              mapping the field name to an array containing a list of
+ *              component fields and a format string (similar to a printf()
+ *              format string). Here is an example:
+ *              ...
+ *              'name' => array('fields' => array('firstname', 'lastname'),
+ *                              'format' => '%s %s'),
+ *              'firstname' => 'object_firstname',
+ *              'lastname' => 'object_lastname',
+ *              ...
+ *
+ * tabs:        All fields can be grouped into tabs with this optional entry.
+ *              This list is multidimensional hash, the keys are the tab
+ *              titles.
+ *              Here is an example:
+ *              'tabs' => array(
+ *                  'Names' => array('firstname', 'lastname', 'alias'),
+ *                  'Addresses' => array('homeAddress', 'workAddress')
+ *              );
+ *
+ * search:      A list of Turba attribute names that can be searched for this
+ *              source.
+ *
+ * strict:      A list of native field/attribute names that must always be
+ *              matched exactly in a search.
+ *
+ * export:      If set to true, this source will appear on the Export menu,
+ *              allowing users to export the contacts to a CSV (etc.) file.
+ *
+ * browse:      If set to true, this source will be browseable via the Browse
+ *              menu item, and empty searches against the source will return
+ *              all contacts.
+ *
+ * use_shares:  If this is present and true, Horde_Share functionality will
+ *              be enabled for this source - allowing users to share their
+ *              personal address books as well as to create new ones. Since
+ *              Turba only supports having one backend configured for
+ *              creating new shares, use the 'shares' configuration option to
+ *              specify which backend will be used for creating new shares.
+ *              All permission checking will be done against Horde_Share, but
+ *              note that any 'extended' permissions (such as max_contacts)
+ *              will still be enforced. Also note that the backend driver
+ *              must have support for using this. Currently SQL only.
  *
  * Here are some example configurations:
  */
 
 /**
- * A local address book in an SQL database.  This implements a per-user
- * address book.
+ * A local address book in an SQL database. This implements a private
+ * per-user address book. Sharing of this source with other users may be
+ * accomplished by enabling Horde_Share for this source by setting
+ * 'use_shares' => true.
  *
  * Be sure to create a turba_objects table in your Horde database from the
  * schema in turba/scripts/db/turba.sql if you use this source.
@@ -136,15 +156,14 @@
         'owner_id',
         'object_type',
     ),
-    'public' => false,
-    'readonly' => false,
-    'admin' => array(),
-    'export' => true
+    'export' => true,
+    'browse' => true,
+    'use_shares' => true,
 );
 
 if (Util::extensionExists('ldap')) {
 /**
- * A local address book in an LDAP directory.  This implements a public
+ * A local address book in an LDAP directory. This implements a public
  * (shared) address book.
  * To store freebusy information in the LDAP directory, you'll need the
  * rfc2739.schema from
@@ -164,14 +183,19 @@
         'dn' => array('cn'),
         'objectclass' => array('top',
                                'person',
-                               'organizationalPerson','inetOrgPerson'),
+                               'organizationalPerson',
+                               'inetOrgPerson'),
         'scope' => 'one',
         'charset' => 'iso-8859-1',
-        // check if all required attributes for an entry are set and add them
-        // if needed.
+        // Consult the LDAP schema to verify that all required attributes for
+        // an entry are set and add them if needed.
         'checkrequired' => false,
-        // string to put in missing required attributes.
+        // Value used to fill in missing required attributes.
         'checkrequired_string' => ' ',
+        // Check LDAP schema for valid syntax. If this is undefined an
+        // address field is assumed to have postalAddress syntax; otherwise
+        // the schema is consulted for the syntax to use.
+        'checksyntax' => true,
         'version' => 3
     ),
     'map' => array(
@@ -182,8 +206,8 @@
         'homePhone' => 'homephone',
         'workPhone' => 'telephonenumber',
         'cellPhone' => 'mobiletelephonenumber',
-        'homeAddress' => 'homepostaladdress'
-        // 'freebusyUrl' => 'calFBURL'
+        'homeAddress' => 'homepostaladdress',
+        // 'freebusyUrl' => 'calFBURL',
     ),
     'search' => array(
         'name',
@@ -196,17 +220,15 @@
     'strict' => array(
         'dn',
     ),
-    'public' => true,
-    'readonly' => false,
-    'admin' => array(),
-    'export' => true
+    'export' => true,
+    'browse' => true,
 );
 
 /**
- * A personal LDAP adressbook.  This assumes that the login is
+ * A personal LDAP adressbook. This assumes that the login is
  * <username>@domain.com and that the users are stored on the same LDAP
- * server.  Thus it is possible to bind with the username and password from
- * the user.  For more info; please refer to the docs/LDAP file in the Turba
+ * server. Thus it is possible to bind with the username and password from
+ * the user. For more info; please refer to the docs/LDAP file in the Turba
  * distribution.
  *
  * To store freebusy information in the LDAP directory, you'll need the
@@ -282,10 +304,8 @@
         'dn',
 
     ),
-    'public' => true,
-    'readonly' => false,
-    'admin' => array($uid),
-    'export' => true
+    'export' => true,
+    'browse' => true,
 );
 
 /**
@@ -319,9 +339,8 @@
     'strict' => array(
         'dn'
     ),
-    'public' => true,
-    'readonly' => true,
-    'export' => false
+    'export' => false,
+    'browse' => false,
 );
 
 $cfgSources['bigfoot'] = array(
@@ -349,9 +368,8 @@
     'strict' => array(
         'dn'
     ),
-    'public' => true,
-    'readonly' => true,
-    'export' => false
+    'export' => false,
+    'browse' => false,
 );
 
 $cfgSources['verisign'] = array(
@@ -377,21 +395,20 @@
     'strict' => array(
         'dn'
     ),
-    'public' => true,
-    'readonly' => true,
-    'export' => false
+    'export' => false,
+    'browse' => false,
 );
 
 // End LDAP check.
 }
 
 /**
- * A preferences-based adressbook.  This will always be private.  You can add
+ * A preferences-based adressbook. This will always be private. You can add
  * any attributes you like to the map and it will just work; you can also
  * create multiple prefs-based address books by changing the 'name' parameter.
  * This is best for address books that are expected to remain small; it's not
  * the most efficient, but it can't be beat for getting up and running
- * quickly, especially if you already have Horde preferences working.  Note
+ * quickly, especially if you already have Horde preferences working. Note
  * that it is not searchable, though - searches will simply return the whole
  * address book.
  */
@@ -420,9 +437,8 @@
         'id',
         '_type',
     ),
-    'public' => false,
-    'readonly' => false,
-    'export' => true
+    'export' => true,
+    'browse' => true,
 );
 
 /**
@@ -431,71 +447,88 @@
  * Communicates with an IMSP backend server.
  *
  * Notes:
- * You should configure the user's "main" address book here.  The name of the
- * address book is set in the 'name' element of the params array.  It is
- * configured by default to be the same as the username.  Any other address
- * books the user has access to will automatically be configured at runtime.
- *
- * In the params array, accepted values for auth_method are 'cram_md5' and
- * 'plaintext' - these must match a IMSP_Auth_ driver.
+ * You should configure the user's "main" address book here. The name of the
+ * address book is set in the 'name' element of the params array. It should
+ * be configured to be the same as the IMSP server username. Any other
+ * address books the user has access to will automatically be configured at
+ * runtime.
+ *
+ * In the params array, accepted values for auth_method are 'cram_md5',
+ * 'imtest', and 'plaintext' - these must match a IMSP_Auth_ driver. If you
+ * are using the imtest driver for Cyrus, please read the
+ * framework/Net_IMSP/Auth/imtest.php file for more configuration information.
  *
  * Groups in other IMSP-aware applications are just entries with multiple
  * email addresses in the email field and a 'group' field set to flag the
- * entry as a group.  (The Cyrusoft applications, Mulberry and Silkymail both
- * use a field named 'group' set to equal 'group' to signify this).  A
- * Turba_Group is basically a List of existing Turba_Objects.  The IMSP driver
- * will map between these two structures when reading and writing groups.  The
- * only caveat is that IMSP groups that contain email addresses which do not
- * have a cooresponding contact entry will be ignored.  The group_id_field
+ * entry as a group. (The Cyrusoft applications, Mulberry and Silkymail both
+ * use a field named 'group' set to equal 'group' to signify this). A
+ * Turba_Object_Group is basically a List of existing Turba_Objects. The IMSP
+ * driver will map between these two structures when reading and writing
+ * groups.
+ * The only caveat is that IMSP groups that contain email addresses which do
+ * not have a cooresponding contact entry will be ignored. The group_id_field
  * should be set to the IMSP field that flags the entry as a 'group' entry and
  * the group_id_value should be set to the value given to that field.
  *
  * By default, the username and password that were used to login to Horde is
- * used to login to the IMSP server.  If these credentials are different,
+ * used to login to the IMSP server. If these credentials are different,
  * there is a user preference in Horde to allow another username / password to
- * be entered.  The alternate credentials are always used if present.
+ * be entered. The alternate credentials are always used if present.
  *
  * In the map array, since IMSP uses the 'name' attribute as a key, this is
  * what __key is mapped to ... and a dynamic field 'fullname' is added and
- * mapped to the horde 'name' field.  This is populated with the IMSP 'name'
+ * mapped to the horde 'name' field. This is populated with the IMSP 'name'
  * field when the object is read from the server.
  *
  * If you wish to keep track of ownership of individual contacts, set
- * 'contact_ownership' = true.  Note that entries created using other clients
- * will not be created this way and will therefore have no 'owner'.  Set
+ * 'contact_ownership' = true. Note that entries created using other clients
+ * will not be created this way and will therefore have no 'owner'. Set
  * 'contact_ownership' = false and the __owner field will be automatically
  * populated with the current username.
  */
 // Check that IMSP is configured in Horde but fall through if there is no
-// configuration at all - in case we aren't using up to date Horde install.
-// (In that case, be sure to change the params array below to suit your needs.
+// configuration at all - in case we don't have at least a 3.0.6 Horde
+// install.  (In that case, be sure to change the params array below to suit
+// your needs).
 if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
     !isset($GLOBALS['conf']['imsp']['enabled'])) {
-
-    // First, get the user name
+    // First, get the user name to login to IMSP server with.
     $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
     $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
     if (!strlen($uid)) {
-        $uid = Auth::getAuth();
-        if (preg_match('/(^.*)@/', $uid, $matches)) {
-            $uid = $matches[1];
-        }
+        $uid = Auth::getBareAuth();
         $pass = Auth::getCredential('password');
     }
-
-    $cfgSources['imsp'] = array(
+    // Note we always use the horde username to append to the key even if we
+    // have an alternate username set in prefs.  This is to prevent the
+    // (fringe) case where an IMSP username for one user might be a valid
+    // horde username for another user.
+    $cfgKey = 'IMSP_' . Auth::getAuth();
+    $cfgSources[$cfgKey] = array(
         'title' => _("IMSP"),
         'type' => 'imsp',
         'params' => array(
-            'server'   => $GLOBALS['conf']['imsp']['server'],
-            'port'     => $GLOBASL['conf']['imsp']['port'],
+            'server'  => $GLOBALS['conf']['imsp']['server'],
+            'port'    => $GLOBALS['conf']['imsp']['port'],
             'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
+            // socket, command, and auth_mechanism are for imtest driver.
+            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
+                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
+                         '',
+            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
+                         $GLOBALS['conf']['imsp']['command'] : '' ,
+            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
+                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
             'username' => $uid,
             'password' => $pass,
             'name' => $uid,
             'group_id_field' => 'group',
             'group_id_value' => 'group',
-            'contact_ownership' => false
+            'contact_ownership' => false,
+            // Dynamically generated acl rights for current user.
+            'my_rights' => '',
+            // Flags this as the user's 'root' IMSP address book.
+            'is_root' => true
             ),
         'map' => array(
             '__key' => 'name',
@@ -522,39 +555,50 @@
             'homePhone'
             ),
         'strict' => array(),
-        'public' => false,
-        'readonly' => false,
-        'export' => true
+        'export' => true,
+        'browse' => true,
         );
 
     /**
      * Get any other address books this user might be privy to.
+     * The values for attributes such as 'export' and 'browse' for books
+     * that are added below will be the same as the values set in the default
+     * book above. Any entries defined explicitly in cfgSources[]
+     * will override any entries gathered dynamically below.
      */
     require_once 'Net/IMSP/Utils.php';
-    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
+    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
+    $count = 2;
     if (!is_a($result, 'PEAR_Error')) {
-        for ($i = 0; $i < count($result); $i++) {
-            // Make sure we didn't define this source explicitly.
+        $resultCount = count($result);
+        for ($i = 0; $i < $resultCount; $i++) {
+            // Make sure we didn't define this source explicitly,
+            // but set the acls from the server regardless.
             $dup = false;
-            foreach ($cfgSources as $thisSource) {
+            foreach ($cfgSources as $key => $thisSource) {
                 if (($thisSource['type'] == 'imsp') &&
                     ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
+
                     $dup = true;
+                    $acl = $result[$i]['params']['my_rights'];
+                    $cfgSources[$key]['params']['my_rights'] = $acl;
+                    break;
                 }
             }
             if (!$dup) {
-                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
             }
         }
     } else {
         $notification->push($result);
     }
 }
+/* End IMSP sources. */
 
 /* Begin Kolab sources. */
 if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
 
-    /* A global address book for a Kolab Server.  This is typically a
+    /* A global address book for a Kolab Server. This is typically a
      * read-only public directory, stored in the default Kolab LDAP server.
      * The user accessing this should have read permissions to the shared
      * directory in LDAP. */
@@ -597,6 +641,7 @@
             'cellPhone'         => 'mobile',
             'fax'               => 'fax',
             'notes'             => 'description',
+            'freebusyUrl'       => 'kolabHomeServer',
         ),
         'search' => array(
             'name',
@@ -619,15 +664,13 @@
         'strict' => array(
             'dn',
         ),
-        'public' => true,
-        'readonly' => true,
-        'admin' => array(),
-        'export' => true
+        'export' => true,
+        'browse' => true,
     );
 
     /**
-     * A local address book for a Kolab user.  This is stored in a specially
-     * flagged 'Contacts' folder within the users Cyrus IMAP mailbox.  By
+     * A local address book for a Kolab user. This is stored in a specially
+     * flagged 'Contacts' folder within the users Cyrus IMAP mailbox. By
      * default this folder can only be accessed by its owner, however it can
      * be shared via Cyrus ACLs.
      */
@@ -651,7 +694,7 @@
         'map' => array(
             '__key'             => 'uid',
             '__owner'           => 'owner',
-            '__uid'             => 'uid',
+            //'__uid'             => 'uid',
             'name'              => 'full-name',
             'firstname'         => 'given-name',
             'lastname'          => 'last-name',
@@ -702,13 +745,11 @@
             'nickname',
         ),
         'strict' => array(
-            '__uid'
+            'uid'
         ),
-        'public' => false,
-        'readonly' => false,
-        'admin' => array(),
-        'export' => true
+        'export' => true,
+        'browse' => true,
     );
 
-    // End Kolab sources.
 }
+/* End Kolab sources. */


--- orig/po/lt_LT.po
+++ mod/po/lt_LT.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Turba 2.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2004-11-24 16:44+0200\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2004-12-01 15:16+0200\n"
 "Last-Translator: Vilius Sumskas <vilius at lnk.lt>\n"
 "Language-Team: Lithuanian <vilius at lnk.lt>\n"
@@ -15,67 +15,132 @@
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Pine adresø knygelë"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "á pasirinktà adresø knygelæ"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Vardas Pavardë\" (pvz. Jonas Jonaitis)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Vardas, Pavardë\" (pvz. Jonas, Jonaitis)"
 
-#: add.php:95
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s pridëtas."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "%s failas sëkmingai ákeltas"
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "nuo %s iki %s ið %s"
 
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Pine adresø knygelë"
+
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
 msgstr "Jûsø narðyklë nepalaiko iFrames objektø"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
 msgstr "Paieðkos formos virðuje"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "_Detali paieðka"
+#: view.php:52
+#, fuzzy, php-format
+msgid "Access denied to %s"
+msgstr "%s sëkmingai pridëtas á %s"
+
+#: add.php:56 templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add"
+msgstr "Áves_ti"
+
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Neteisinga adresø knygelë"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Pasirinkta adresø knygelë '%s'."
 
-#: templates/prefs/columnselect.inc:238
+#: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Pridëti stulpelá"
 
-#: templates/browse/actions.inc:33
+#: edit.php:128
+msgid "Add file"
+msgstr ""
+
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "Áraðyti á"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Pine adresø knygelë"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Adresø perþiûra"
 
-#: add.php:94
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Pine adresø knygelë"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Adresø knygelës áraðas"
 
-#: lib/Driver.php:492
-msgid "Address book is read-only."
-msgstr "Ði knygelë tik perþiûrai."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Adresø knygelë iðvalyta sëkmingai."
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Adresø knygelës áraðas"
+
+#: templates/prefs/addressbookselect.inc:170
+#, fuzzy
+msgid "Address books that will not be displayed:"
+msgstr "Nepavyko iðvalyti adresø knygelës: %s"
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Detali paieðka"
 
@@ -83,108 +148,107 @@
 msgid "Alias"
 msgstr "Pravardë"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "Viskà"
 
-#: lib/api.php:372
+#: lib/api.php:552
 msgid "Already Exists"
 msgstr "Jau egzistuoja"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Ar tikrai norite iðtrinti %s?"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Ar tikrai norite iðtrinti pasirinktus áraðus?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Didëjimo tvarka"
 
-#: templates/prefs/columnselect.inc:234
-msgid "Available Columns:"
-msgstr "Galimi stulpeliai:"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Gráþti á %s"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "Gráþti á %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Paprast_oji paieðka"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
 msgstr "Paprastoji paieðka"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
 msgstr "Paieðkos formos apaèioje"
 
-#: lib/Driver/ldap.php:75 lib/Driver/ldap.php:78
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Prisijungti nepavyko: (%s) %s"
 
-#: config/attributes.php.dist:168
+#: config/attributes.php.dist:178
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: config/attributes.php.dist:163
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "P_erþiûrëti"
+
+#: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Darbo kategorija"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "Ið_valyti paieðkà"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "P_aþymëti visus/nieko"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Pagrindinio katalogo jûsø asmeninei adresø knygutei, kontaktams ir paieðkoms "
-"nustatymas."
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "Pasirinkite adresø knygelæ"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Pasirinkite adresø knygelæ"
 
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Pasirinkite adresø knygelæ"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "Pasirinkite adresø knygelæ"
+
 #: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
 msgstr "Pasirinkite stulpeliø rodymo tvarkà adresø sàraðe."
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "Iðvalyti paieðkà"
-
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Stulpeliø nustatymai"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Kableliais atskirtos reikðmës"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Kableliais atskirtos reikðmës (Microsoft Outlook)"
 
@@ -192,115 +256,144 @@
 msgid "Company"
 msgstr "Kompanija"
 
-#: config/attributes.php.dist:134
+#: config/attributes.php.dist:144
 msgid "Company Address"
 msgstr "Kompanijos adresas"
 
-#: lib/api.php:611 lib/api.php:781
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Prisijungti nepavyko: %s"
 
-#: lib/Driver/ldap.php:64
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Prisijungti nepavyko"
 
-#: browse.php:85
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "Adresas iðtrintas."
+
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "Adresas iðtrintas."
 
-#: browse.php:267
+#: browse.php:266
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Adresai sàraðe: %s"
 
-#: browse.php:289
-#, php-format
-msgid "Contents of %s"
-msgstr "%s turinys"
-
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:12
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: lib/ObjectView.php:133
-msgid "Created"
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
 msgstr "Sukurta"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Standartinis vaizdavimas"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Asmeninë adresø knygelë"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "Pagrindinis katalogas, kuriame bus saugomi jûsø adresai ir paieðkos."
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "Sukurta"
 
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Standartinë rûðiavimo tvarka:"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Iðtrinti"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Pasirinkite adresø knygelæ"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Trynimo patvirtinimas"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Trynimo mygtuko elgesys"
 
-#: lib/Driver/ldap.php:267
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Iðtrinti nepavyko: (%s) %s"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Iðtrinti nepavyko"
 
-#: config/attributes.php.dist:203
+#: config/attributes.php.dist:213
 msgid "Department"
 msgstr "Departamentas"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Maþëjimo tvarka"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Katalogas"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Vaizdavimo nustatymai"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Vaizdavimo nustatymai"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
 msgstr "Ar norite, kad prieð kiekvienà áraðø trynimà praðytø patviritimo?"
 
-#: templates/browse/contactrow.inc:29
-msgid "Download VCard"
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
 msgstr "Atsisiøsti VCard"
 
-#: templates/browse/contactrow.inc:29
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "Atsisiøsti vCard"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:37
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Redaguoti"
 
-#: templates/browse/contactrow.inc:37
-#, php-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "Redaguoti '%s'"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Adresø knygelës iðkëlimas"
+
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Redaguoti áraðà %s"
@@ -309,34 +402,49 @@
 msgid "Email"
 msgstr "El. paðto adresas"
 
-#: edit.php:79
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
 msgstr "%s atnaujintas."
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s failas sëkmingai ákeltas"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Nepavyko pasiekti nurodytos adresø knygelës: %s."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Iðkelti"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Adresø knygelës iðkëlimas"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Iðkelti tik pasirinktus adresus."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Iðkelti visà adresø knygelæ."
 
-#: browse.php:62 browse.php:120 browse.php:135 data.php:110 data.php:228
-#: search.php:51 add.php:71
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Nepavyko pasiekti nurodytos adresø knygelës: %s."
 
-#: browse.php:145
+#: browse.php:139
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Pridëti %s prie %s nepavyko: %s"
@@ -345,50 +453,65 @@
 msgid "Failed to browse list"
 msgstr "Nepavyko perþiûrëti sàraðo"
 
-#: browse.php:303
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "Perþiûra nepavyko"
 
-#: lib/Driver/ldap.php:304
-#, php-format
-msgid "Failed to change name: (%s) %s, %s"
+#: lib/Driver/ldap.php:309
+#, fuzzy, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr "Nepavyko pakeisti vardo: (%s) %s: %s"
 
-#: browse.php:140
+#: browse.php:120
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Nepavyko rasti objekto pridëjimui: %s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Nepavyko pasiekti nurodytos adresø knygelës: %s."
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Paieðka nepavyko kataloge: %s"
 
-#: config/attributes.php.dist:157
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Faksas"
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Pareigos"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Rasti"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Rasti"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Vardas"
 
-#: config/attributes.php.dist:192
+#: config/attributes.php.dist:202
 msgid "Freebusy URL"
 msgstr "Uþimtumo informacijos URL"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Ið"
 
-#: config/sources.php.dist:521
+#: config/sources.php.dist:604
 msgid "Global Address Book"
 msgstr "Globali adresø knygelë"
 
-#: templates/browse/column_headers.inc:10 templates/browse/contactrow.inc:48
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Grupë"
 
@@ -396,73 +519,79 @@
 msgid "Home Address"
 msgstr "Namø adresas"
 
-#: config/attributes.php.dist:88
+#: config/attributes.php.dist:93
 msgid "Home City"
 msgstr "Namø miestas"
 
-#: config/attributes.php.dist:103
+#: config/attributes.php.dist:108
 msgid "Home Country"
 msgstr "Namø valstybë"
 
-#: config/attributes.php.dist:140
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Namø tel."
 
-#: config/attributes.php.dist:98
+#: config/attributes.php.dist:103
 msgid "Home Postal Code"
 msgstr "Namø paðto kodas"
 
-#: config/attributes.php.dist:93
+#: config/attributes.php.dist:98
 msgid "Home State/Province"
 msgstr "Namø rajonas/provincija"
 
-#: config/sources.php.dist:457
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Namø adresas"
+
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Adresø perþiûra"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Adresø knygelës ákëlimas, %d-as þingsnis"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Ákelti/Iðkelti adresø knygeles"
 
-#: lib/api.php:358 lib/api.php:577
-msgid "Invalid Content-Type"
-msgstr "Neþinomas duomenø tipas"
-
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:596 lib/api.php:683
 msgid "Invalid ID"
 msgstr "Neteisingas ID"
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:852
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
 msgstr "Neteisinga adresø knygelë"
 
-#: lib/api.php:856 lib/api.php:927 lib/api.php:979
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
 msgstr "Neteisingas el.paðto adresas"
 
-#: lib/api.php:864
+#: lib/api.php:1089
 msgid "Invalid entry"
 msgstr "Neteisingas áraðas"
 
-#: lib/Driver/ldap.php:263
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Nurodytas neteisingas raktas."
 
-#: lib/api.php:860
+#: lib/api.php:1085
 msgid "Invalid name"
 msgstr "Neteisingas vardas"
 
-#: lib/api.php:560
+#: lib/api.php:735
 msgid "Invalid objectId"
 msgstr "Neteisingas objekto ID"
 
-#: lib/Driver/ldap.php:39
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
@@ -476,361 +605,442 @@
 msgid "Last Name"
 msgstr "Pavardë"
 
-#: templates/browse/search.inc:79
+#: templates/browse/column_headers.inc:16
+#, fuzzy
+msgid "List"
+msgstr "Naujas sàraðas"
+
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Atitinka"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "Maksimalus puslapiø skaièius"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Maksimalus puslapiø skaièius"
 
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Naujas sàraðas"
+
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
 msgstr "Mini paieðka"
 
-#: lib/Driver/ldap.php:298
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "LDAP konfigûracijoje nëra DN parametro."
 
-#: config/attributes.php.dist:152
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "Mobilus tel."
 
-#: lib/Driver/ldap.php:326 lib/Driver/ldap.php:343
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Redaguoti nepavyko: (%s) %s"
 
-#: lib/api.php:965
+#: lib/api.php:1193
 msgid "More than 1 entry found"
 msgstr "Rastas daugiau nei vienas áraðas"
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:11
 msgid "Move"
 msgstr "Perkelti"
 
-#: templates/prefs/columnselect.inc:248
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Perkelti kairën"
 
-#: templates/prefs/columnselect.inc:250
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Perkelti deðinën"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry adresø knygelë"
 
-#: lib/api.php:886
+#: lib/api.php:1113
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
 "Adresø knygelëje yra keletas asmenø su adresu [%s], bet nei vieno vardu [%s]"
 
-#: config/sources.php.dist:165 config/sources.php.dist:294
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Mano adresø knygelë"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
 msgstr "Mano adresø knygelë"
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Vardas"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Vardo formatas"
 
-#: config/sources.php.dist:72
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter nariø katalogas"
 
-#: add.php:45 add.php:111 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Naujas adresas"
 
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "Naujas sàraðas"
-
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
 msgstr "Sekantis"
 
-#: config/attributes.php.dist:208
+#: config/attributes.php.dist:218
 msgid "Nickname"
 msgstr "Slapyvardis"
 
-#: lib/api.php:967 lib/api.php:1016
+#: lib/api.php:1195 lib/api.php:1244
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Áraðas %s nerastas %s"
 
-#: lib/api.php:936
+#: lib/api.php:1163
 msgid "No address books found."
 msgstr "Adresø knygeliø nëra."
 
-#: minisearch.php:85
+#: minisearch.php:83
 msgid "No contacts found"
 msgstr "Tokiø kontaktø nëra"
 
-#: lib/api.php:338
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
 msgstr "vCard duomenø nëra."
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "Nieko"
 
-#: config/attributes.php.dist:174
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Pastabos"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Objektø skaièius puslapyje"
 
-#: lib/api.php:436
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
 msgstr "Objektas nerastas"
 
-#: config/attributes.php.dist:213
+#: config/attributes.php.dist:223
 msgid "Office"
 msgstr "Ofisas"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Kiti nustatymai"
 
-#: config/attributes.php.dist:180
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr "PGP vieðasis raktas"
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:870
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
 msgstr "Nëra teisiø"
 
-#: lib/Driver.php:453
+#: lib/Driver.php:543
 msgid "Permission denied"
 msgstr "Nëra teisiø"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "Nëra teisiø"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine adresø knygelë"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
 msgstr "Áveskite naujo sàraðo pavadinimà:"
 
-#: templates/prefs/columnselect.inc:219
-msgid "Please select a directory:"
-msgstr "Pasirinkite katalogà:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-#: config/sources.php.dist:373
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Asmeninë adresø knygelë"
 
-#: lib/Driver/ldap.php:139
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Uþklausa nepavyko: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "Greitoji paieðka"
 
-#: lib/Driver/ldap.php:183 lib/Driver/ldap.php:191 lib/Driver/ldap.php:423
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Skaitymas nepavyko: (%s) %s"
 
-#: templates/browse/footer.inc:6
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Rodomi áraðai:"
 
-#: templates/prefs/columnselect.inc:240
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Pasirinkite adresø knygelæ"
+
+#: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Panaikinti stulpelá"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "Paðalinti ið ðio sàraðo"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
+#, fuzzy
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
 "Pakeisti visus áraðus adresø knygelëje á ákeliamus? <b>Dëmesio: taip "
 "iðtrinsite visus áraðus dabartinëje adresø knygelëje.</b>"
 
-#: lib/Driver.php:343
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Reikalingas objektas nerastas."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
 msgstr "Atstatyti"
 
-#: config/attributes.php.dist:186
+#: config/attributes.php.dist:196
 msgid "S/MIME Public Certificate"
 msgstr "S/MIME vieðasis sertifikatas"
 
-#: add.php:46 edit.php:57
+#: lib/Driver/ldap.php:69
+#, fuzzy, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr "Skaitymas nepavyko: (%s) %s"
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Iðsaugoti"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Ieðkoti"
 
-#: browse.php:252 minisearch.php:66
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Paieðkos rezultatai"
 
-#: lib/api.php:786
+#: lib/api.php:1011
 msgid "Search failed"
 msgstr "Paieðka nepavyko"
 
-#: lib/api.php:876 lib/api.php:882 lib/api.php:891 lib/api.php:904
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
 msgstr "Paieðka nepavyko: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Paieðkos nustatymai"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Ieðkoma..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Pasirinkite adresø knygelæ"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Pasirinkite adresø knygelæ iðkëlimui:"
 
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "Pasirinkite sàraðà"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Pasirinkite adresu knygelæ ákëlimui:"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Pasirinkite adresø knygelæ iðkëlimui:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Pasirinkite adresu knygelæ ákëlimui:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Pasirinkite iðkeliamo failo formatà:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Pasirinkite iðkëlimo formatà:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Pasirinkite ákeliamà failà:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Pasirinkite iðkeliamo failo formatà:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Pasirinkite vardø vaizdavimà:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Standartináo vaizdavimo pasirinkimas."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Laukø, kurie bus rodomi adresø sàraðe, pasirinkimas."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Vardø vaizdavimo pasirinkimas."
 
-#: templates/prefs/columnselect.inc:244
-msgid "Selected Columns:"
-msgstr "Pasirinkti stulpeliai:"
-
-#: add.php:59
-#, php-format
-msgid "Selected address book '%s'."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
 msgstr "Pasirinkta adresø knygelë '%s'."
 
-#: config/sources.php.dist:230
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Vieðas katalogas"
 
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "Rodyti _visus"
-
-#: templates/browse/select.inc:11
-msgid "Show"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
 msgstr "Rodyti"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "Rodyti visus"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "Rodyti adresus"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "Rodyti sàraðus"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "_Rodyti adresus"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "Rodyti _sàraðus"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "Rûðiavimo tvarka"
 
-#: lib/api.php:154
+#: lib/api.php:198
 msgid "Sources"
 msgstr "Ðaltiniai"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
 msgstr "Nurodykite, kur norite matyti iðplëstinës paieðkos rezultatus."
 
-#: browse.php:147
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s sëkmingai pridëtas á %s"
 
-#: data.php:29
+#: browse.php:222
+#, fuzzy, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "%s sëkmingai pridëtas á %s"
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tab atskirtos reikðmës"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Nepavyko iðvalyti adresø knygelës: %s"
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Adresø knygelë iðvalyta sëkmingai."
+
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Adresø knygelë iðvalyta sëkmingai."
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Adresø knygelë iðvalyta sëkmingai."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Nepavyko iðvalyti adresø knygelës: %s"
 
-#: vcard.php:22 edit.php:24 display.php:23
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "Nurodytas kontaktas neegzistuoja."
 
-#: browse.php:58
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s failas sëkmingai ákeltas"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Adresø knygeliø nëra."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -839,136 +1049,179 @@
 "Nëra nei vienos paruoðtos adresø knygelës, leidþianèios pridëti naujà áraðà. "
 "Jeigu manote, jog tai ne Jûsø klaida, praðome praneðti administratoriui. "
 
-#: add.php:107
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr "Klaida pridedant kontaktà. Susiekite su sistemos administratoriumi."
 
-#: browse.php:204
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Klaida trinant objektà."
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "Klaida kuriant naujà sàraðà."
 
-#: browse.php:154
-#, php-format
-msgid "There was an error deleting %s from the source address book."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Klaida redaguojant ðá áraðà: %s"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "Klaida trinant %s ið pasirinktos adresø knygelës."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Klaida trinant adresà: %s"
 
-#: browse.php:93
+#: browse.php:72
 msgid "There was an error deleting this object."
 msgstr "Klaida trinant objektà."
 
-#: browse.php:282
-msgid "There was an error displaying the select List"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
 msgstr "Klaida rodant nurodytà sàraðà"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Klaida ákeliant duomenis: %s"
 
-#: lib/api.php:334
+#: lib/api.php:507 lib/api.php:761
 msgid "There was an error importing the iCalendar data."
 msgstr "Klaida ákeliant iCalendar duomenis."
 
-#: browse.php:83
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Klaida kuriant naujà sàraðà."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Klaida trinant objektà."
 
-#: edit.php:84
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Klaida redaguojant ðá áraðà: %s"
+
+#: edit.php:158
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Klaida redaguojant ðá áraðà: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Adresø iðkëlimui nëra."
 
-#: lib/Driver.php:403 lib/Driver.php:444
-msgid "This address book is read-only"
-msgstr "Ði adresø knygelë skirta tik þiûrëjimui."
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Failo formatas nepalaikomas."
 
-#: lib/api.php:895 lib/api.php:908
+#: lib/api.php:1122 lib/api.php:1135
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Ðis asmuo jau yra %s jûsø adresø knygelëje."
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Pareigos"
 
-#: lib/Driver.php:816
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Neámanoma pakrauti %s apraðymo."
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
 msgstr "Atðaukti pakeitimus"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, fuzzy, php-format
+msgid "Unsupported Content-Type: %s"
 msgstr "Neþinomas duomenø tipas."
 
-#: config/sources.php.dist:131
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign katalogas"
 
-#: templates/browse/contactrow.inc:31
-#, php-format
-msgid "View '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
 msgstr "Þiûrëti '%s'"
 
-#: minisearch.php:80
+#: minisearch.php:78
 msgid "View Contact"
 msgstr "Perþiûrëti kontaktà"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Standartinis vaizdavimas:"
 
-#: config/attributes.php.dist:198
+#: config/attributes.php.dist:208
 msgid "Website URL"
 msgstr "WWW puslapis"
 
-#: config/attributes.php.dist:108
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Darbo adresas"
 
-#: config/attributes.php.dist:114
+#: config/attributes.php.dist:124
 msgid "Work City"
 msgstr "Darbo miestas"
 
-#: config/attributes.php.dist:129
+#: config/attributes.php.dist:139
 msgid "Work Country"
 msgstr "Darbo valstybë"
 
-#: config/attributes.php.dist:146
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Darbo tel."
 
-#: config/attributes.php.dist:124
+#: config/attributes.php.dist:134
 msgid "Work Postal Code"
 msgstr "Darbo paðto kodas"
 
-#: config/attributes.php.dist:119
+#: config/attributes.php.dist:129
 msgid "Work State/Province"
 msgstr "Darbo rajonas/provincija"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "Jûs kuriate adresø sàraðà."
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Darbo adresas"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-#: edit.php:44 display.php:48
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Neturite teisiø perþiûrëti ðá kontaktà."
 
@@ -976,47 +1229,73 @@
 msgid "You do not have permission to view this object."
 msgstr "Neturite teisiø perþiûrëti ðá objektà."
 
-#: templates/browse/javascript.inc:41
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Visø pirma reikia nurodyti reikiamà adresø knygelæ."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
 msgstr "Pirmiausia reikia nurodyti reikiamà sàraðà."
 
-#: templates/browse/javascript.inc:58
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "Ið pradþiø paþymëkite bent vienà áraðà."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Ið pradþiø paþymëkite bent vienà áraðà."
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
 msgstr "Jûs turite tik perþiûrëjimo teises á ðá kontaktà."
 
-#: templates/browse/contactrow.inc:12
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[nëra reikðmës]"
 
-#: lib/Turba.php:236
-msgid "_Add"
-msgstr "Áves_ti"
-
-#: lib/Turba.php:235
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "P_erþiûrëti"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "_Rodyti adresus"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
 msgstr "_Iðtrinti"
 
-#: lib/Turba.php:241
+#: lib/Turba.php:493
 msgid "_Import/Export"
 msgstr "_Ákelti/Iðkelti"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Rodyti _sàraðus"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Mano adresø knygelë"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Naujas adresas"
+
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
 msgstr "Ið_trinti ið ðio sàraðo"
 
-#: lib/Turba.php:237
+#: lib/Turba.php:489
 msgid "_Search"
 msgstr "Ieð_koti"
 
@@ -1024,19 +1303,35 @@
 msgid "contact.vcf"
 msgstr "adresas.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "adresai.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "adresai.tsv"
 
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
+#: data.php:219
+#, fuzzy
+msgid "contacts.vcf"
+msgstr "adresas.vcf"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "Nieko"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "Rodyti adresus"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
 msgstr "á pasirinktà adresø knygelæ"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/docs/CREDITS
+++ mod/docs/CREDITS
@@ -2,30 +2,16 @@
  Turba Development Team
 ========================
 
-:Last update:   $Date: 2005/10/14 15:51:29 $
-:Revision:      $Revision: 1.54.8.14 $
+:Last update:   $Date: 2006/03/06 09:44:19 $
+:Revision:      $Revision: 1.54.8.19 $
 :Contact:       turba at lists.horde.org
 
 
 Core Developers
 ===============
 
-Chuck Hagenbuch <chuck at horde.org>
-
-- original design work
-
-Jon Parise <jon at csh.rit.edu>
-
-- initial implementation work
-
-Rich Lafferty <rich at horde.org>
-
-- documentation
-
-Jan Schneider <jan at horde.org>
-
-- import/export routines
-- stuff
+- Chuck Hagenbuch <chuck at horde.org>
+- Jan Schneider <jan at horde.org>
 
 
 Localization
@@ -34,7 +20,7 @@
 =====================   ======================================================
 Arabic (Syria)          Platinum Development Team <devteam at platinum-sy.net>
 Brazilian Portuguese    Carlos Daniel Kibrit <kibrit at terra.com.br>
-                        Fabio Gomes <flgomes at fazenda.sp.gov.br>
+                        Fabio Gomes <flgoms at uol.com.br>
 Bulgarian               Miroslav Pendev <pendev at hotmail.com>
 Catalan                 Angels Guimerà <angels.Guimera at uab.es>
 Chinese (Simplified)    WangHengWen <whw at my169.com>
@@ -43,6 +29,7 @@
 Danish                  Martin List-Petersen <martin at list-petersen.dk>
                         Brian Truelsen <horde+i18n at briantruelsen.dk>
 Dutch                   Jan Kuipers <jrkuipers at lauwerscollege.nl>
+                        Han Spruyt <han.spruyt at ijsselgroep.nl>
 Estonian                Toomas Aas <toomas.aas at raad.tartu.ee>
 Finnish                 Leena Heino <liinu at uta.fi>
 French                  Sam Przyswa <samp at arial-concept.com>
@@ -56,6 +43,7 @@
                         Silligardos Xristoforos
                         Anagnostopoulos Apostolis
 Hungarian               Laszlo L. Tornoci <torlasz at xenia.sote.hu>
+Icelandic               Bjorn Davidsson <bjossi at snerpa.is>
 Italian                 Giovanni Meneghetti <gmeneghetti at infvic.it>
                         Marco Pirovano <marco.pirovano at unibocconi.it>
                         Cristian Manoni <cristian.manoni at nethesis.it>
@@ -74,12 +62,13 @@
                         Trond Bjørstad <trb at ndn.no>
                         Thomas Chr. Dahl <tcd at ndn.no>
 Norwegian Nynorsk       Per-Stian Vatne <psv at orsta.org>
-Persian (Western)       MetaNET Amirkabir <persian-horde at metanetworking.com>
+Persian                 MetaNET Amirkabir <persian-horde at metanetworking.com>
 Polish                  Piotr Roszatycki <dexter at debian.pl>
                         Mateusz Kaminski <matipl at pld-linux.org>
                         Krzysztof Kozlowski <kozik1 at o2.pl>
 Portuguese              Nuno Loureiro <nuno at eth.pt>
                         Jose' Carlos <horde.i18n at abismo.org>
+                        Manuel Menezes de Sequeira <Manuel.Sequeira>
 Romanian                Eugen Hoanca <eugenh at urban-grafx.ro>
                         Marius Dragulescu <mariusd at urban-grafx.ro>
 Russian                 Ignat Ikryanov <ignat at ibd.ru>
@@ -98,3 +87,10 @@
                         Ahmet Öztürk <oahmet at metu.edu.tr>
 Ukrainian               Andriy Kopystyansky <anri at polynet.lviv.ua>
 =====================   ======================================================
+
+
+Inactive Developers
+===================
+
+- Jon Parise <jon at csh.rit.edu>
+- Rich Lafferty <rich at horde.org>


--- orig/po/ar_SY.po
+++ mod/po/ar_SY.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba \n"
-"POT-Creation-Date: 2003-04-30 12:00+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-04-30 12:00+0200\n"
 "Last-Translator:  Platinum Development Team <devteam at platinum-sy.com>\n"
 "Language-Team: Arabic <i18n at lists.horde.org>\n"
@@ -16,728 +17,1369 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: config/prefs.php.dist:90
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "ÏÝÊÑ ÇáÚäÇæíä ÇáÕäæÈÑí"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "ÇÎÊÑ ÏÝÊÑ ÚäÇæíä"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"ÇáÇÓã ¡ ÇááÞÈ\"  (ãËÇá: ãÍãÏ ÇáÚÑÈí)"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"ÇááÞÈ ¡ ÇáÇÓã\"  (ãËÇá: ÇáÚÑÈí ãÍãÏ)"
 
-#: data.php:145 data.php:310
-#, c-format
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "Êã ÇÓÊíÑÇÏ ÇáãáÝ %s ÈäÌÇÍ"
 
-#: templates/menu/menu.inc:11
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
+
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "ÏÝÊÑ ÇáÚäÇæíä ÇáÕäæÈÑí"
+
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
+
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "ÅÖÇÝÉ"
 
-#: templates/add/select.inc:12
-msgid "Add Contact ..."
-msgstr "ÅÖÇÝÉ ÇÊÕÇá..."
-
-#: templates/add/add.inc:10 addobject.php:19
-msgid "Add a new contact"
-msgstr "ÅÖÇÝÉ ÇÊÕÇá ÌÏíÏ"
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "ÏÝÊÑ ÚäÇæíä ÛíÑ ÕÍíÍ"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "áÇíæÌÏ ÏÝÊÑ ÚäÇæíä ÞÇÈá ááßÊÇÈÉ."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "ÅÖÇÝÉ ÚãæÏ"
 
-#: addobjectaction.php:44
-msgid "Add failed"
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
 msgstr "ÎØà ÎáÇá ÇáÅÖÇÝÉ"
 
-#: templates/browse/actions.inc:16
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "ÅÖÇÝÉ Åáì"
 
-#: browse.php:31 config/prefs.php.dist:87
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "ÏÝÊÑ ÇáÚäÇæíä ÇáÕäæÈÑí"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "ÞÇÆãÉ ÏÝÊÑ ÇáÚäÇæíä"
 
-#: lib/api.php:25 lib/api.php:179 lib/api.php:259
-msgid "Address book is read-only."
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "ÎÑæÌ ãä ÏÝÊÑ ÇáÚäÇæíä"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
 msgstr "ÏÝÊÑ ÇáÚäÇæíä ááÞÑÇÁÉ ÝÞØ"
 
-#: browse.php:202
-#, c-format
-msgid "Addresses in list: %s"
-msgstr "ÚÏÏ ÇáÚäÇæíä Ýí ÇáÞÇÆãÉ: %s"
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "Êã ÇÓÊíÑÇÏ ÏÝÊÑ ÇáÚäÇæíä ÇáÕäæÈÑí ÈäÌÇÍ"
 
-#: templates/menu/menu.inc:13 templates/advanced/head.inc:8 advanced.php:19
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "ÏÝÊÑ ÇáÚäÇæíä ááÞÑÇÁÉ ÝÞØ"
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "ÈÍË ãÊÞÏã"
 
-#: config/attributes.php.dist:22
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "ÇÓã ÈÏíá"
 
-#: templates/browse/actions.inc:8
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "ÇáÌãíÚ"
 
-#: prefs.php:77
-msgid "An illegal value was specified."
-msgstr "Êã ÊÍÏíÏ ÞíãÉ ÛíÑ ãÞÈæáÉ"
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
 
-#: config/prefs.php.dist:75
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
+
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "ÊÕÇÚÏí"
 
-#: templates/prefs/columnselect.inc:235
-msgid "Available Columns:"
-msgstr "ÇáÃÚãÏÉ ÇáãÊÇÍÉ:"
-
-#: templates/browse/actions.inc:44
-#, c-format
-msgid "Back to %s"
-msgstr "ÚæÏÉ Åáì %s"
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "ÈÍË"
 
-#: templates/menu/menu.inc:10
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "ÊÕÝÍ"
 
-#: templates/edit/edit.inc:15 templates/edit/edit.inc:70
-msgid "Cancel"
-msgstr "ÅáÛÇÁ"
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
+
+#: data.php:49
+msgid "CSV"
+msgstr ""
+
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
 #: templates/browse/column_headers.inc:7
-msgid "Checkbox"
-msgstr "ãÑÈÚ ÇÎÊíÇÑ"
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "ÏÝÊÑ ÚäÇæíä ÛíÑ ÕÍíÍ"
 
-#: templates/prefs/columnselect.inc:229
-msgid "Choose the order of the columns to display in the address list."
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "ÏÝÊÑ ÚäÇæíä ÛíÑ ÕÍíÍ"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
 msgstr ""
-"ÇÎÊÑ ÊæÖÚ ÇáÃÚãÏÉ áÅÙåÇÑåÇ Ýí ÞÇÆãÉ ÇáÚäÇæíä"
 
-#: templates/search/head.inc:77 templates/advanced/results_head.inc:18
-#: templates/browse/actions.inc:46
-msgid "Clear Search"
-msgstr "ãÓÍ ÇáÈÍË"
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr "ÇÎÊÑ ÊæÖÚ ÇáÃÚãÏÉ áÅÙåÇÑåÇ Ýí ÞÇÆãÉ ÇáÚäÇæíä"
 
-#: config/prefs.php.dist:12
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "ÎíÇÑÇÊ ÇáÃÚãÏÉ"
 
-#: templates/data/import.inc:16 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Þíã ãÝÕæáÉ ÈÝÇÑÒÉ"
 
-#: config/attributes.php.dist:34
+#: templates/data/export.inc:13
+#, fuzzy
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr "Þíã ãÝÕæáÉ ÈÝÇÑÒÉ"
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "ÇáÔÑßÉ"
 
-#: browse.php:80
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "ÚäæÇä ÇáãäÒá"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "ÎØà ÎáÇá ÇáÍÐÝ"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "ÎØà ÎáÇá ÇáÍÐÝ"
+
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "ÇÊÕÇá ãÍÐæÝ ãä ÇáÞÇÆãÉ."
+
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "ÇÊÕÇá ãÍÐæÝ ãä ÇáÞÇÆãÉ."
 
-#: browse.php:225
-#, c-format
-msgid "Contents of %s"
-msgstr "ãÍÊæíÇÊ %s"
+#: browse.php:266
+#, fuzzy, php-format
+msgid "Contacts in list: %s"
+msgstr "ÚÏÏ ÇáÚäÇæíä Ýí ÇáÞÇÆãÉ: %s"
 
-#: config/prefs.php.dist:18
-msgid "Default Display"
-msgstr "ÇáÅÙåÇÑ ÇáÇÝÊÑÇÖí"
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "ÇáÔÑßÉ"
 
-#: config/prefs.php.dist:77
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "ÊÕÏíÑ ÏÝÊÑ ÇáÚäÇæíä"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "ÇÊÌÇå ÇáÝÑÒ ÇáÇÝÊÑÇÖí:"
 
-#: templates/display/display.inc:20 templates/display/display.inc:86
-#: templates/browse/actions.inc:34
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "ÍÐÝ"
 
-#: deleteobject.php:37
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "ÇÎÊÑ ÏÝÊÑ ÚäÇæíä"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "ÎØà ÎáÇá ÇáÍÐÝ"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "ÎØà ÎáÇá ÇáÍÐÝ"
 
-#: config/prefs.php.dist:76
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "ÊäÇÒáí"
 
-#: advanced.php:46
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "ãÌáÏ"
 
-#: config/prefs.php.dist:11 config/prefs.php.dist:17 config/prefs.php.dist:23
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "ÎíÇÑÇÊ ÇáÅÙåÇÑ"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "ÎíÇÑÇÊ ÇáÅÙåÇÑ"
 
-#: templates/edit/edit.inc:10 templates/display/display.inc:19
-#: templates/display/display.inc:85
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "ÊÍÑíÑ"
 
-#: templates/search/row.inc:48 templates/browse/contactrow.inc:55
-#: templates/browse/contactrow.inc:60
-#, c-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "ÊÍÑíÑ « %s »"
 
-#: config/attributes.php.dist:26
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "ÎÑæÌ ãä ÏÝÊÑ ÇáÚäÇæíä"
+
+#: edit.php:78 edit.php:154
+#, fuzzy, php-format
+msgid "Edit entry for %s"
+msgstr "áÇ ÊæÌÏ ÈíÇäÇÊ %s ãä ÃÌá %s"
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "ÈÑíÏ ÅáßÊÑæäí"
 
-#: status.php:19
-msgid "Error"
-msgstr "ÎØÃ"
-
-#: lib/api.php:265 lib/api.php:269
-msgid "Error while searching directory."
-msgstr "ÍÕá ÎØà ÎáÇá ÇáÈÍË Ýí ÇáãÌáÏÇÊ"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-#: templates/miniwindow/menu.inc:1
-msgid "Exit Address Book"
-msgstr "ÎÑæÌ ãä ÏÝÊÑ ÇáÚäÇæíä"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
 
-#: templates/data/export.inc:27
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "Êã ÇÓÊíÑÇÏ ÇáãáÝ %s ÈäÌÇÍ"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "áÇíæÌÏ ÏÝÊÑ ÚäÇæíä ÞÇÈá ááßÊÇÈÉ."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "ÊÕÏíÑ"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "ÊÕÏíÑ ÏÝÊÑ ÇáÚäÇæíä"
 
-#: browse.php:59
-msgid "Failed to access the specified address book."
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
 msgstr "ÎØà Ýí ÝÊÍ ÏÝÊÑ ÇáÚäÇæíä ÇáãØáæÈ."
 
-#: browse.php:206
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "ÎØà ÎáÇá ÇáÈÍË Ýí ÇáãÌáÏ: %s"
+
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "ÎØà Ýí ÊÕÝÍ ÇáÞÇÆãÉ"
 
-#: browse.php:239
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "ÎØà Ýí ÊÕÝÍ ÇáãÌáÏ"
 
-#: lib/api.php:82 lib/api.php:308 lib/api.php:356 lib/api.php:399
-#: advanced.php:63 data.php:96 data.php:230 data.php:324 data.php:378
-#: data.php:445 data.php:481 search.php:47 addobject.php:44
-msgid "Failed to connect to the specified directory."
-msgstr "ÎØà Ýí ÇáÇÊÕÇá ÈÇáãÌáÏ ÇáãØáæÈ."
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
 
-#: advanced.php:85 data.php:449 data.php:485 search.php:63
-#, c-format
-msgid "Failed to search the directory: %s"
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
 msgstr "ÎØà ÎáÇá ÇáÈÍË Ýí ÇáãÌáÏ: %s"
 
-#: lib/api.php:320 lib/api.php:367
-msgid "Failed to search the specified directory."
-msgstr "ÎØà ÎáÇá ÇáÈÍË Ýí ÇáãÌáÏ ÇáãØáæÈ."
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "ÎØà Ýí ÝÊÍ ÏÝÊÑ ÇáÚäÇæíä ÇáãØáæÈ."
 
-#: config/attributes.php.dist:58
+#: data.php:149
+#, php-format
+msgid "Failed to search the directory: %s"
+msgstr "ÎØà ÎáÇá ÇáÈÍË Ýí ÇáãÌáÏ: %s"
+
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "ÝÇßÓ"
 
-#: templates/search/head.inc:37 templates/browse/search.inc:65
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "ÇááÞÈ"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "ÃæÌÏ"
 
-#: templates/search/head.inc:50 templates/browse/search.inc:78
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "ÃæÌÏ"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "ãä"
 
-#: templates/browse/contactrow.inc:70
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "ÏÝÊÑ ÚäÇæíä ÇáÊæÊí"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "ãÌãæÚÉ"
 
-#: templates/menu/menu.inc:35
-msgid "Help"
-msgstr "ÇáãÓÇÚÏÉ"
-
-#: config/attributes.php.dist:38
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "ÚäæÇä ÇáãäÒá"
 
-#: config/attributes.php.dist:46
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "åÇÊÝ ÇáãäÒá"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "åÇÊÝ ÇáãäÒá"
 
-#: templates/data/import.inc:28
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr ""
-"ÎáÇá ÇÓÊíÑÇÏ ãáÝ 'CVS': åá íÍÊæí ÇáÓØÑ ÇáÃæá Úáì ÇÓãÇÁ ÇáÍÞæá¿"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "åÇÊÝ ÇáãäÒá"
 
-#: data.php:157
-msgid "Illegal or malformed form data."
-msgstr "ÊäÓíÞ ÛíÑ ãÞÈæá Ãæ ÎØà Ýí ÇáÈíÇäÇÊ."
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "åÇÊÝ ÇáãäÒá"
 
-#: templates/data/import.inc:35
-msgid "Import"
-msgstr "ÇÓÊíÑÇÏ"
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "ÚäæÇä ÇáãäÒá"
+
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
+
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "ÞÇÆãÉ ÏÝÊÑ ÇáÚäÇæíä"
 
 #: templates/data/import.inc:7
-msgid "Import Address Book"
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
 msgstr "ÇÓÊíÑÇÏ ÏÝÊÑ ÚäÇæíä"
 
-#: templates/menu/menu.inc:17
-msgid "Import/Export"
-msgstr "ÇÓÊíÑÇÏ/ÊÕÏíÑ"
-
-#: data.php:510
-msgid "Import/Export Addressbooks"
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "ÇÓÊíÑÇÏ/ÊÕÏíÑ ÏÝÇÊÑ ÚäÇæíä"
 
-#: lib/api.php:19 lib/api.php:165 lib/api.php:218 lib/api.php:241
-msgid "Invalid address book."
-msgstr "ÏÝÊÑ ÚäÇæíä ÛíÑ ÕÍíÍ"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "ÎØà Ýí ÇáÇÓã"
 
-#: lib/api.php:173 lib/api.php:245
-msgid "Invalid e-mail address."
-msgstr "ÚäæÇä ÈÑíÏ ÅáßÊÑæäí ÛíÑ ÕÍíÍ"
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
+msgstr "ÏÝÊÑ ÚäÇæíä ÛíÑ ÕÍíÍ"
 
-#: lib/api.php:292 lib/api.php:384
-msgid "Invalid email."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "ÈÑíÏ ÅáßÊÑæäí ÛíÑ ÕÍíÍ"
 
-#: lib/api.php:253
-msgid "Invalid entry."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
 msgstr "ÎØà Ýí Þíã ÇáÅÏÎÇá"
 
-#: lib/api.php:169 lib/api.php:249
-msgid "Invalid name."
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "ÈÑíÏ ÅáßÊÑæäí ÛíÑ ÕÍíÍ"
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
 msgstr "ÎØà Ýí ÇáÇÓã"
 
-#: config/prefs.php.dist:6
-msgid "Language"
-msgstr "ÇááÛÉ"
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "ÎØà Ýí Þíã ÇáÅÏÎÇá"
 
-#: templates/search/head.inc:44 templates/browse/search.inc:72
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "ÇÓã"
+
+#: templates/browse/column_headers.inc:16
+#, fuzzy
+msgid "List"
+msgstr "ÞÇÆãÉ ÌÏíÏÉ"
+
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "ãØÇÈÞÉ ÕÍíÍÉ"
 
-#: status.php:32
-msgid "Message"
-msgstr "ÑÓÇáÉ"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
 
-#: config/attributes.php.dist:54
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "ÞÇÆãÉ ÌÏíÏÉ"
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "ÈÍË"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "ÇáåÇÊÝ ÇáãÍãæá"
 
-#: lib/api.php:327 lib/api.php:404
-msgid "More than 1 entry returned."
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+#, fuzzy
+msgid "More than 1 entry found"
 msgstr "Êã ÅÑÌÇÚ ÃßËÑ ãä ÞíãÉ"
 
-#: templates/data/import.inc:23
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "ÊÍÑíß äÍæ ÇáíÓÇÑ"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "ÊÍÑíß äÍæ Çáíãíä"
+
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "ÏÝÊÑ ÚäÇæíä ÇáÊæÊí"
 
-#: data.php:364
-msgid "Mulberry addressbook sucessfully imported"
-msgstr "Êã ÇÓÊíÑÇÏ ÏÝÊÑ ÚäÇæíä ÇáÊæÊí ÈäÌÇÍ"
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "ÏÝÊÑ ÚäÇæíä ÇáÊæÊí"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "ÏÝÊÑ ÚäÇæíä ÇáÊæÊí"
 
-#: config/attributes.php.dist:18
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "ÇÓã"
 
-#: config/prefs.php.dist:24
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "ÊäÓíÞ ÇáÇÓã"
 
-#: templates/browse/actions.inc:20
-msgid "New List"
-msgstr "ÞÇÆãÉ ÌÏíÏÉ"
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
 
-#: lib/api.php:329 lib/api.php:411
-#, c-format
-msgid "No %s entry found for %s."
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "ÅÙåÇÑ ÇáÇÊÕÇáÇÊ"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "ÇÓã"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, fuzzy, php-format
+msgid "No %s entry found for %s"
 msgstr "áÇ ÊæÌÏ ÈíÇäÇÊ %s ãä ÃÌá %s"
 
-#: templates/browse/actions.inc:9
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "ÏÝÊÑ ÇáÚäÇæíä ááÞÑÇÁÉ ÝÞØ"
+
+#: minisearch.php:83
+#, fuzzy
+msgid "No contacts found"
+msgstr "ÅÙåÇÑ ÇáÇÊÕÇáÇÊ"
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "áÇíæÌÏ"
 
-#: templates/add/noadd.inc:9
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
-msgstr ""
-"áÇíæÌÏ ÏÝÊÑ ÚäÇæíä ãÚÏ áÅÏÎÇá "
-"ÈíÇäÇÊ ÌÏíÏÉ. ÅÐÇ ßäÊ ÊÚÊÞÏ Ãäå ÎØà ãÇ¡ ÇáÑÌÇÁ ÅÈáÇÛ "
-"ãÏíÑ ÇáäÙÇã."
-
-#: config/attributes.php.dist:62
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "ãáÇÍÙÇÊ"
 
-#: templates/menu/menu.inc:22
-msgid "Options"
-msgstr "ÎíÇÑÇÊ"
-
-#: templates/data/import.inc:20
-msgid "Outlook"
-msgstr "ÃæÊáæß"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
+
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
+
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
+
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
 
-#: templates/data/import.inc:24
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "ÏÝÊÑ ÇáÚäÇæíä ÇáÕäæÈÑí"
 
-#: data.php:418
-msgid "Pine addressbook sucessfully imported"
-msgstr "Êã ÇÓÊíÑÇÏ ÏÝÊÑ ÇáÚäÇæíä ÇáÕäæÈÑí ÈäÌÇÍ"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
+msgstr "ÇáÑÌÇÁ ÅÏÎÇá ÇÓã ÇáÞÇÆãÉ ÇáÌÏíÏÉ:"
 
-#: templates/add/select.inc:6
-msgid "Please choose an address book to add a contact to."
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
 msgstr ""
-"ÇáÑÌÇÁ ÇÎÊíÇÑ ÏÝÊÑ ÚäÇæíä áÅÖÇÝÉ ÇÊÕÇá Åáíå."
 
-#: templates/browse/javascript.inc:18
-msgid "Please enter the name of the new list:"
-msgstr "ÇáÑÌÇÁ ÅÏÎÇá ÇÓã ÇáÞÇÆãÉ ÇáÌÏíÏÉ:"
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "ÏÝÊÑ ÇáÚäÇæíä ÇáÕäæÈÑí"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "ÈÍË"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
 
-#: templates/prefs/columnselect.inc:220
-msgid "Please select a directory:"
-msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ:"
-
-#: templates/menu/menu.inc:27
-msgid "Problem?"
-msgstr "ãÔßáÉ¿"
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "ÏÝÊÑ ÚäÇæíä ÛíÑ ÕÍíÍ"
 
-#: templates/browse/actions.inc:34
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "ÍÐÝ ÚãæÏ"
+
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "ÇÍÐÝ ãä ÇáÞÇÆãÉ"
 
-#: templates/add/add.inc:14 templates/add/add.inc:69
-#: templates/edit/edit.inc:14 templates/edit/edit.inc:69
-#: templates/advanced/results_head.inc:5 templates/advanced/head.inc:15
-msgid "Reset"
-msgstr "ÅÚÇÏÉ ÊåíÆÉ"
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
 
-#: templates/add/add.inc:13 templates/add/add.inc:68
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "ÍÝÙ"
 
-#: templates/edit/edit.inc:13 templates/edit/edit.inc:68
-msgid "Save Changes"
-msgstr "ÍÝÙ ÇáÊÛííÑÇÊ"
-
-#: templates/menu/menu.inc:12 templates/search/head.inc:31
-#: templates/browse/search.inc:59 search.php:18 config/prefs.php.dist:88
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "ÈÍË"
 
-#: templates/advanced/results_head.inc:15 browse.php:185
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "äÊÇÆÌ ÇáÈÍË"
 
-#: templates/search/head.inc:74
-msgid "Search&nbsp;Results"
-msgstr "äÊÇÆÌ ÇáÈÍË"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "ÈÍË"
+
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
 
-#: templates/browse/actions.inc:7
-msgid "Select"
-msgstr "ÇÎÊíÇÑ"
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "ÈÍË"
 
-#: templates/browse/select.inc:8
-msgid "Select Address Book"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
 msgstr "ÇÎÊÑ ÏÝÊÑ ÚäÇæíä"
 
-#: templates/browse/actions.inc:18
-msgid "Select List"
-msgstr "ÇÎÊÑ ÞÇÆãÉ"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "ÇÎÊÑ ÏÝÊÑ ÚäÇæíä"
 
-#: templates/data/import.inc:29
-msgid "Select the destination to import to:"
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "ÇÎÊÑ ÇáãÕÏÑ ááÊÕÏíÑ ãäå:"
+
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "ÇÎÊÑ ÇáæÌåÉ ÇáÊí ÊÑíÏ ÇáÅÓÊíÑÇÏ ÅáíåÇ:"
 
-#: templates/data/import.inc:33
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "ÇÎÊÑ ÇáãÕÏÑ ááÊÕÏíÑ ãäå:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "ÇÎÊÑ ÇáãÕÏÑ ááÊÕÏíÑ ãäå:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "ÇÎÊÑ ãáÝ áíÊã ÇÓÊíÑÇÏå:"
 
-#: templates/data/export.inc:14
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "ÇÎÊÑ ÊäÓíÞ ÇáÊÕÏíÑ:"
 
-#: templates/data/import.inc:14
-msgid "Select the format to import from:"
-msgstr "ÇÎÊÑ ÊäÓíÞ ÇáÇÓÊíÑÇÏ ãä:"
-
-#: config/prefs.php.dist:97
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "ÇÎÊÑ ÊäÓíÞ ÅÙåÇÑ ÇáÃÓãÇÁ:"
 
-#: templates/data/export.inc:23
-msgid "Select the source to export from:"
-msgstr "ÇÎÊÑ ÇáãÕÏÑ ááÊÕÏíÑ ãäå:"
-
-#: config/prefs.php.dist:19
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "ÇÎÊÑ Ôßá ÇáÅÙåÇÑ ÇáÇÝÊÑÇÖí."
 
-#: config/prefs.php.dist:13
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "ÇÎÊÑ ÍÞæáÇð áíÊã ÅÙåÇÑåÇ Ýí ÞÇÆãÉ ÇáÚäÇæíä."
 
-#: config/prefs.php.dist:25
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "ÇÎÊÑ ÊäÓíÞ ÅÙåÇÑ ÇáÃÓãÇÁ."
 
-#: config/prefs.php.dist:34
-msgid "Select your preferred language:"
-msgstr "ÇÎÊÑ áÛÊß ÇáãÝÖáÉ:"
-
-#: templates/prefs/columnselect.inc:245
-msgid "Selected Columns:"
-msgstr "ÇÎÊÑ ÃÚãÏÉ:"
-
-#: templates/display/display.inc:53
-#, c-format
-msgid "Send mail to %s"
-msgstr "ÃÑÓá ÑÓÇáÉ Åáì %s"
-
-#: config/prefs.php.dist:7
-msgid "Set your preferred display language."
-msgstr "ÇÎÊÑ áÛÉ ÇáÅÙåÇÑ ÇáãÝÖáÉ."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "ÇÎÊÑ ÏÝÊÑ ÚäÇæíä"
+
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "ãÌáÏ"
 
-#: templates/browse/select.inc:13
-msgid "Show"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
 msgstr "ÅÙåÇÑ"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "ÅÙåÇÑ Çáßá"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "ÅÙåÇÑ ÇáÇÊÕÇáÇÊ"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "ÅÙåÇÑ ÇáÞæÇÆã"
 
-#: templates/index/notconfigured.inc:13
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Certains fichiers de configuration de Turba sont absents :"
-
-#: templates/browse/column_headers.inc:9
-#: templates/browse/column_headers.inc:14
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "ÇÊÌÇå ÇáÝÑÒ"
 
-#: status.php:23
-msgid "Success"
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
 msgstr "Êã ÈäÌÇÍ"
 
-#: templates/data/import.inc:18 templates/data/export.inc:18
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
+
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
+
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
+
+#: data.php:50
+msgid "TSV"
+msgstr ""
+
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Þíã ãÝÕæáÉ ÈãÓÇÍÉ"
 
-#: data.php:77
-msgid "The data got lost"
-msgstr "ÇáÈíÇäÇÊ ãÝÞæÏÉ"
-
-#: data.php:37 data.php:331 data.php:385
-msgid "The data got lost."
-msgstr "Êã ÝÞÏÇä ÇáÈíÇäÇÊ"
-
-#: data.php:426
-msgid "The file contained no data."
-msgstr "ÇáãáÝ ÎÇá ãä ÇáÈíÇäÇÊ."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
+
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Êã ÇÓÊíÑÇÏ ÏÝÊÑ ÇáÚäÇæíä ÇáÕäæÈÑí ÈäÌÇÍ"
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Êã ÇÓÊíÑÇÏ ÇáãáÝ %s ÈäÌÇÍ"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
 
-#: browse.php:55
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "áÇíæÌÏ ÏÝÊÑ ÚäÇæíä ÞÇÈá ááÊÕÝÍ."
 
-#: templates/add/noadd.inc:4
-msgid "There are no writeable address books."
-msgstr "áÇíæÌÏ ÏÝÊÑ ÚäÇæíä ÞÇÈá ááßÊÇÈÉ."
-
-#: data.php:154
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"ÊæÌÏ ãÔßáÉ Ýí ÊÍãíá ÇáãáÝ. ÞÏ íßæä ÍÌã ÇáãáÝ ÃßÈÑ ãä "
-" ÇáÍÌã ÇáÃÞÕì ÇáãÓãæÍ Èå."
+"áÇíæÌÏ ÏÝÊÑ ÚäÇæíä ãÚÏ áÅÏÎÇá ÈíÇäÇÊ ÌÏíÏÉ. ÅÐÇ ßäÊ ÊÚÊÞÏ Ãäå ÎØà ãÇ¡ ÇáÑÌÇÁ "
+"ÅÈáÇÛ ãÏíÑ ÇáäÙÇã."
 
-#: addobjectaction.php:42
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
-msgstr ""
-"ÍÕá ÎØà ÎáÇá ÇáÅÖÇÝÉ. ÇáÑÌÇÁ ÓÄÇá ãÏíÑ ÇáäÙÇã "
-"áØáÈ ÇáãÓÇÚÏÉ."
+"There was an error adding the new contact. Contact your system administrator "
+"for further help."
+msgstr "ÍÕá ÎØà ÎáÇá ÇáÅÖÇÝÉ. ÇáÑÌÇÁ ÓÄÇá ãÏíÑ ÇáäÙÇã áØáÈ ÇáãÓÇÚÏÉ."
+
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "ÍÕá ÎØà ÎáÇá ÇáÍÐÝ."
 
-#: browse.php:143
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "ÍÕá ÎØà ÎáÇá ÅäÔÇÁ ÞÇÆãÉ ÌÏíÏÉ."
 
-#: browse.php:87
-msgid "There was an error deleting this object."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "ÍÕá ÎØà ÎáÇá ÅäÔÇÁ ÞÇÆãÉ ÌÏíÏÉ."
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "ÍÕá ÎØà ÎáÇá ÇáÍÐÝ."
 
-#: deleteobject.php:35
-msgid ""
-"There was an error deleting this object. Contact your system administrator "
-"for further help."
-msgstr ""
-"ÍÕá ÎØà ÎáÇá ÇáÍÐÝ. ÇáÑÌÇÁ ÓÄÇá ãÏíÑ ÇáäÙÇã "
-"áØáÈ ÇáãÓÇÚÏÉ."
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "ÍÕá ÎØà ÎáÇá ÇáÍÐÝ."
 
-#: browse.php:220
-msgid "There was an error displaying the select List"
+#: browse.php:72
+msgid "There was an error deleting this object."
+msgstr "ÍÕá ÎØà ÎáÇá ÇáÍÐÝ."
+
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
 msgstr "ÍÕá ÎØà ÎáÇá ÅÙåÇÑ ÇáÞÇÆãÉ ÇáãÎÊÇÑÉ."
 
-#: data.php:131 data.php:308 data.php:362 data.php:416
-msgid "There was an error importing the data."
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
 msgstr "ÍÕá ÎØà ÎáÇá ÇÓÊíÑÇÏ ÇáÈíÇäÇÊ."
 
-#: data.php:176 data.php:204 data.php:321 data.php:375
-msgid "There was an error importing the uploaded file"
-msgstr "ÍÕá ÎØà ÎáÇá ÇÓÊíÑÇÏ ÇáãáÝ ÇáãÍãá."
-
-#: lib/api.php:30 lib/api.php:53
-msgid "There was an error importing the vCard data."
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
 msgstr "ÍÕá ÎØà ÎáÇá ÇÓÊíÑÇÏ ÈíÇäÇÊ ãä vCard"
 
-#: browse.php:78
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "ÍÕá ÎØà ÎáÇá ÅäÔÇÁ ÞÇÆãÉ ÌÏíÏÉ."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "ÍÕá ÎØà ÎáÇá ÇáÍÐÝ."
 
-#: templates/index/notconfigured.inc:32
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
-msgstr ""
-"íÊÍßã åÐÇ ÇáãáÝ ÈÇáÅÚÏÇÏÇÊ ÇáÇÝÊÑÇÖíÉ áÈÑíãÌÇÊ ÊæÑÈÇ¡ ßãÇ "
-"íÍÏÏ ÇáÅÚÏÇÏÇÊ ÇáÊí íãßä ááãÓÊÎÏã ÊÚÏíáåÇ."
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "ÍÕá ÎØà ÎáÇá ÇáÍÐÝ."
 
-#: templates/index/notconfigured.inc:25
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr ""
-"íÊÍßã åÐÇ ÇáãáÝ ÈáæÇÆÍ ÇáÃáæÇä æÇáÎØæØ ÅÖÇÝÉ "
-"Ãæ ÈÏáÇð ãä ÅÚÏÇÏÇÊ åæÑÏí 'Horde'."
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "ÍÕá ÎØà ÎáÇá ÇáÍÐÝ."
 
-#: templates/index/notconfigured.inc:46
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "áÇíæÌÏ ÏÝÊÑ ÚäÇæíä ÞÇÈá ááßÊÇÈÉ."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
 msgstr ""
-"íÍÊæí åÐÇ ÇáãáÝ Úáì ÇáÊÚÑíÝÇÊ ÇáÚÇãÉ áÊæÑÈÇ ÇÓãÇÁ ÇáãßæäÇÊ æäãØåÇ¡ ÚäÇæíä "
-"ÇáÈÑíÏ ¡ ÃáÎ."
 
-#: templates/index/notconfigured.inc:39
-msgid "This file defines the list of available sources for Turba."
-msgstr "íÍÊæí åÐÇ ÇáãáÝ Úáì ÞÇÆãÉ ÇáãÕÇÏÑ ÇáãÊÇÎÉ áÊæÑÈÇ."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
 
-#: templates/index/notconfigured.inc:18
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+#: data.php:269
+msgid "This file format is not supported."
 msgstr ""
-"åÐÇ ãáÝ ÇáÅÚÏÇÏÇÊ ÇáÑÆíÓí áÊæÑÈÇ æíÍæí ãÓÇÑÇÊ æ "
-"ÎíÇÑÇÊ ÌãíÚ ÈíÑãÌÇÊ ÊæÑÈÇ"
 
-#: prefs.php:86
-msgid "This number must be at least one."
-msgstr "íÌÈ Ãä íßæä åÐÇ ÇáÑÞã ÃßÈÑ ãä ÇáÕÝÑ."
-
-#: lib/api.php:271
-#, c-format
-msgid "This person already has a %s entry in the address book."
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "íÍÊæí ÏÝÊÑ ÇáÚäÇæíä ÅÏÎÇáÇÊ ÚÏÏ %s áåÐÇ ÇáÔÎÕ ."
 
-#: lib/api.php:41 lib/api.php:185
-msgid "This person is already in your address book."
-msgstr "åÐÇ ÇáÔÎÕ ãÏÑÌ Ýí ÏÝÊÑ ÇáÚäÇæíä"
-
-#: prefs.php:84
-msgid "This value must be a number."
-msgstr "íÌÈ Ãä Êßæä åÐå ÇáÞíãÉ ÑÞãÇð."
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
-#: config/attributes.php.dist:30
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "ÇááÞÈ"
 
-#: templates/index/notconfigured.inc:4
-msgid "Turba is not properly configured"
-msgstr "íæÌÏ ÎØà Ýí ÅÚÏÇÏÇÊ ÊæÑÈÇ"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#: lib/Driver.php:44
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "ÊÚÐÑ ÊÍãíá ÊÚÑíÝ: %s."
 
-#: lib/api.php:46
-msgid "Unnamed Contact"
-msgstr "ÇÊÕÇá Ïæä ÇÓã"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "ÍÝÙ ÇáÊÛííÑÇÊ"
 
-#: prefs.php:143
-msgid "User Options"
-msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
 
-#: templates/display/display.inc:77
-msgid "View map"
-msgstr "ÅÙåÇÑ ÇáÎÑíØÉ"
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "ãÌáÏ"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
 
-#: config/prefs.php.dist:86
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "ÅÙåÇÑ ÇáÇÊÕÇáÇÊ"
+
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Ôßá ÇáÅÙåÇÑ ÇáÇÝÊÑÇÖí:"
 
-#: status.php:27
-msgid "Warning"
-msgstr "ÊÍÐíÑ"
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
 
-#: config/attributes.php.dist:42
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "åÇÊÝ ÇáÚãá"
 
-#: config/attributes.php.dist:50
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "åÇÊÝ ÇáÚãá"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "åÇÊÝ ÇáÚãá"
 
-#: templates/browse/javascript.inc:18
-msgid "You are creating a distribution list."
-msgstr "íÊ ÅäÔÇÁ ÞÇÆãÉ ÊæÒíÚ."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "åÇÊÝ ÇáÚãá"
 
-#: data.php:44
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "åÇÊÝ ÇáÚãá"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "åÇÊÝ ÇáÚãá"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
+
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
+
+#: vcard.php:40
+msgid "You do not have permission to view this object."
 msgstr ""
-"áã íÊã ÊÍÏíÏ ÏáÇáÇÊ ÇáÍÞæá ãä ÇáãáÝ ÇáãÓÊæÑÏ áÊÏá Úáì ÇáÍÞæá ÇáãØÇÈÞÉ "
-"Ýí ÊæÑÈÇ."
 
-#: templates/browse/javascript.inc:33
+#: templates/browse/javascript.inc:55
+#, fuzzy
+msgid "You must select a target address book."
+msgstr "íÌÈ ÊÍÏíÏ ÇÊÕÇá æÇÍÏ Úáì ÇáÃÞá."
+
+#: templates/browse/javascript.inc:23
+#, fuzzy
+msgid "You must select a target list."
+msgstr "íÌÈ ÊÍÏíÏ ÇÊÕÇá æÇÍÏ Úáì ÇáÃÞá."
+
+#: edit.php:32
 msgid "You must select at least one contact first."
 msgstr "íÌÈ ÊÍÏíÏ ÇÊÕÇá æÇÍÏ Úáì ÇáÃÞá."
 
-#: config/prefs.php.dist:5
-msgid "Your Information"
-msgstr "ÇáÈíÇäÇÊ ÇáÔÎÕíÉ"
-
-#: prefs.php:128
-msgid "Your options have been updated."
-msgstr "Êã ÊÍÏíË ÇáÎíÇÑÇÊ."
-
-#: templates/search/row.inc:48 templates/browse/contactrow.inc:43
-#: templates/browse/contactrow.inc:61
-msgid "[Edit]"
-msgstr "[ÊÍÑíÑ]"
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+#, fuzzy
+msgid "You must select at least one entry first."
+msgstr "íÌÈ ÊÍÏíÏ ÇÊÕÇá æÇÍÏ Úáì ÇáÃÞá."
 
-#: templates/prefs/columnselect.inc:239
-msgid "add column"
-msgstr "ÅÖÇÝÉ ÚãæÏ"
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
 
-#: config/prefs.php.dist:43
-msgid "from"
-msgstr "ãä"
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
 
-#: templates/prefs/columnselect.inc:249
-msgid "move left"
-msgstr "ÊÍÑíß äÍæ ÇáíÓÇÑ"
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
 
-#: templates/prefs/columnselect.inc:251
-msgid "move right"
-msgstr "ÊÍÑíß äÍæ Çáíãíä"
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "ÊÕÝÍ"
 
-#: templates/prefs/columnselect.inc:241
-msgid "remove column"
-msgstr "ÍÐÝ ÚãæÏ"
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "ÅÙåÇÑ ÇáÇÊÕÇáÇÊ"
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "ÍÐÝ"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "ÇÓÊíÑÇÏ/ÊÕÏíÑ"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "ÅÙåÇÑ ÇáÞæÇÆã"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "ÏÝÊÑ ÚäÇæíä ÇáÊæÊí"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "ÅÙåÇÑ ÇáÇÊÕÇáÇÊ"
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Remove from this list"
+msgstr "ÇÍÐÝ ãä ÇáÞÇÆãÉ"
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "ÈÍË"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "áÇíæÌÏ"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "ÅÙåÇÑ ÇáÇÊÕÇáÇÊ"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "ÇÎÊÑ ÏÝÊÑ ÚäÇæíä"
 
-#: templates/data/import.inc:21 templates/data/export.inc:21
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/po/fa_IR.po
+++ mod/po/fa_IR.po
@@ -1,9 +1,12 @@
 # Persian translations for Turba package.
 # This file is distributed under the same license as the Turba package.
-#
+# 
 # Copyright (C) 2004 High Concil of Informatics (www.shci.ir)
-# Provided by  Amirkabir Metanetworking Ltd, 2004 <horde at metanetworking.com>
+# Provided by  Amirkabir Metanetworking Ltd, 2004 <persian-horde at metanetworking.com>
 # Mohsen Nader-Badr       <naderi at metanetworking.com>
+# Chakameh Mortezania     <mortezania at metanetworking.com>
+# Salman Niksefat         <niksefat at metanetworking.com>
+# Hamed Gheybi            <gheybi at metanetworking.com>
 # Vahid Ghafarpour        <ghafarpour at metanetworking.com>
 # Zahra Ahmadi Firouzjaee <ahmadi at metanetworking.com>
 # 
@@ -11,405 +14,521 @@
 msgstr ""
 "Project-Id-Version: Turba 2 ALPHA\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2004-11-24 11:31-0500\n"
-"PO-Revision-Date: 2004-08-04 12:45+0430\n"
-"Last-Translator: Amirkabir Metanetworking ltd. <horde at metanetworking.com>\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2005-07-08 12:45+0430\n"
+"Last-Translator: Amirkabir Metanetworking ltd. <persian-horde at metanetworking."
+"com>\n"
 "Language-Team: Persian <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "اضافه کردن یک کتابچهٔ آدرس IMSP"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "حذف کتابچهٔ آدرس IMSP"
+
+# 
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "\"%s\" در حال حاضر موجود می‌باشد و درون‌برد نشده بود."
+
+# #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
+# 
+#: browse.php:126
+#, fuzzy, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "به علّت فهرست بودن '%s' از آن رونوشت تهیّه نشد"
+
+# #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
+# 
+#: browse.php:124
+#, fuzzy, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "به علّت فهرست بودن '%s' منتقل نشد"
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
-msgstr "\"نام  نام خانوادگی\"  (مانند. وحيد غفارپور)"
+msgstr "\"نام  نام خانوادگی\""
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
-msgstr "\"نام خانوادگی، نام\"  (مانند. غفارپور، وحيد)"
+msgstr "\"نام خانوادگی  نام\""
 
 # 
-#: add.php:95
+#: add.php:109
+#, php-format
 msgid "%s added."
-msgstr "%s اضافه شد."
+msgstr "%s اضافه شد"
 
 # 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
-msgstr "فايل %s موفقيت آميز وارد شد"
+msgstr "پرونده %s با موفقیّت درون‌برد شد"
 
 # 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "%s به %s از %s"
 
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "کتابچه‌های آدرس "
+
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
-msgstr "مرورگری که iFrames را پشتيبانی کند لازم است"
+msgstr "مرورگری که iFrames را پشتیبانی کند لازم است"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
 msgstr "بالای فرم جستجو"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "جستجوی پيشرفته"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "عدم اجازهٔ دسترسی به %s"
+
+#: add.php:56 templates/browse/actions.inc:22
+msgid "Add"
+msgstr "اضافه کردن"
+
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "اضافه کردن کتابچهٔ آدرس"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "اضافه کردن و یا حذف کتابچه‌های آدرس IMSP"
 
-#: templates/prefs/columnselect.inc:238
+#: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "اضافه کردن ستون"
 
-#: templates/browse/actions.inc:33
+#: edit.php:128
+msgid "Add file"
+msgstr "اضافه کردن پرونده"
+
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "اضافه کردن به"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "کتابچه‌های آدرس "
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
-msgstr "ليست دفترچه آدرس"
+msgstr "فهرست کتابچهٔ آدرس"
 
-#: add.php:94
-msgid "Address book entry"
-msgstr "ورودی دفترچه آدرس"
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "کتابچه‌های آدرس "
 
-#: lib/Driver.php:492
-msgid "Address book is read-only."
-msgstr "دفترچه آدرس فقط خواندنی است."
+#: add.php:108
+msgid "Address book entry"
+msgstr "ورودی کتابچهٔ آدرس"
 
 # 
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
-msgstr "دفترچه آدرس باموفقيت خالی شد."
+msgstr "کتابچهٔ آدرس باموفقیّت خالی شد"
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "ورودی کتابچهٔ آدرس"
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "کتابچه آدرس‌هایی که نمایش داده نخواهند شد:"
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
-msgstr "جستجوی پيشرفته"
+msgstr "جستجوی پیشرفته"
 
 #: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "نام مستعار"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "همه"
 
-#: lib/api.php:372
+#: lib/api.php:552
 msgid "Already Exists"
-msgstr "هم اکنون موجود می‌باشد"
+msgstr "از قبل موجود می‌باشد"
 
 # 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
-msgstr "آيا مطمئنيد که می‌خواهيد %s را پاک کنيد؟"
+msgstr "آیا مطمئنید که می‌خواهید %s را حذف کنید؟"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
-msgstr "آيا مطمئنيد که می‌خواهيد ورودی‌های انتخاب شده را پاک کنيد؟"
+msgstr "آیا مطمئنید که می‌خواهید ورودی‌های انتخاب شده را حذف کنید؟"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "صعودی"
 
-#: templates/prefs/columnselect.inc:234
-msgid "Available Columns:"
-msgstr "ستون‌های قابل دسترسی:"
-
-# 
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "بازگشت به %s"
-
-# 
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "بازگشت به %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "جستجوی ابتدايی"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
-msgstr "جستجوی ابتدايی"
+msgstr "جستجوی ساده"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
-msgstr "فرم جستجوی زير"
+msgstr "زیر فرم جستجو"
 
 # 
-#: lib/Driver/ldap.php:75 lib/Driver/ldap.php:78
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
-msgstr "مقيد سازی انجام نشد: (%s) %s"
+msgstr "پیوستن ناموفّق بود: (%s) %s"
 
-#: config/attributes.php.dist:168
+#: config/attributes.php.dist:178
 msgid "Birthday"
-msgstr ""
+msgstr "روز تولد"
 
-#: config/attributes.php.dist:163
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "مرور"
+
+#: config/attributes.php.dist:173
 msgid "Business Category"
-msgstr "گروه تجاری"
+msgstr "دسته تجاری"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "پاک کردن جستجو"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "نمی‌توان یک گروه را به خودش اضافه کرد."
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
-msgstr "بررسی  همه/هيچ"
+msgstr "بررسی  همه/هیچ‌کدام"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"يک کشوی پيش فرض برای دفترچه آدرس، ليست ارتباط، و جستجوی شخصی خود انتخاب کنيد."
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "انتخاب یک کتابچهٔ آدرس "
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
-msgstr "يک فترچه آدرس انتخاب کنيد"
+msgstr "انتخاب یک کتابچهٔ آدرس "
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "ترتيب ستونها را برای نمايش در ليست آدرس‌ها انتخاب کنيد."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "انتخاب یک کتابچهٔ آدرس: "
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr "انتخاب کتابچه‌های آدرس و تعیین ترتیب آنها برای نمایش"
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "انتخاب کتابچهٔ آدرس‌های مورد استفاده "
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "پاک کردن جستجو"
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "انتخاب نام و ترتیب ستونهای نمایش داده شده:"
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
-msgstr "حالات ستونی"
+msgstr "گزینه‌های ستونی"
+
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "ستونهایی که نمایش داده نخواهند شد:"
 
-#: templates/data/export.inc:16 templates/data/import.inc:18
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
-msgstr "مقادير جدا شده توسط ويرگول"
+msgstr "مقادیر جدا شده توسط ویرگول"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
-msgstr "مقادير جدا شده توسط ويرگول (Microsoft Outlook)"
+msgstr "مقادیر جدا شده توسط ویرگول (Microsoft Outlook)"
 
 #: config/attributes.php.dist:76
 msgid "Company"
 msgstr "شرکت"
 
-#: config/attributes.php.dist:134
+#: config/attributes.php.dist:144
 msgid "Company Address"
 msgstr "آدرس شرکت"
 
-#: lib/api.php:611 lib/api.php:781
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
 #, php-format
 msgid "Connection failed: %s"
-msgstr "اتصال با مشکل روبرو شد: %s"
+msgstr "اتصال ناموفّق بود: %s"
 
-#: lib/Driver/ldap.php:64
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
-msgstr "مشکل ارتباط"
+msgstr "خرابی ارتباط"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr "تماس به فهرست اضافه شد."
 
-#: browse.php:85
+#: browse.php:60
 msgid "Contact removed from list."
-msgstr "اطلاعات تماس از ليست برداشته شد."
+msgstr "تماس از فهرست حذف شد."
 
 # 
-#: browse.php:267
+#: browse.php:266
 #, php-format
 msgid "Contacts in list: %s"
-msgstr "تماس‌ها در ليست: %s"
-
-# 
-#: browse.php:289
-#, php-format
-msgid "Contents of %s"
-msgstr "محتويات %s"
+msgstr "تماس‌ها در فهرست: %s"
 
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:12
 msgid "Copy"
-msgstr "نسخه برداری"
+msgstr "رونوشت"
+
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
+msgstr "ایجاد شده"
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "کتابچهٔ آدرس خصوصی"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr "ایجاد یک فهرست تماس جدید در:"
 
 #: lib/ObjectView.php:133
 msgid "Created"
-msgstr "ايجاد شده"
+msgstr "ایجاد شده"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "نمايش پيش فرض"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "کشوی پيش فرض برای دفترچه آدرس، ليست ارتباط، و جستجوی شخصی شما."
-
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
-msgstr "جهت مرتب سازی پيش فرض"
+msgstr "جهت مرتب سازی پیش فرض:"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
-msgstr "پاک کردن"
+msgstr "حذف"
+
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "حذف کتابچهٔ آدرس IMSP"
 
-#: config/prefs.php.dist:35
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
-msgstr "تاييد پاک کردن"
+msgstr "تأیید حذف"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
-msgstr "رفتار دکمه حذف"
+msgstr "رفتار کلید حذف"
 
 # 
-#: lib/Driver/ldap.php:267
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
-msgstr "پاک کردن با مشکل روبرو شد: (%s) %s"
+msgstr "حذف ناموفّق بود: (%s) %s"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
-msgstr "پاک کردن با مشکل روبرو شد"
+msgstr "حذف ناموفّق بود"
 
-#: config/attributes.php.dist:203
+#: config/attributes.php.dist:213
 msgid "Department"
 msgstr "اداره"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "نزولی"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
-msgstr "کشو"
+msgstr "شاخه"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "نمایش"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
-msgstr "نشان دادن انتخابها"
+msgstr "گزینه‌های نمایش"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
-msgstr "آيا می‌خواهيد ورودی‌ها را پاک کنيد؟"
+msgstr "آیا می‌خواهید حذف ورودی‌ها را تأیید کنید؟"
 
-#: templates/browse/contactrow.inc:29
-msgid "Download VCard"
-msgstr "دريافت VCard"
+#: lib/Object.php:297
+msgid "Download"
+msgstr "استقرار"
 
-#: templates/browse/contactrow.inc:29
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
-msgstr "دريافت VCard"
+msgstr "استقرار vCard"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:37
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
-msgstr "ويرايش"
+msgstr "ویرایش"
 
 # 
-#: templates/browse/contactrow.inc:37
-#, php-format
-msgid "Edit '%s'"
-msgstr "ويرايش '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "ویرایش '%s'"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "کتابچه‌های آدرس "
 
 # 
-#: edit.php:53 edit.php:80
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
-msgstr "ورودی را برای %s ويرايش کنيد"
+msgstr "ویرایش ورودی برای %s "
 
 #: config/attributes.php.dist:58
 msgid "Email"
-msgstr "پست الکترونيک"
+msgstr "پست الکترونیک"
+
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr "ورودی برای %s بروزرسانی شد اما حفظ پروندهٔ ارسال شده ناموفّق بود: %s"
 
 # 
-#: edit.php:79
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
-msgstr "ورودی برای %s به روز شد."
+msgstr "ورودی برای %s بروزرسانی شد"
+
+#: browse.php:74
+msgid "Entry successfully deleted."
+msgstr "ورودی با موفقیّت حذف شد"
+
+# 
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "دسترسی به کتابچهٔ آدرس ناموفّق بود: %s"
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
-msgstr "صادر کردن"
+msgstr "برون‌برد"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
-msgstr "صادر کردن دفترچه آدرس"
+msgstr "برون‌برد کتابچهٔ آدرس"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
-msgstr "صادر کردن اطلاعات تماس انتخاب شده"
+msgstr "برون‌برد اطلاعات تماس انتخابی"
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
-msgstr "دفترچه روبرو را بطور کامل صادر کن"
+msgstr "برون‌برد کتابچهٔ آدرس زیر بطور کامل"
 
 # 
-#: browse.php:62 browse.php:120 browse.php:135 add.php:71 data.php:110
-#: data.php:228 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
-msgstr "دسترسی به دفترچه آدرس با مشکل روبرو شد: %s"
+msgstr "دسترسی به کتابچهٔ آدرس ناموفّق بود: %s"
 
 # 
-#: browse.php:145
+#: browse.php:139
 #, php-format
 msgid "Failed to add %s to %s: %s"
-msgstr "اضافه کردن %s به %s با مشکل روبرو شد: %s"
+msgstr "اضافه کردن %s به %s ناموفّق بود: %s"
 
 #: browse.php:272
 msgid "Failed to browse list"
-msgstr "مرور ليست با مشکل روبرو شد"
+msgstr "مرور فهرست ناموفّق بود"
 
-#: browse.php:303
+#: browse.php:310
 msgid "Failed to browse the directory"
-msgstr "مرور کشو با مشکل روبرو شد"
+msgstr "مرور شاخه ناموفّق بود"
 
 # 
-#: lib/Driver/ldap.php:304
+#: lib/Driver/ldap.php:309
 #, php-format
-msgid "Failed to change name: (%s) %s, %s"
-msgstr "تغيير نام با مشکل روبرو شد: (%s) %s, %s"
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr "تغییر نام ناموفّق بود:  (%s) %s؛ DN قبلی= %s ، DN جدید= %s ، ریشه=  %s"
 
 # 
-#: browse.php:140
+#: browse.php:120
 #, php-format
 msgid "Failed to find object to be added: %s"
-msgstr "پيدا کردن شیء برای اضافه کردن با مشکل روبرو شد: %s"
+msgstr "پیدا کردن شیء اضافه‌ شده ناموفّق بود: %s"
+
+# 
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "دسترسی به کتابچهٔ آدرس ناموفّق بود: %s"
 
 # 
-#: data.php:124 search.php:85
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
-msgstr "جستجوی کشو با مشکل روبرو شد: %s"
+msgstr "جستجوی شاخه ناموفّق بود: %s"
 
-#: config/attributes.php.dist:157
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "دورنگار"
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+msgid "Files"
+msgstr "پرونده‌ها‌"
+
+#: templates/browse/search.inc:70
 msgid "Find"
-msgstr "پيداکردن"
+msgstr "پیداکردن"
+
+#: edit.php:97 edit.php:187
+msgid "Finish"
+msgstr "خاتمه"
 
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "نام"
 
-#: config/attributes.php.dist:192
+#: config/attributes.php.dist:202
 msgid "Freebusy URL"
-msgstr "Freebusy URL"
+msgstr "URL آزاد/مشغول"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "از"
 
-#: config/sources.php.dist:521
+#: config/sources.php.dist:604
 msgid "Global Address Book"
-msgstr "دفترچه آدرس سراسری"
+msgstr "کتابچهٔ آدرس سراسری"
 
-#: templates/browse/column_headers.inc:10 templates/browse/contactrow.inc:48
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "گروه"
 
@@ -417,659 +536,825 @@
 msgid "Home Address"
 msgstr "آدرس منزل"
 
-#: config/attributes.php.dist:88
+#: config/attributes.php.dist:93
 msgid "Home City"
 msgstr "شهر محل سکونت"
 
-#: config/attributes.php.dist:103
+#: config/attributes.php.dist:108
 msgid "Home Country"
 msgstr "کشور محل اقامت"
 
-#: config/attributes.php.dist:140
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "شماره تلفن منزل"
 
-#: config/attributes.php.dist:98
+#: config/attributes.php.dist:103
 msgid "Home Postal Code"
 msgstr "کد پستی محل سکونت"
 
-#: config/attributes.php.dist:93
+#: config/attributes.php.dist:98
 msgid "Home State/Province"
-msgstr "ايالت/استان محل سکونت"
+msgstr "ایالت/استان محل سکونت"
 
-#: config/sources.php.dist:457
+#: config/attributes.php.dist:88
+msgid "Home Street Address"
+msgstr "آدرس خیابان محل سکونت"
+
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr "IMSP"
 
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "سرپرستی کتابچهٔ آدرس IMSP"
+
 # 
-#: templates/data/import.inc:9
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
-msgstr "وارد کردن دفترچه آدرس، گام %d"
+msgstr "درون‌برد کتابچهٔ آدرس، گام %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
-msgstr "وارد کردن/صادرکردن دفترچه‌های آدرس"
+msgstr "درون‌برد/برون‌برد کتابچه‌های آدرس"
 
-#: lib/api.php:358 lib/api.php:577
-msgid "Invalid Content-Type"
-msgstr "نوع محتوی غيرمعتبر"
-
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:596 lib/api.php:683
 msgid "Invalid ID"
-msgstr "کليد غير معتبر"
+msgstr "ID نامعتبر"
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:852
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
-msgstr "دفترچه آدرس غير معتبر"
+msgstr "کتابچهٔ آدرس نامعتبر"
 
-#: lib/api.php:856 lib/api.php:927 lib/api.php:979
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
-msgstr "پست الکترونيکی غير معتبر"
+msgstr "پست الکترونیکی نامعتبر"
 
-#: lib/api.php:864
+#: lib/api.php:1089
 msgid "Invalid entry"
-msgstr "ورودی غيرمعتبر"
+msgstr "ورودی نامعتبر"
 
-#: lib/Driver/ldap.php:263
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
-msgstr "کليد غير معتبر مشخص شده است."
+msgstr "کلید نامعتبر مشخص شد"
 
-#: lib/api.php:860
+#: lib/api.php:1085
 msgid "Invalid name"
-msgstr "نام غير معتبر"
+msgstr "نام نامعتبر"
 
-#: lib/api.php:560
+#: lib/api.php:735
 msgid "Invalid objectId"
-msgstr "ورودی غيرمعتبر"
+msgstr "id شیء نامعتبر"
 
-#: lib/Driver/ldap.php:39
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
-msgstr "پشتيبانی LDAP نياز است اما قسمت LDAP قابل دسترسی نيست يا بار نشده‌است."
+msgstr ""
+"پشتیبانی LDAP مورد نیاز است. اما مدول LDAP قابل دسترسی نیست و یا اینکه بار "
+"نشده‌است."
 
 #: lib/ObjectView.php:138
 msgid "Last Modified"
-msgstr "آخرين اصلاح"
+msgstr "آخرین اصلاح"
 
 #: config/attributes.php.dist:53
 msgid "Last Name"
 msgstr "نام خانوادگی"
 
-#: templates/browse/search.inc:79
+#: templates/browse/column_headers.inc:16
+msgid "List"
+msgstr "فهرست"
+
+#: templates/browse/search.inc:77
 msgid "Matching"
-msgstr "مطابق بودن"
+msgstr "تطابق"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr "بیشینهٔ تعداد تماسها"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
-msgstr "بيشترين تعداد صفحات"
+msgstr "بیشينهٔ تعداد صفحات"
+
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "فهرست گزینگان"
 
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
 msgstr "جستجوی محدود"
 
-#: lib/Driver/ldap.php:298
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
-msgstr "نبودن DN در متن اصلی پيکربندی LDAP"
+msgstr "عدم وجود DN در پیکربندی LDAP"
 
-#: config/attributes.php.dist:152
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "تلفن همراه"
 
 # 
-#: lib/Driver/ldap.php:326 lib/Driver/ldap.php:343
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
-msgstr "اصلاح با مشکل روبرو شد: (%s) %s"
+msgstr "تغییر ناموفّق بود: (%s) %s"
 
-#: lib/api.php:965
+#: lib/api.php:1193
 msgid "More than 1 entry found"
-msgstr "بيش از 1 ورودی پيدا شد"
+msgstr "بیش از یک ورودی پیدا شد"
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:11
 msgid "Move"
-msgstr "جابجا کردن"
+msgstr "انتقال"
 
-#: templates/prefs/columnselect.inc:248
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
-msgstr "جابجايی به چپ"
+msgstr "انتقال به چپ"
 
-#: templates/prefs/columnselect.inc:250
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
-msgstr "جابجايی به راست"
+msgstr "انتقال به راست"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
-msgstr "دفترچه آدرس Mulberry "
+msgstr "کتابچهٔ آدرس Mulberry "
 
 # 
-#: lib/api.php:886
+#: lib/api.php:1113
+#, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
-msgstr "چند نفر با آدرس [%s], اما هيچ کدام با نام [%s] در دفترچه آدرس نيست."
+msgstr ""
+"چند نفر با آدرس [%s], اما هیچ‌کدام با نام [%s] در کتابچهٔ آدرس از قبل موجود "
+"نیست."
 
-#: config/sources.php.dist:165 config/sources.php.dist:294
-msgid "My Addressbook"
-msgstr "دفترچه آدرس من"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "کتابچهٔ آدرس من"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "کتابچه‌های آدرس "
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "نام"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "قالب نام"
 
-#: config/sources.php.dist:72
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
-msgstr "کشوی اعضای Netcenter"
+msgstr "شاخهٔ اعضای Netcenter"
 
-#: add.php:45 add.php:111 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
-msgstr "تماس جديد"
-
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "ليست جديد"
+msgstr "تماس جدید"
 
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
-msgstr "بعدی"
+msgstr "گام بعد"
 
-#: config/attributes.php.dist:208
+#: config/attributes.php.dist:218
 msgid "Nickname"
 msgstr "نام مستعار"
 
 # 
-#: lib/api.php:967 lib/api.php:1016
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
 msgid "No %s entry found for %s"
-msgstr "هيچ ورودی %s برای %s پيدا نشد"
+msgstr "هیچ ورودی %s برای %s پیدا نشد"
 
-#: lib/api.php:936
+#: lib/api.php:1163
 msgid "No address books found."
-msgstr "دفترچه آدرسی پيدا نشد."
+msgstr "کتابچهٔ آدرسی پیدا نشد"
 
-#: minisearch.php:85
+#: minisearch.php:83
 msgid "No contacts found"
-msgstr "هيچ تماسی پيدا نشد"
+msgstr "هیچ تماسی پیدا نشد"
 
-#: lib/api.php:338
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
-msgstr "هيچ داده vCard ای پيدا نشد."
+msgstr "هیچ دادهٔ vCard پیدا نشد"
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
-msgstr "هيچ"
+msgstr "هیچ"
 
-#: config/attributes.php.dist:174
+#: config/attributes.php.dist:184
 msgid "Notes"
-msgstr "يادداشتها"
+msgstr "یادداشتها"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
-msgstr "تعداد بخش‌ها در هر صفحه"
+msgstr "تعداد موارد در هر صفحه"
 
-#: lib/api.php:436
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
-msgstr "شیئ پيدا نشد"
+msgstr "شیء پیدا نشد"
 
-#: config/attributes.php.dist:213
+#: config/attributes.php.dist:223
 msgid "Office"
 msgstr "دفتر کار"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr "تنها یک vcard پشتیبانی می‌شود"
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
-msgstr "حالتهای ديگر"
+msgstr "گزینه‌های دیگر"
 
-#: config/attributes.php.dist:180
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
-msgstr "کليد عمومی PGP"
+msgstr "کلید عمومی PGP"
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:870
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
-msgstr "اجازه دسترسی رد شده است"
+msgstr "عدم وجود مجوز"
 
-#: lib/Driver.php:453
+#: lib/Driver.php:543
 msgid "Permission denied"
-msgstr "اجازه دسترسی رد شده است"
+msgstr "عدم وجود مجوز"
+
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "عدم وجود مجوز"
 
-#: data.php:32 templates/data/import.inc:22
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
-msgstr "دفترچه آدرس Pine"
+msgstr "کتابچهٔ آدرس Pine"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
-msgstr "لطفاً نامی برای ليست جديد وارد کنيد:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "لطفاً به فهرست تماس جدید نامی دهید:"
 
-#: templates/prefs/columnselect.inc:219
-msgid "Please select a directory:"
-msgstr "لطفاً يک کشو انتخاب کنيد:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr "قبلی"
 
-#: config/sources.php.dist:373
+#: config/sources.php.dist:416
 msgid "Private Address Book"
-msgstr "دفترچه آدرس مخفی"
+msgstr "کتابچهٔ آدرس خصوصی"
 
 # 
-#: lib/Driver/ldap.php:139
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
-msgstr "پرس و جو با مشکل روبرو شد: (%s) %s"
+msgstr "پرس‌وجو ناموفّق بود: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
-msgstr "جستجوی سريع"
+msgstr "جستجوی سریع"
 
 # 
-#: lib/Driver/ldap.php:183 lib/Driver/ldap.php:191 lib/Driver/ldap.php:423
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
-msgstr "خواندن با مشکل روبرو شد: (%s) %s"
+msgstr "خواندن ناموفّق بود: (%s) %s"
 
-#: templates/browse/footer.inc:6
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "آیا واقعاْ این تماس حذف شود؟"
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
-msgstr "رکوردها نمايش داده شده اند:"
+msgstr "رکوردهای نمایش داده شده:"
+
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "حذف کتابچهٔ آدرس "
 
-#: templates/prefs/columnselect.inc:240
+#: templates/prefs/columnselect.inc:239
 msgid "Remove column"
-msgstr "برداشتن ستون"
+msgstr "حذف ستون"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
-msgstr "برداشتن از اين ليست"
+msgstr "حذف از این فهرست"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"آُيا دفترچه آدرس موجود با دفترچه آدرس وارد شده جابجا شود؟ <b>اخطار: اين عمل "
-"تمامی ورودی‌های دفترچه آدرس کنونی شما را پاک می‌کند.</b>"
+"آیا کتابچه آدرس موجود با کتابچهٔ آدرس درون‌برد شده جابجا شود؟ <strong>اخطار: "
+"این عمل تمامی ورودی‌های کتابچهٔ آدرس کنونی شما را حذف می‌کند.</strong>"
 
-#: lib/Driver.php:343
+#: lib/Driver.php:438
 msgid "Requested object not found."
-msgstr "شیء خواسته شده پيدا نشد."
+msgstr "شیء خواسته شده پیدا نشد"
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
-msgstr "بازگشت به پيش‌فرض‌ها"
+msgstr "بازنشانی پیش فرض‌ها"
 
-#: config/attributes.php.dist:186
+#: config/attributes.php.dist:196
 msgid "S/MIME Public Certificate"
 msgstr "گواهی عمومی S/MIME"
 
-#: add.php:46 edit.php:57
+# 
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr "STARTTLS ناموفّق بود (%s) %s"
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
-msgstr "ذخيره کردن"
+msgstr "حفظ"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "جستجو"
 
-#: browse.php:252 minisearch.php:66
-msgid "Search Results"
-msgstr "نتايج جستجو"
+#: minisearch.php:63
+msgid "Search Results:"
+msgstr "نتایج جستجو:"
 
-#: lib/api.php:786
+#: lib/api.php:1011
 msgid "Search failed"
-msgstr "جستجو با مشکل روبرو شد"
+msgstr "جستجو ناموفّق بود"
 
-#: lib/api.php:876 lib/api.php:882 lib/api.php:891 lib/api.php:904
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
-msgstr "جستجو با مشکل روبرو شد: %s"
+msgstr "جستجو ناموفّق بود: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "حالت‌های جستجو"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
-msgstr "جستجو کردن..."
-
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "دفترچه آدرس انتخاب کنيد"
+msgstr "جستجو..."
 
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "ليست انتخاب کنيد"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "انتخاب کتابچهٔ آدرس برای برون‌برد از:"
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "انتخاب کتابچهٔ آدرس برای درون‌برد به:"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
-msgstr "دفترچه آدرس را برای صادر کردن انتخاب کنيد:"
+msgstr "انتخاب کتابچهٔ آدرس برای برون‌برد از:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
-msgstr "دفترچه آدرس را برای واردکردن انتخاب کنيد:"
+msgstr "انتخاب کتابچهٔ آدرس برای درون‌برد به:"
+
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "انتخاب مجموعهٔ نویسه پروندهٔ سرچشمه:"
 
-#: templates/data/export.inc:14
+#: templates/data/export.inc:10
 msgid "Select the export format:"
-msgstr "قالب خروجی را انتخاب کنيد:"
+msgstr "انتخاب قالب برون‌برد:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
-msgstr "انتخاب  فايل برای واردکردن:"
+msgstr "انتخاب  پرونده برای درون‌برد:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
-msgstr "انتخاب قالب فايل منبع:"
+msgstr "انتخاب قالب پروندهٔ سرچشمه:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
-msgstr "انتخاب قالب برای نمايش اسامی:"
+msgstr "انتخاب قالب نمایش اسامی:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "انتخاب نمايش پيش فرض."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr "انتخاب نحوهٔ نمایش پیش فرض، گزینه‌های مرتب‌ سازی و گزینه‌های صفحه‌بندی"
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
-msgstr "انتخاب کنيد که کدام فيلدها در ليست آدرس نمايش داده شوند."
+msgstr "انتخاب فیلدهایی که در فهرست آدرسها نمایش داده می‌شوند"
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
-msgstr "انتخاب کنيد کدام قالب اسامی را نمايش دهند."
-
-#: templates/prefs/columnselect.inc:244
-msgid "Selected Columns:"
-msgstr "ستونهای انتخاب شده:"
+msgstr "انتخاب قالب نمایش اسامی"
 
 # 
-#: add.php:59
-#, php-format
-msgid "Selected address book '%s'."
-msgstr "دفترچه آدرس '%s' انتخاب شده."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "کتابچهٔ آدرس '%s' انتخاب شده."
 
-#: config/sources.php.dist:230
+#: config/sources.php.dist:173
 msgid "Shared Directory"
-msgstr "کشوی مشترک"
-
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "نشان دادن همه"
+msgstr "شاخهٔ مشترک"
 
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "نشان دادن"
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr "نمایش %s"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:41
 msgid "Show All"
-msgstr "نشان دادن همه"
+msgstr "نمایش همه"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
-msgstr "نشان دادن تماسها"
+msgstr "نمایش تماسها"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
-msgstr "نشان دادن ليستها"
+msgstr "نمایش فهرست‌ها"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "نشان دادن تماسها"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "نشان دادن ليستها"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
-msgstr "مرتب سازی جهت‌ها"
+msgstr "جهت مرتب سازی"
 
-#: lib/api.php:154
+#: lib/api.php:198
 msgid "Sources"
-msgstr "متن‌های اصلی"
+msgstr "سرچشمه‌ها"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
-msgstr "مشخص کنيد که نتايج جستجوی پيشرفته کجا بيايند."
+msgstr "مشخص کردن محل نمایش نتایج جستجوی پیشرفته"
 
 # 
-#: browse.php:147
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
-msgstr "%s موفقيت آميز به %s اضافه شد"
+msgstr "%s با موفقیّت به %s اضافه شد"
+
+# #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
+# 
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "فهرست تماس \"%s\" با موفقیّت ایجاد شد"
 
-#: data.php:29
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/export.inc:18 templates/data/import.inc:19
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
-msgstr "فاصله چندتايی مقادير را جدا کرده است"
+msgstr "مقادیر جدا شده با فاصلهٔ چندتایی"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr "پشتیبان VFS باید پیکربندی شود تا پیوستها بتوانند دریافت شوند."
+
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "کتابچهٔ آدرس  \"%s\"موجود نیست"
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "کتابچهٔ آدرس  \"%s\"موجود نیست"
+
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "کتابچهٔ آدرس  \"%s\"موجود نیست"
+
+# 
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "کتابچهٔ آدرس باموفقیّت خالی شد"
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
-msgstr "دفترچه آدرس را خالی نشد: %s"
+msgstr "نمی‌توان کتابچهٔ آدرس را خالی کرد: %s"
 
-#: display.php:23 edit.php:24 vcard.php:22
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
-msgstr "اطلاعات تماس درخواستی شما موجود نيست."
+msgstr "تماس درخواستی شما موجود نیست"
 
-#: browse.php:58
+#: edit.php:116
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "پروندهٔ \"%s\" با موفقیّت حذف شد"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "درون‌برد علی‌رغم وجود اخطار می‌تواند خاتمه یابد"
+
+#: browse.php:31
 msgid "There are no browseable address books."
-msgstr "دفترچه آدرس‌های قابل مرور موجود نمی‌باشند."
+msgstr "کتابچهٔ آدرس‌ قابل مروری موجود نمی‌باشند"
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
 "is an error, please contact your system administrator."
 msgstr ""
-"دفترچه‌های آدرس قابل نوشتن موجود نيستند.هيچ يک از دفترچه‌های آدرس قابل دسترسی "
-"برای اضافه کردن ورودی جديد به آنها، پيکربندی نشده اند. اگر فکر می‌کنيد اين "
-"خطاست، لطفاً با مدير سيستم خود تماس بگيريد."
+"کتابچهٔ آدرس قابل نوشتن موجود نیست. هیچ یک از کتابچه‌های آدرس قابل دسترسی، "
+"برای اضافه کردن ورودی جدید به آنها، پیکربندی نشده‌اند. اگر فکر می‌کنید این "
+"حالت یک خطاست، لطفاً با سرپرست سامانه خود تماس بگیرید."
 
-#: add.php:107
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
-"خطايی در اضافه کردن تماس جديد رخ داده است. برای راهنمايی بيشتر با مسئول "
-"سيستم خود تماس بگيريد."
+"خطایی در اضافه کردن تماس جدید رخ داده است. برای راهنمایی بیشتر با سرپرست "
+"سامانهٔ خود تماس بگیرید."
+
+#: browse.php:189 browse.php:230
+msgid "There was an error adding this object."
+msgstr "خطایی در اضافه کردن این شیء رخ داده است."
 
-#: browse.php:204
+#: browse.php:238
 msgid "There was an error creating a new list."
-msgstr "خطايی در ايجاد يک ليست جديد رخ داده است."
+msgstr "خطایی در ایجاد یک لیست جدید رخ داده است."
 
 # 
-#: browse.php:154
-#, php-format
-msgid "There was an error deleting %s from the source address book."
-msgstr "خطايی در پاک کردن %s از متن اصلی دفترچه آدرس رخ داده است."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "خطایی در بروزرسانی این ورودی رخ داده است: %s"
+
+# 
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "خطایی در حذف %s از کتابچهٔ آدرس سرچشمه رخ داده است."
 
 # 
-#: delete.php:31
+#: delete.php:37
+#, php-format
 msgid "There was an error deleting this contact: %s"
-msgstr "خطايی در پاک کردن تماس رخ داده است: %s."
+msgstr "خطایی در حذف تماس رخ داده است: %s."
 
-#: browse.php:93
+#: browse.php:72
 msgid "There was an error deleting this object."
-msgstr "خطايی در پاک کردن اين شیء رخ داده است."
+msgstr "خطایی در حذف این شیء رخ داده است."
 
-#: browse.php:282
-msgid "There was an error displaying the select List"
-msgstr "خطايی در نمايش ليست انتخاب شده رخ داده است."
+#: browse.php:278
+msgid "There was an error displaying the list"
+msgstr "خطایی در نمایش فهرست رخ داده است."
 
 # 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
-msgstr "خطايی در وارد کردن داده رخ داده است: %s"
+msgstr "خطایی در درون‌برد داده رخ داده است: %s"
 
-#: lib/api.php:334
+#: lib/api.php:507 lib/api.php:761
 msgid "There was an error importing the iCalendar data."
-msgstr "خطايی در وارد کردن داده iCalendar رخ داده است."
+msgstr "خطایی در درون‌برد دادهٔ iCalendar رخ داده است."
+
+#: browse.php:58
+msgid "There was an error removing a contact from the list."
+msgstr "خطایی در حذف یک تماس از فهرست رخ داده است."
+
+# 
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "خطایی در حذف %s از کتابچهٔ آدرس سرچشمه رخ داده است."
 
-#: browse.php:83
-msgid "There was an error removing this object."
-msgstr "خطايی در برداشتن اين شیء رخ داده است."
+# 
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "خطایی در بروزرسانی این ورودی رخ داده است: %s"
 
 # 
-#: edit.php:84
+#: edit.php:158
 #, php-format
 msgid "There was an error updating this entry: %s"
-msgstr "خطايی در به روز کردن اين ورودی رخ داده است: %s"
+msgstr "خطایی در بروزرسانی این ورودی رخ داده است: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
-msgstr "آدرسی برای صادر کردن وجود ندارد."
+msgstr "آدرسی برای برون‌برد نمودن موجود نیست."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "این کتابچه‌های آدرس با این ترتیب نمایش داده خواهند شد:"
 
-#: lib/Driver.php:403 lib/Driver.php:444
-msgid "This address book is read-only"
-msgstr "دفترچه آدرس فقط خواندنی است."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "این ستونها با این ترتیب نمایش داده خواهند شد:"
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
-msgstr "قالب اين فايل پشتيبانی نشده است."
+msgstr "قالب این پرونده پشتیبانی نمی‌شود."
 
 # 
-#: lib/api.php:895 lib/api.php:908
+#: lib/api.php:1122 lib/api.php:1135
 #, php-format
 msgid "This person already has a %s entry in the address book"
-msgstr "اين فرد هم اکنون يک ورودی %s در دفترچه آدرس دارد."
+msgstr "این فرد هم اکنون یک ورودی %s در کتابچهٔ آدرس دارد."
+
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "عنوان"
 
-#: lib/Driver.php:816
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
-msgstr "نمی‌توان تعريف %s را بارکرد."
+msgstr "نمی‌توان تعریف %s را بارکرد."
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
-msgstr "خنثی کردن تغييرات"
+msgstr "واگرداندن تغییرات"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
-msgstr "Content-Type پشتيبانی نشده"
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "نوع متن بدون پشتیبانی: %s"
 
-#: config/sources.php.dist:131
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
-msgstr "کشوی Verisign"
+msgstr "شاخهٔ Verisign"
 
 # 
-#: templates/browse/contactrow.inc:31
-#, php-format
-msgid "View '%s'"
-msgstr "نمايش '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
+msgstr "نمایش '%s'"
 
-#: minisearch.php:80
+#: minisearch.php:78
 msgid "View Contact"
-msgstr "نمايش تماس"
+msgstr "نمایش تماس"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
-msgstr "نمايش پيش فرض"
+msgstr "نمایش پیش فرض"
 
-#: config/attributes.php.dist:198
+#: config/attributes.php.dist:208
 msgid "Website URL"
-msgstr "آدرس تارنما"
+msgstr "URL وب‌گاه"
 
-#: config/attributes.php.dist:108
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "آدرس محل کار"
 
-#: config/attributes.php.dist:114
+#: config/attributes.php.dist:124
 msgid "Work City"
 msgstr "شهر محل کار"
 
-#: config/attributes.php.dist:129
+#: config/attributes.php.dist:139
 msgid "Work Country"
 msgstr "کشور محل کار"
 
-#: config/attributes.php.dist:146
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "تلفن محل کار"
 
-#: config/attributes.php.dist:124
+#: config/attributes.php.dist:134
 msgid "Work Postal Code"
 msgstr "کدپستی محل کار"
 
-#: config/attributes.php.dist:119
+#: config/attributes.php.dist:129
 msgid "Work State/Province"
-msgstr "ايالت/استان محل کار"
+msgstr "ایالت/استان محل کار"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "شما يک ليست توزيع شده ايجاد کرديد."
+#: config/attributes.php.dist:119
+msgid "Work Street Address"
+msgstr "آدرس خیابان محل کار"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "شما مجوز ایجاد بیش از %d تماس را در \"%s\" ندارید"
 
-#: display.php:48 edit.php:44
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
-msgstr "شما اجازه ديدن اين تماس را نداريد."
+msgstr "شما مجوز مشاهدهٔ این تماس را ندارید."
 
 #: vcard.php:40
 msgid "You do not have permission to view this object."
-msgstr "شما اجازه ديدن اين شیء را نداريد."
+msgstr "شما مجوز مشاهدهٔ این شیء را ندارید."
 
-#: templates/browse/javascript.inc:41
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
-msgstr "شما بايد يک دفترچه آدرس مشخص کنيد."
+msgstr "شما باید یک کتابچهٔ آدرس مقصد انتخاب کنید."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
-msgstr "شما بايد يک ليست مشخص کنيد."
+msgstr "شما باید یک فهرست مقصد مشخص کنید."
 
-#: templates/browse/javascript.inc:58
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "شما در ابتدا باید حداقل یک تماس انتخاب کنید."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
-msgstr "شما در ابتدا بايد حداقل يک ورودی انتخاب کنيد."
+msgstr "شما در ابتدا باید حداقل یک ورودی انتخاب کنید."
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
-msgstr "شما فقط مجاز به ديدن اين تماس هستيد."
+msgstr "شما فقط مجاز به دیدن این تماس هستید."
+
+#: browse.php:285
+#, fuzzy
+msgid "Your default address book is not browseable."
+msgstr "کتابچهٔ آدرس پیش فرض شما قابل مرور نیست"
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[بدون مقدار]"
 
-#: lib/Turba.php:236
-msgid "_Add"
-msgstr "اضافه کردن"
-
-#: lib/Turba.php:235
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "مرور"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr "نماسها"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
-msgstr "_پاک کردن"
+msgstr "حذف"
 
-#: lib/Turba.php:241
+#: lib/Turba.php:493
 msgid "_Import/Export"
-msgstr "وارد کردن/صادرکردن"
+msgstr "درون‌برد/برون‌برد"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:39
+msgid "_Lists"
+msgstr "فهرست‌ها"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "کتابچه‌های آدرس "
+
+#: lib/Turba.php:487
+msgid "_New Contact"
+msgstr "تماس جدید"
+
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
-msgstr "برداشتن از اين ليست"
+msgstr "حذف از این فهرست"
 
-#: lib/Turba.php:237
+#: lib/Turba.php:489
 msgid "_Search"
-msgstr "_جستجو کردن"
+msgstr "جستجو"
 
 #: vcard.php:46
 msgid "contact.vcf"
 msgstr "contact.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contacts.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contacts.tsv"
 
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
-msgstr "به دفترچه آدرس‌های انتخاب شده"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "contact.vcf"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "هیچ"
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr "به یک فهرست تماس"
+
+#: templates/browse/actions.inc:14
+msgid "to a different Address Book"
+msgstr "به کتابچهٔ آدرس متفاوت"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/export.inc:20 templates/data/import.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/README
+++ mod/README
@@ -1,14 +1,13 @@
 What is Turba?
 ==============
 
-:Last update:   $Date: 2005/03/05 23:15:55 $
-:Revision:      $Revision: 1.12.10.1 $
+:Last update:   $Date: 2005/10/18 12:50:03 $
+:Revision:      $Revision: 1.12.10.2 $
 :Contact:       turba at lists.horde.org
 
 .. contents:: Contents
 .. section-numbering::
 
-
 Turba is the Horde contact management application, designed to be integrated
 with other Horde applications to provide a unified interface to contact
 management throughout the Horde suite.
@@ -32,11 +31,14 @@
 
 The following documentation is available in the Turba distribution:
 
-:README:           This file
-:LICENSE_:         Copyright and license information
-:docs/CHANGES:     List of changes by release
-:`docs/CREDITS`_:  Who developed this
-:`docs/INSTALL`_:  Installation instructions
+:README_:            This file
+:LICENSE_:           Copyright and license information
+:`docs/CHANGES`_:    Changes by release
+:`docs/CREDITS`_:    Project developers
+:`docs/INSTALL`_:    Installation instructions and notes
+:`docs/LDAP`_:       LDAP personal addressbook HOWTO
+:`docs/TODO`_:       Development TODO list
+:`docs/UPGRADING`_:  Pointers on upgrading from previous Skeleton versions
 
 
 Installation
@@ -61,8 +63,9 @@
 
   http://www.horde.org/mail/
 
-Lastly, Horde developers, contributors and users also make appearances on IRC,
-on the channel #horde on the freenode Network (irc.freenode.net).
+Lastly, Horde developers, contributors and users also make occasional
+appearances on IRC, on the channel #horde on the freenode Network
+(irc.freenode.net).
 
 
 Licensing
@@ -76,8 +79,12 @@
 The Turba team
 
 
+.. _README: ?f=README.html
 .. _LICENSE: http://www.horde.org/licenses/asl.php
-.. _docs/CONTRIBUTING: ?f=CONTRIBUTING.html
+.. _docs/CHANGES: ?f=CHANGES.html
 .. _docs/CREDITS: ?f=CREDITS.html
 .. _INSTALL:
 .. _docs/INSTALL: ?f=INSTALL.html
+.. _docs/LDAP: ?f=LDAP.html
+.. _docs/TODO: ?f=TODO.html
+.. _docs/UPGRADING: ?f=UPGRADING.html


--- orig/templates/prefs/columnselect.inc
+++ mod/templates/prefs/columnselect.inc
@@ -2,14 +2,14 @@
 
 global $cfgSources, $attributes;
 
-$sources = Turba::string2Columns($prefs->getValue('columns'));
+$sources = Turba::getColumns();
 
 $js = "var columns = new Array();\n";
 $source_count = 0;
 foreach ($cfgSources as $source => $info) {
     $selected = isset($sources[$source]) ? array_flip($sources[$source]) : array();
-    $js .= "columns[$source_count] = new Array();\n";
-    $js .= "columns[$source_count][0] = '$source';\n";
+    $js .= "columns[$source_count] = new Array();\n" .
+        "columns[$source_count][0] = '$source';\n";
 
     $column_count = 1;
     foreach ($info['map'] as $column => $null) {
@@ -25,7 +25,7 @@
 }
 ?>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 <?php echo $js ?>
 
@@ -218,29 +218,29 @@
 <?php if ($source_count > 0): ?>
 <div>
  <select name="source" onchange="if (document.prefs.source.selectedIndex != 0) selectSource();"<?php if ($source_count == 1) echo ' style="display:none"' ?>>
-  <option value=""><?php echo _("Please select a directory:") ?></option>
+  <option value=""><?php echo _("Choose an address book:") ?></option>
   <?php foreach ($cfgSources as $key => $info): ?>
   <option value="<?php echo htmlspecialchars($key) ?>"<?php if ($source_count == 1) echo ' selected="selected"' ?>><?php echo htmlspecialchars($info['title']) ?></option>
   <?php endforeach; ?>
  </select>
 </div>
 
-<?php echo _("Choose the order of the columns to display in the address list.") ?><br />
+<?php echo _("Choose which columns to display and in what order:") ?><br />
 <table>
  <tr>
   <td>
-   <select name="unselected_columns" multiple="multiple" size="5" style="width:200px" onchange="deselectHeaders();">
-    <option value=""><?php echo _("Available Columns:") ?></option>
+   <select name="unselected_columns" multiple="multiple" size="5" style="width:300px" onchange="deselectHeaders();">
+    <option class="control" value=""><?php echo _("Columns that will not be displayed:") ?></option>
    </select>
   </td>
   <td>
-   <a href="#" onclick="addColumn(); return false;"><?php echo Horde::img(isset($nls['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add column"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="#" onclick="addColumn(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add column"), null, $registry->getImageDir('horde')) ?></a>
    <br />
-   <a href="#" onclick="removeColumn(); return false;"><?php echo Horde::img(isset($nls['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove column"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="#" onclick="removeColumn(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove column"), null, $registry->getImageDir('horde')) ?></a>
   </td>
   <td>
-   <select name="selected_columns" multiple="multiple" size="5" style="width:200px" onchange="deselectHeaders();">
-    <option value=""><?php echo _("Selected Columns:") ?></option>
+   <select name="selected_columns" multiple="multiple" size="5" style="width:300px" onchange="deselectHeaders();">
+    <option class="control" value=""><?php echo _("These columns will display in this order:") ?></option>
    </select>
   </td>
   <td>
@@ -252,13 +252,12 @@
 </table>
 
 <?php if ($source_count == 1): ?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 selectSource();
 // -->
 </script>
-<?php endif; // End automatic source selection. ?>
-
-<?php endif; // End form elements when at least 1 source. ?>
-
-<?php endif; // End prefs UI if not locked. ?>
+<?php
+endif; // End automatic source selection.
+endif; // End form elements when at least 1 source.
+endif; // End prefs UI if not locked.


--- orig/docs/CHANGES
+++ mod/docs/CHANGES
@@ -1,3 +1,83 @@
+----
+v2.1
+----
+
+[ben] Better support for MS-SQL
+
+
+--------
+v2.1-RC1
+--------
+
+[mjr] Default to showing the 'A' page when browsing address books that contain
+      more than the 'perpage' number of entries.
+[jan] Add Icelandic translation (Bjorn Davidsson <bjossi at snerpa.is>).
+[mjr] Fix paging when viewing search results.
+[mjr] Only show actions that make sense for the current source.
+[mjr] All IMSP address books, including dynamically configured sources are now
+      uniquely identified across all users internally.
+[jan] Reverse sorting order if clicking on column name (t.zell at gmx.de,
+      Request #2484).
+[jan] Add option to keep name field unformatted (m.zdila at episoftware.com,
+      Request #2441).
+[mas] Use summary notifications for contact changes instead of one notice for
+      each change. (Bug #2764)
+[jan] Add CLI script to import vCard data.
+[cjh] Split checking of LDAP field syntax and checking of required fields
+      (tevans at tachometry.com, Bug #2626).
+[mjr] Horde_Share support added. SQL Driver only for now.
+[cjh] Update objectclasses when saving LDAP entries created by other clients
+      (m.zdila at episoftware.com, Bug #2405).
+[cjh] Charset-aware handling of LDAP DNs (Bug #2395).
+[cjh] Get rid of cached search results entirely, and move more display
+      code into Turba_ListView, simplifying a number of different
+      codepaths and avoiding servercide when using Advanced Search.
+[mjr] Turba_Object and Turba_Driver objects are now responsible for
+      checking permissions for the sources they represent.  This allows
+      concrete Turba_Driver objects to override Horde Perms and perform
+      their own permission checking (by checking ACLs for example).
+[cjh] "readonly" and "admin" source hash entries are deprecated. Permissons
+      are set through the Horde Perms UI now.
+[cjh] Avoid adding exact duplicates during import
+      (kevin_myer at iu13.org, Bug #1892).
+[cjh] Honor the delete confirmation preference when displaying a
+      contact (Bug #1315).
+[cjh] If the comments API is available, comments can be attached to
+      contacts (Request #1492).
+[cjh] Users can select which address books they wish to use, and in
+      which order they will be displayed (Request #1650).
+[cjh] Contacts can now be added to lists stored in any address book
+      (Request #1561).
+[cjh] Introduce a "browse" setting on sources, seperate from the "export"
+      setting, to allow differentiation of browseable and exportable
+      sources.
+[jan] Add permissions to restrict number of contacts per address book.
+[cjh] Add exporting of multiple vCards in one file through the export
+      interface (Frank Rosquin <frank.rosquin at gmail.com>).
+[mjr] Added support for adding and deleting IMSP addressbooks via the options
+      interface (Request #1578)
+[mjr] Show previous search results whenever returning to the search page.
+[cjh] Handle encoding of postalAddress fields to use $ for newlines, going
+      either by attributes.php or by the LDAP schema itself (Edward Rudd
+      <eddie at omegaware.com>, Request #2).
+[mjr] Search terms on composite fields are now taken as a space delimited
+      list of strings that are each OR'd against each field making up the
+      composite field  and then cumulatively AND'd together.
+[jan] Show warnings from CSV imports.
+[jan] Add "Add" and "Search" entries to sidebar menu.
+[jan] Return to original browse view after finishing group editing.
+[jan] Add submenu with address books to sidebar.
+[jan] Allow to specify charset of imported CSV files.
+[cjh] Pass the Turba_AbstractObject to attribute hooks to allow access to
+      other attribute values (for example, to build a field's value out of
+      other fields).
+[jan] Show list of edited contacts below edit form when editing several
+      contacts at once.
+[jan] Add VFS support to attach files to contacts.
+[jan] Allow to edit several contacts at once.
+[jan] Retrieve only required fields from backend.
+
+
 ------
 v2.0.5
 ------
@@ -9,7 +89,6 @@
 v2.0.4
 ------
 
-[jan] Fix using edit permission to restrict adding contacts to sources.
 [jan] Fix source selection in some API methods (tevans at tachometry.com,
       Bug #2623).
 [jan] Fix warnings in columns preference screen.
@@ -23,7 +102,6 @@
 
 [jan] Add Turkish translation (Servet Güney <sguney at metu.edu.tr>, Ahmet Öztürk
       <oahmet at metu.edu.tr>).
-[jan] Fix "Add" icon not being displayed if only one source exists (Bug #2294).
 
 
 ----------
@@ -233,7 +311,7 @@
 [jan] Fix sorting by columns in browse view.
 [cjh] Use prepare/execute in the SQL driver to support large fields on Oracle
       and other databases (Matt Selsky <selsky at columbia.edu>).
-[jan] Don't create distribution list if process gets cancelled (Bug 377).
+[jan] Don't create distribution list if process gets cancelled (Bug #377).
 
 
 ------


--- orig/po/hu_HU.po
+++ mod/po/hu_HU.po
@@ -1,34 +1,57 @@
 # Turba Hungarian translation file.
-# Copyright (C) 2002-2005 Laszlo L. Tornoci
+# Copyright (C) 2002-2006 Laszlo L. Tornoci
 # This file is distributed under the same license as the Turba package.
 # Latest versions: ftp://xenia.sote.hu/pub/linux/horde/
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba 2.0.3\n"
+"Project-Id-Version: Turba 2.1\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-10-02 09:20+0200\n"
-"PO-Revision-Date: 2005-10-02 10:35+0100\n"
+"POT-Creation-Date: 2006-02-17 10:00+0100\n"
+"PO-Revision-Date: 2006-02-18 13:14+0100\n"
 "Last-Translator: Laszlo L. Tornoci <torlasz at xenia.sote.hu>\n"
 "Language-Team: Hungarian <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr " IMSP címjegyzék létrehozása"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr " IMSP címjegyzék törlése"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "\"%s\" már létezik, az importálás nem történt meg."
+
+#: browse.php:140
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "Mivel \"%s\" egy lista, ezért nem másoltuk át."
+
+#: browse.php:138
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "Mivel \"%s\" egy lista, ezért nem helyeztük át."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Keresztnév Vezetéknév\"  (pl. János Kovács)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Vezetéknév, Keresztnév\"  (pl. Kovács, János)"
 
-#: add.php:87
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s bevitele megtörtént."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "A %s fájl importálása sikeresen megtörtént"
@@ -38,58 +61,81 @@
 msgid "%s to %s of %s"
 msgstr "%s - %s (összesen %s)"
 
-#: browse.php:120
+#: lib/Turba.php:458
 #, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "Mivel '%s' egy lista, ezért nem másoltuk át."
+msgid "%s's Address Book"
+msgstr "%s címjegyzéke"
 
-#: browse.php:118
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "Mivel '%s' egy lista, ezért nem helyeztük át."
-
-#: lib/Block/minisearch.php:45
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr "Ehhez iFrame funkcionalitással rendelkezõ böngészõprogram szükséges."
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "a keresõform fölött"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Részletes keresés"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "%s eléréséhez nem rendelkezik megfelelõ jogosultsággal."
 
-#: add.php:52
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "Bevitel"
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "Új címjegyzék"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "IMSP címjegyzékek létrehozása, törlése"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "új oszlop"
 
-#: templates/browse/actions.inc:22
+#: edit.php:135
+msgid "Add file"
+msgstr "Fájl hozzáadása"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Adjuk hozzá"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "A címjegyzék nem bõvíthetõ."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "Címjegyzék"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Címjegyzék lista"
 
-#: add.php:86
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Címjegyzékek"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Címjegyzék adat"
 
-#: lib/Driver.php:478
-msgid "Address book is read-only."
-msgstr "A címjegyzék csak olvasható."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "A címjegyzéket sikeresen töröltük."
 
-#: search.php:97 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "A törlendõ címjegyzék "
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "Nem megjelenõ címjegyzékek:"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
@@ -97,55 +143,37 @@
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr "az összeset"
 
-#: lib/api.php:393
+#: lib/api.php:554
 msgid "Already Exists"
 msgstr "Már létezik"
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Biztos, hogy törölni kívánja %s-t?"
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Biztos abban, hogy törölni kívánja ezeket az adatokat?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "növekvõ"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "A rendelkezésre álló oszlopok:"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Vissza %s-hez"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "Vissza %s-hez"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Keresés"
-
-#: search.php:94 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Keresés"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "a keresõform alatt"
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "A kapcsolat felvétele nem sikerült: (%s) %s"
@@ -154,51 +182,64 @@
 msgid "Birthday"
 msgstr "Születésnap"
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "Böngészés"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Üzleti kategória"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "A keresés törlése"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "Egy csoport nem lehet önmaga tagja."
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Jelöljük ki mind/egyiket sem"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Mi legyen az Ön alapértelmezett címtára a böngészés ill. keresés céljára."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "Válasszon egy elnevezést"
 
-#: add.php:44
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Válasszon egy címjegyzéket"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "Válasszon egy címjegyzéket:"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
 msgstr ""
-"Válassza ki, hogy milyen sorrendben jelenjenek meg a címlistában az oszlopok."
+"Válassza ki, hogy mely címjegyzékek jelenjenek meg, és milyen sorrendben:"
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "Az eredmények törlése"
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "Válassza ki, melyik címjegyzéke(ke)t kívánja használni."
 
-#: config/prefs.php.dist:10
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "Melyik oszlopok jelenjenek meg és milyen sorrendben:"
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Az oszlopok beállítása"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Nem megjelenõ oszlopok:"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Vesszõvel elválasztott értékek"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Vesszõvel elválasztott értékek (Microsoft Outlook)"
 
@@ -210,70 +251,77 @@
 msgid "Company Address"
 msgstr "Munkahelyi cím"
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:382 lib/api.php:452
-#: lib/api.php:542 lib/api.php:588 lib/api.php:636 lib/api.php:823
-#: lib/api.php:916
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:840
+#: lib/api.php:1037 lib/api.php:1125
 #, php-format
 msgid "Connection failed: %s"
 msgstr "A kapcsolat nem sikerült: %s"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "A kapcsolat nem sikerült"
 
-#: browse.php:60
-msgid "Contact removed from list."
-msgstr "Töröltük a címet a listáról."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Címkeresés"
 
-#: browse.php:257
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "A %s lista tagjai"
 
-#: browse.php:281
-#, php-format
-msgid "Contents of %s"
-msgstr "A %s tartalma"
-
-#: templates/browse/actions.inc:12
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "Másoljuk át"
 
-#: lib/ObjectView.php:134
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Létrehozás"
+
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "Címjegyzék létrehozása"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Új címlista létrehozása itt:"
+
+#: lib/ObjectView.php:133
 msgid "Created"
 msgstr "Létrehozva"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Az alapértelmezés szerinti megjelenítés"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "Az Ön alapértelmezett címtára a böngészés ill. keresés céljára"
-
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "A sorbarendezés alapértelmezés szerinti iránya:"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Törlés"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "Címjegyzék törlése"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "A törlés megerõsítése"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "A törlés gomb viselkedése"
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "A törlés nem sikerült: (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "A címjegyzékbõl nem lehet törölni."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "A törlés nem sikerült"
 
@@ -281,38 +329,55 @@
 msgid "Department"
 msgstr "Részleg"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "csökkenõ"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Leírás"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Címtár"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Megjelenítés"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Megjelenítési beállítások"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "Az adatok törlését megelõzõen óhajt-e egy megerõsítõ kérdést?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Letöltés"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "vCard letöltés"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Módosítás"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
-msgid "Edit '%s'"
-msgstr "'%s' módosítása"
+msgid "Edit \"%s\""
+msgstr "\"%s\" módosítása"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "Címjegyzékek módosítása"
+
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Módosítsuk %s adatait"
@@ -321,59 +386,104 @@
 msgid "Email"
 msgstr "Email"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+"%s adatait módosítottuk, de a feltöltött állományt nem sikerült elmenteni: %s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "%s új adatait elmentettük."
 
-#: templates/browse/actions.inc:6 templates/data/export.inc:46
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "Hiba történt a %d partnernek a címlistához való hozzáadásakor."
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr "%d hiba történt a %d partnernek a címlistához való hozzáadásakor."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Hiba történt a %d partner törlésekor."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "%d hiba történt a %d partner törlésekor."
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "Hiba történt a %d partnernek a címlistából való törlésekor."
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr "%d hiba történt a %d partnernek a címlistából való törlésekor."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "Hiba történt a címjegyzékben való keresés során: %s"
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportálás"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Címjegyzék exportálása"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Csak a kijelölt levelezõpartnereket exportáljuk."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "A teljes címjegyzéket exportáljuk."
 
-#: data.php:110 data.php:228 browse.php:37 browse.php:94 browse.php:109
-#: add.php:63 search.php:52
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "A(z) %s címjegyzék nem érhetõ el."
 
-#: browse.php:128
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Nem sikerült %s hozzáadása %s-hez: %s"
 
-#: browse.php:263
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "Nem sikerült a lista böngészése"
 
-#: browse.php:297
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "A címtár böngészése nem lehetséges"
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 "Nem sikerült a név megváltoztatása: (%s) %s; régi DN = %s, új DN = %s, "
 "gyökér = %s"
 
-#: browse.php:114
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Nem sikerült megtalálni a beviendõ objektumot: %s"
 
-#: data.php:124 search.php:88
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "A címjegyzékben nem sikerült a keresés."
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Nem sikerült a %s címtárban való keresés"
@@ -382,10 +492,18 @@
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72
+#: edit.php:131 display.php:100
+msgid "Files"
+msgstr "Fájl"
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr "Mezõ"
 
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "Befejezés"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Keresztnév"
@@ -394,15 +512,15 @@
 msgid "Freebusy URL"
 msgstr "Idõbeosztási web cím"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "honnan"
 
-#: config/sources.php.dist:556
+#: config/sources.php.dist:606
 msgid "Global Address Book"
 msgstr "Globális címjegyzék"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Csoport"
 
@@ -434,60 +552,60 @@
 msgid "Home Street Address"
 msgstr "Otthoni cím: utca"
 
-#: config/sources.php.dist:482
+#: config/sources.php.dist:508
 msgid "IMSP"
 msgstr ""
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "IMSP címjegyzék kezelése"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Címjegyzék importálása, %d. lépés"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Címjegyzékek import/exportja"
 
-#: lib/api.php:376 lib/api.php:602
-msgid "Invalid Content-Type"
-msgstr "Hibás/elfogadhatatlan tartalomtípus."
-
-#: lib/api.php:439 lib/api.php:529
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "Hibás/elfogadhatatlan ID."
 
-#: lib/api.php:191 lib/api.php:334 lib/api.php:435 lib/api.php:525
-#: lib/api.php:578 lib/api.php:893
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1108
 msgid "Invalid address book"
 msgstr "Hibás címjegyzék."
 
-#: lib/api.php:897 lib/api.php:971 lib/api.php:1024
+#: lib/api.php:1112 lib/api.php:1185 lib/api.php:1238
 msgid "Invalid email"
 msgstr "Hibás email cím."
 
-#: lib/api.php:905
+#: lib/api.php:1120
 msgid "Invalid entry"
 msgstr "Hibás/elfogadhatatlan adat."
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Hibás/elfogadhatatlan kulcs."
 
-#: lib/api.php:901
+#: lib/api.php:1116
 msgid "Invalid name"
 msgstr "Hibás/elfogadhatatlan név."
 
-#: lib/api.php:582
+#: lib/api.php:753
 msgid "Invalid objectId"
 msgstr "Hibás/elfogadhatatlan objectId."
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "LDAP támogatásra lenne szükség, de az LDAP modul nem áll rendelkezésre, vagy "
 "nem töltõdött be."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Utolsó módosítás"
 
@@ -495,23 +613,27 @@
 msgid "Last Name"
 msgstr "Családnév"
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Lista"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "mit"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "A partnerek maximális száma"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Az oldalak maximális száma"
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Mini keresés"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Menülista"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "Az LDAP szerver konfigurációjában nincs megadva a DN."
 
@@ -519,63 +641,65 @@
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "A módosítás nem sikerült: (%s) %s"
 
-#: lib/api.php:1010
+#: lib/api.php:1224
 msgid "More than 1 entry found"
 msgstr "Több, mint 1 találat van"
 
-#: templates/browse/actions.inc:11
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Tegyük át"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "balra"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "jobbra"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry címjegyzék"
 
-#: lib/api.php:930
+#: lib/api.php:1144
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
 "Több személy is van már, akinek a címe [%s], de egyiknek sem [%s] a neve"
 
-#: config/sources.php.dist:87 config/sources.php.dist:221
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+msgid "My Address Book"
 msgstr "Saját címjegyzék"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr "Saját címjegyzékeim"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Név"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Név formátum"
 
-#: config/sources.php.dist:295
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter Member címjegyzék"
 
-#: add.php:36 add.php:103 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Új levelezõpartner"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "Új lista"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Következõ"
 
@@ -583,20 +707,20 @@
 msgid "Nickname"
 msgstr "Becenév"
 
-#: lib/api.php:1012 lib/api.php:1061
+#: lib/api.php:1226 lib/api.php:1275
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Nincs %s adat a(z) %s címhez"
 
-#: lib/api.php:980
+#: lib/api.php:1194
 msgid "No address books found."
 msgstr "Egy címjegyzék sem található."
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr "Nem találtunk egy partnert sem"
 
-#: lib/api.php:356
+#: lib/api.php:513 lib/api.php:784
 msgid "No vCard data was found."
 msgstr "Nem sikerült vCard adatot találni."
 
@@ -608,11 +732,11 @@
 msgid "Notes"
 msgstr "Megjegyzés"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Az oldalon megjelenítendõ elemek száma"
 
-#: lib/api.php:458
+#: lib/api.php:632 lib/api.php:765
 msgid "Object not found"
 msgstr "Az objektum nem található meg"
 
@@ -620,7 +744,20 @@
 msgid "Office"
 msgstr "Hivatal/munkahely"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+"Ha elmenti ezeket a beállításokat, akkor a címjegyzék végérvényesen "
+"törlõdik. Ha ezt nem szeretné, akkor ne válasszon ki törlésre egyet sem."
+
+#: lib/api.php:792
+msgid "Only one vcard supported."
+msgstr "Csak egyetlen vcard használata lehetséges."
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Egyéb beállítások"
 
@@ -628,32 +765,36 @@
 msgid "PGP Public Key"
 msgstr "PGP nyilvános kulcs"
 
-#: lib/api.php:340 lib/api.php:445 lib/api.php:535 lib/api.php:594
-#: lib/api.php:751 lib/api.php:911
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:965
+#: lib/api.php:1129
 msgid "Permission Denied"
-msgstr "Ehhez nincs megfelelõ jogosultsága"
+msgstr "Ehhez nincs ehhez megfelelõ jogosultsága"
 
-#: lib/Driver.php:436
+#: lib/Driver.php:550
 msgid "Permission denied"
 msgstr "Ehhez nincs megfelelõ jogosultsága"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Jogosultságok"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine címjegyzék"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
-msgstr "Kérem adja meg az új lista nevét:"
-
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Kérem válasszon egy címtárat:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "Kérem adja meg az új címlista nevét:"
+
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "Elõzõ"
 
-#: config/sources.php.dist:399
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Személyes címjegyzék"
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "A keresés sikertelen: (%s) %s"
@@ -662,15 +803,27 @@
 msgid "Quick Search"
 msgstr "Gyors keresés"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Olvasási hiba: (%s) %s"
 
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "A partnerek adatai nem olvashatók."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "Valóban törölni kívánja ennek a levelezõpartnerének az adatait?"
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "A megjelenített adatok:"
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "A címjegyzék törlése"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "oszlop törlése"
@@ -679,19 +832,20 @@
 msgid "Remove from this list"
 msgstr "Töröljük a listáról"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Írjuk felül a kiválasztott címjegyzéket az importálttal? <b>Figyelmeztetés: "
-"ez kitörli az összes adatot a jelenlegi címjegyzékbõl!</b>"
+"Írjuk felül a kiválasztott címjegyzéket az importálttal? "
+"<strong>Figyelmeztetés: ez kitörli az összes adatot a jelenlegi "
+"címjegyzékbõl!</strong>"
 
-#: lib/Driver.php:330
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "A keresett objektum nem található."
 
-#: add.php:37 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Kezdjük újra a kitöltést"
 
@@ -699,162 +853,209 @@
 msgid "S/MIME Public Certificate"
 msgstr "S/MIME nyilvános tanúsítvány"
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr "STARTTLS hiba: (%s) %s"
 
-#: edit.php:57 add.php:37
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "A levelezõpartnerek adatai nem menthetõk el."
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Keresés"
 
-#: browse.php:241 minisearch.php:66
-msgid "Search Results"
-msgstr "A keresés eredménye"
-
-#: lib/api.php:827
+#: lib/api.php:1042
 msgid "Search failed"
 msgstr "A keresés nem sikerült"
 
-#: lib/api.php:920 lib/api.php:926 lib/api.php:935 lib/api.php:948
+#: lib/api.php:1134 lib/api.php:1140 lib/api.php:1149 lib/api.php:1162
 #, php-format
 msgid "Search failed: %s"
 msgstr "A keresés nem sikerült: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "A kereséssel kapcsolatos beállítások"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "A keresés nem lehetséges."
 
-#: templates/block/minisearch.inc:24
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Keresés..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Válasszon címjegyzéket"
-
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "ehhez a listához"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "Válassza ki, melyik címjegyzéket kívánja törölni"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "Válassza ki, melyik címjegyzéket kívánja módosítani"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Válassza ki, melyik címjegyzékbõl kíván exportálni:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Válassza ki, melyik címjegyzékbe kíván importálni:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Válassza ki az importálandó fájl karakterkészletét:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Válassza ki az exportálás formátumát:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Válassza ki az importálandó fájlt:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Válassza ki az importálandó fájl formátumát:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Válassza ki a nevek megjelenítési formáját:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Beállítható az alapértelmezett megjelenítés."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
+"Kiválasztható az alapértelmezett megjelenítés, sorbarendezési és lapozási "
+"beállítások."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Kiválasztható, hogy a címlistában milyen mezõk jelenjenek meg."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Kiválasztható a nevek megjelenítési módja."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "A kiválasztott oszlopok:"
-
-#: add.php:50
+#: add.php:54
 #, php-format
-msgid "Selected address book '%s'."
-msgstr "A kiválasztott címjegyzék '%s'."
+msgid "Selected address book \"%s\"."
+msgstr "A kiválasztott címjegyzék \"%s\"."
 
-#: config/sources.php.dist:154
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Közös címtár"
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "Mutassuk mindet"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Megjelenítés"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "%s megjelenítése"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Mutassuk mindet"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Mutassuk a partnereket"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Mutassuk a listákat"
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "Mutassuk a partnereket"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "Mutassuk a listákat"
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr "A sorbarendezés iránya"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "Címjegyzék források"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr "Válassza ki, hol jelenjen meg a részletes keresés eredménye."
 
-#: browse.php:130
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "A listához sikeresen hozzáadtunk %d címet."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s hozzáadása %s-hez sikeres volt"
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Sikeresen létrehoztuk a(z) \"%s\" címlistát."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "Sikeresen töröltünk %d címet."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "Sikeresen eltávolítottuk %d címet a listáról."
+
+#: data.php:50
 msgid "TSV"
 msgstr ""
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "TAB karakterrel elválasztott értékek"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+"A VFS alrendszer beállításaiban engedélyezni kell a mellékletek "
+"feltölthetõségét."
+
+#: lib/Driver.php:1076
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "A(z) \"%s\" címjegyzék nem létezik."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "A(z) \"%s\" címjegyzéket sikeresen létrehoztuk."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "A(z) \"%s\" címjegyzéket sikeresen töröltük."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "A(z) \"%s\" címjegyzéket sikeresen módosítottuk."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "A címjegyzék nem törölhetõ: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "A keresett levelezõpartner nem létezik."
 
-#: browse.php:33
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "A(z) \"%s\" állományt sikeresen töröltük."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "Az importálás a figyelmeztetések ellenére befejezhetõ."
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Nincsen olyan címjegyzék, amiben böngészni tud."
 
@@ -868,7 +1069,7 @@
 "jogosult újabb bejegyzéseket hozzátenni. Ha úgy gondolja, hogy ez "
 "rendellenes, akkor forduljon a helyi rendszergazdához."
 
-#: add.php:99
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -876,94 +1077,119 @@
 "A partner adatainak hozzáadása nem sikerült. További segítségért forduljon a "
 "rendszergazdához."
 
-#: browse.php:185
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "Hiba történt az új lista létrehozása során."
 
-#: browse.php:136
+#: addressbooks.php:38
+#, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Hiba történt ennek a címjegyzéknek a létrehozása során: %s"
+
+#: browse.php:166
 #, php-format
-msgid "There was an error deleting %s from the source address book."
-msgstr "%s-t nem sikerült kitörölni az eredeti címjegyzékbõl."
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "\"%s\"-t nem sikerült kitörölni az eredeti címjegyzékbõl."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "A partner adatainak törlése során hiba történt: %s"
 
-#: browse.php:68
-msgid "There was an error deleting this object."
-msgstr "Az objektum törlése során hiba történt."
-
-#: browse.php:273
-msgid "There was an error displaying the select List"
-msgstr "A kiválasztott lista megjelenítésekor hiba történt"
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "A lista megjelenítésekor hiba történt"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Az importálás során hiba történt: %s"
 
-#: lib/api.php:352
+#: lib/api.php:509 lib/api.php:779
 msgid "There was an error importing the iCalendar data."
 msgstr "Az iCalendar adatok importálása során hiba történt."
 
-#: browse.php:58
-msgid "There was an error removing this object."
-msgstr "Az objektum törlése során hiba történt."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Hiba történt e címjegyzék törlése során: %s"
+
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Hiba történt e címjegyzék módosítása során: %s"
 
-#: edit.php:84
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Hiba történt ennek az adatnak a módosítása során: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Nem volt exportálható cím."
 
-#: lib/Driver.php:390 lib/Driver.php:427
-msgid "This address book is read-only"
-msgstr "Ez címjegyzék csak olvasható"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "Ezek a címjegyzékek a következõ sorrendben jelennek meg:"
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Ezek az oszlopok a következõ sorrendben jelennek meg:"
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Az a fájlformátum nem támogatott."
 
-#: lib/api.php:939 lib/api.php:952
+#: lib/api.php:1153 lib/api.php:1166
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Ez a személy már szerepel a címjegyzékében, mint %s"
 
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+"Ez lesz az alapértelmezett címjegyzék új adatok létrehozásakor ill. "
+"importálásakor."
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titulus"
 
-#: lib/Driver.php:834
+#: lib/Turba.php:443
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr ""
+"Nem sikerült létrehozni a közös címjegyzéket. Ismeretlen a forrás típusa."
+
+#: lib/Driver.php:1000
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Nem sikerült beolvasni %s definícióját."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Mégse mentsük el"
 
-#: lib/api.php:487
-msgid "Unsupported Content-Type."
-msgstr "Nem támogatott tartalomtípus."
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Nem támogatott tartalomtípus: %s"
 
-#: config/sources.php.dist:358
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign címtár"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
-msgid "View '%s'"
-msgstr "'%s' megtekintése"
+msgid "View \"%s\""
+msgstr "\"%s\" megtekintése"
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
 msgstr "Új bejegyzés rögzítése"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Az alapértelmezés szerinti megjelenítés:"
 
@@ -999,11 +1225,12 @@
 msgid "Work Street Address"
 msgstr "Munkahelyi cím: utca"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "Ezzel egy körlevéllistát hoz létre."
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "Nem hozhat létre több, mint %d partnert a \"%s\" címjegyzékben."
 
-#: edit.php:44 display.php:59
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Ennek a személynek az adtait nem jogosult megtekinteni."
 
@@ -1011,7 +1238,11 @@
 msgid "You do not have permission to view this object."
 msgstr "Ezt az objektumot nem jogosult megtekinteni."
 
-#: templates/browse/javascript.inc:51
+#: lib/Turba.php:531
+msgid "You do not have permissions to delete this source."
+msgstr "Önnek nincs jogosultsága törölni ezt az címjegyzéket."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Elõször célként ki kell választania egy címjegyzéket."
 
@@ -1019,44 +1250,60 @@
 msgid "You must select a target list."
 msgstr "Elõször célként ki kell választania egy listát."
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "Elõbb ki kell választania legalább egy levelezõpartnert."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Elõbb ki kell választania legalább egy adatot."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr "E személy adatait csak megtekinteni van jogosultsága."
 
-#: browse.php:284
-msgid "Your default addressbook is not browseable."
+#: browse.php:318
+msgid "Your default address book is not browseable."
 msgstr "Az Ön alapértelmezés szerinti címjegyzéke nem böngészhetõ."
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[nincs adat]"
 
-#: lib/Turba.php:286
-msgid "_Add"
-msgstr "Be_vitel"
-
-#: lib/Turba.php:283
+#: lib/Turba.php:554
 msgid "_Browse"
 msgstr "_Böngészés"
 
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "Partnerek"
+
 #: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "Törlés"
 
-#: lib/Turba.php:292
+#: lib/Turba.php:563
 msgid "_Import/Export"
 msgstr "Import/_Export"
 
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "Listák"
+
+#: lib/Turba.php:551
+msgid "_My Address Books"
+msgstr "Saját címjegyzékeim"
+
+#: lib/Turba.php:557
+msgid "_New Contact"
+msgstr "Új levelezõpartner"
+
 #: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "Töröljük a listáról"
 
-#: lib/Turba.php:288
+#: lib/Turba.php:559
 msgid "_Search"
 msgstr "Kere_sés"
 
@@ -1064,19 +1311,35 @@
 msgid "contact.vcf"
 msgstr ""
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr ""
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr ""
 
-#: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
-msgstr "ebbe a címjegyzékbe"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr "formattálás nélkül"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "egy sem"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "egy címlistába"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "egy másik címjegyzékbe"
 
-#: data.php:30 templates/browse/column_headers.inc:7
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/lib/Driver/kolab.php
+++ mod/lib/Driver/kolab.php
@@ -5,9 +5,9 @@
 
 /**
  * Horde Turba driver for the Kolab IMAP Server.
- * Copyright 2004-2005 Horde Project (http://horde.org/)
+ * Copyright 2004-2006 Horde Project (http://horde.org/)
  *
- * $Horde: turba/lib/Driver/kolab.php,v 1.5.10.4 2005/06/08 00:48:12 selsky Exp $
+ * $Horde: turba/lib/Driver/kolab.php,v 1.5.10.8 2006/01/01 21:29:16 jan Exp $
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -366,7 +366,7 @@
      */
     function _makeKey($attributes)
     {
-        return md5(uniqid(mt_rand(), true));
+        return $this->generateUID();
     }
 
     /**


--- orig/config/conf.xml
+++ mod/config/conf.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
-<!-- $Horde: turba/config/conf.xml,v 1.6 2004/12/08 17:08:37 jan Exp $ -->
+<!-- $Horde: turba/config/conf.xml,v 1.6.2.1 2005/10/18 12:50:04 jan Exp $ -->
 <configuration>
  <configsection name="menu">
   <configheader>Menu Settings</configheader>
-  <configboolean name="import_export" desc="Should we display an Import/Export
-  link in Turba's menu?">true</configboolean>
-  <configmultienum name="apps" desc="Select any applications that should be
-  linked in Turba's menu">
+  <configboolean name="import_export" desc="Should we display an Import/Export link in Turba's menu?">true</configboolean>
+  <configmultienum name="apps" desc="Select any applications that should be linked in Turba's menu">
    <values>
     <configspecial name="list-horde-apps"/>
    </values>
@@ -14,14 +12,23 @@
  </configsection>
 
  <configsection name="client">
-   <configheader>Settings for Clients</configheader>
-   <configstring name="addressbook" desc="Name of client
-   addressbook">localsql</configstring>
+   <configheader>Clients</configheader>
+   <configstring name="addressbook" desc="Name of client addressbook">localsql</configstring>
  </configsection>
 
- <configsection name="search">
-   <configheader>Settings for Search</configheader>
-   <configboolean name="cache" desc="Should we cache search results in the
-   session?">true</configboolean>
+ <configsection name="shares">
+   <configheader>Shares</configheader>
+   <configstring name="source" desc="Name of source for creating new shares"
+   required="false"/>
+ </configsection>
+
+ <configsection name="comments">
+  <configheader>Comments</configheader>
+  <configboolean name="allow" desc="Can users comment on contacts?">true</configboolean>
+ </configsection>
+
+ <configsection name="documents">
+  <configheader>Virtual File Storage</configheader>
+  <configvfs switchname="type" />
  </configsection>
 </configuration>


--- orig/lib/Driver/ldap.php
+++ mod/lib/Driver/ldap.php
@@ -2,11 +2,10 @@
 /**
  * Turba directory driver implementation for PHP's LDAP extension.
  *
- * $Horde: turba/lib/Driver/ldap.php,v 1.54.4.9 2005/06/23 21:31:11 selsky Exp $
+ * $Horde: turba/lib/Driver/ldap.php,v 1.54.4.12 2005/11/10 12:44:30 mdjukic Exp $
  *
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @author  Jon Parise <jon at csh.rit.edu>
- * @since   Turba 0.0.1
  * @package Turba
  */
 class Turba_Driver_ldap extends Turba_Driver {
@@ -19,13 +18,6 @@
     var $_ds = 0;
 
     /**
-     * Net_LDAP schema object.
-     *
-     * @var Net_LDAP_Schema
-     */
-    var $_schema;
-
-    /**
      * Constructs a new Turba LDAP driver object.
      *
      * @access private
@@ -188,7 +180,7 @@
         if (is_array($dn)) {
             $results = array();
             foreach ($dn as $d) {
-                $res = @ldap_read($this->_ds, $d, $filter, $attr);
+                $res = @ldap_read($this->_ds, String::convertCharset($d, NLS::getCharset(), $this->_params['charset']), $filter, $attr);
                 if ($res) {
                     if (!is_a($result = $this->_getResults($fields, $res), 'PEAR_Error')) {
                         $results = array_merge($results, $result);
@@ -202,7 +194,7 @@
             return $results;
         }
 
-        $res = @ldap_read($this->_ds, $dn, $filter, $attr);
+        $res = @ldap_read($this->_ds, String::convertCharset($dn, NLS::getCharset(), $this->_params['charset']), $filter, $attr);
         if (!$res) {
             return PEAR::raiseError(sprintf(_("Read failed: (%s) %s"), ldap_errno($this->_ds), ldap_error($this->_ds)));
         }
@@ -256,14 +248,9 @@
             }
         }
 
-        /* Encode entries. */
-        foreach ($attributes as $key => $val) {
-            if (!is_array($val)) {
-                $attributes[$key] = String::convertCharset($val, NLS::getCharset(), $this->_params['charset']);
-            }
-        }
+        $this->_encodeAttributes($attributes);
 
-        if (!@ldap_add($this->_ds, $dn, $attributes)) {
+        if (!@ldap_add($this->_ds, String::convertCharset($dn, NLS::getCharset(), $this->_params['charset']), $attributes)) {
             return PEAR::raiseError('Failed to add an object: [' . ldap_errno($this->_ds) . '] "' . ldap_error($this->_ds) . '" DN: ' . $dn . ' (attributes: [' . serialize($attributes) . ']).' . "Charset:" . NLS::getCharset());
         } else {
             return true;
@@ -279,7 +266,7 @@
             return PEAR::raiseError(_("Invalid key specified."));
         }
 
-        if (!@ldap_delete($this->_ds, $object_id)) {
+        if (!@ldap_delete($this->_ds, String::convertCharset($object_id, NLS::getCharset(), $this->_params['charset']))) {
             return PEAR::raiseError(sprintf(_("Delete failed: (%s) %s"), ldap_errno($this->_ds), ldap_error($this->_ds)));
         } else {
             return true;
@@ -297,7 +284,7 @@
          * values. These are needed so that we can delete any
          * attributes that have been removed by using ldap_mod_del. */
         $filter = $this->_buildObjectclassFilter();
-        $oldres = @ldap_read($this->_ds, $object_id, $filter, array_keys($attributes));
+        $oldres = @ldap_read($this->_ds, String::convertCharset($object_id, NLS::getCharset(), $this->_params['charset']), $filter, array_merge(array_keys($attributes), array('objectclass')));
         $info = ldap_get_attributes($this->_ds, ldap_first_entry($this->_ds, $oldres));
 
         /* Check if we need to rename the object. */
@@ -315,7 +302,8 @@
                 return PEAR::raiseError(_("Missing DN in LDAP source configuration."));
             }
 
-            if (ldap_rename($this->_ds, $object_id, $newrdn, $this->_params['root'], true)) {
+            if (ldap_rename($this->_ds, String::convertCharset($object_id, NLS::getCharset(), $this->_params['charset']),
+                    String::convertCharset($newrdn, NLS::getCharset(), $this->_params['charset']), $this->_params['root'], true)) {
                 $object_id = $newrdn . ',' . $this->_params['root'];
             } else {
                 return PEAR::raiseError(sprintf(_("Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"),
@@ -340,24 +328,23 @@
                 $attributes[$key] == '') {
 
                 $oldval[$key] = $var[0];
-                if (!@ldap_mod_del($this->_ds, $object_id, $oldval)) {
+                if (!@ldap_mod_del($this->_ds, String::convertCharset($object_id, NLS::getCharset(), $this->_params['charset']), $oldval)) {
                     return PEAR::raiseError(sprintf(_("Modify failed: (%s) %s"), ldap_errno($this->_ds), ldap_error($this->_ds)));
                 }
                 unset($attributes[$key]);
             }
         }
 
-        /* Encode entries. */
         unset($attributes[$object_key]);
-        foreach ($attributes as $key => $val) {
-            if (!is_array($val)) {
-                $attributes[$key] = String::convertCharset($val, NLS::getCharset(), $this->_params['charset']);
-            }
-        }
-
+        $this->_encodeAttributes($attributes);
         $attributes = array_filter($attributes, array($this, '_emptyAttributeFilter'));
 
-        if (!@ldap_modify($this->_ds, $object_id, $attributes)) {
+        /* Modify objectclass if old one is outdated. */
+        $attributes['objectclass'] = array_unique(array_map('strtolower', array_merge($info['objectclass'], $this->_params['objectclass'])));
+        unset($attributes['objectclass']['count']);
+        $attributes['objectclass'] = array_values($attributes['objectclass']);
+
+        if (!@ldap_modify($this->_ds, String::convertCharset($object_id, NLS::getCharset(), $this->_params['charset']), $attributes)) {
             return PEAR::raiseError(sprintf(_("Modify failed: (%s) %s"), ldap_errno($this->_ds), ldap_error($this->_ds)));
         } else {
             return $object_id;
@@ -451,7 +438,7 @@
             foreach ($fields as $field) {
                 $field_l = String::lower($field);
                 if ($field == 'dn') {
-                    $result[$field] = $entry[$field_l];
+                    $result[$field] = String::convertCharset($entry[$field_l], $this->_params['charset']);
                 } else {
                     $result[$field] = '';
                     if (!empty($entry[$field_l])) {
@@ -461,6 +448,21 @@
                             }
                             $result[$field] .= String::convertCharset($entry[$field_l][$j], $this->_params['charset']);
                         }
+
+                        /* If schema checking is enabled check the
+                         * backend syntax. */
+                        if (!empty($this->_params['checksyntax'])) {
+                            $postal = $this->_isPostalAddress($field_l);
+                        } else {
+                            /* Otherwise rely on the attribute mapping
+                             * in attributes.php. */
+                            $attr = array_search($field_l, $this->map);
+                            $postal = (!empty($attr) && !empty($GLOBALS['attributes'][$attr]) &&
+                                       $GLOBALS['attributes'][$attr]['type'] == 'address');
+                        }
+                        if ($postal) {
+                            $result[$field] = str_replace('$', "\r\n", $result[$field]);
+                        }
                     }
                 }
             }
@@ -493,6 +495,34 @@
     }
 
     /**
+     * Format and encode attributes including postal addresses,
+     * character set encoding, etc.
+     */
+    function _encodeAttributes(&$attributes)
+    {
+        foreach ($attributes as $key => $val) {
+            /* If schema checking is enabled check the backend syntax. */
+            if (!empty($this->_params['checksyntax'])) {
+                $postal = $this->_isPostalAddress($key);
+            } else {
+                /* Otherwise rely on the attribute mapping in
+                 * attributes.php. */
+                $attr = array_search($key, $this->map);
+                $postal = (!empty($attr) && !empty($val) && !empty($GLOBALS['attributes'][$attr]) &&
+                           $GLOBALS['attributes'][$attr]['type'] == 'address');
+            }
+            if ($postal) {
+                /* Correctly store postal addresses. */
+                $val = str_replace(array("\r\n", "\r", "\n"), '$', $val);
+            }
+
+            if (!is_array($val)) {
+                $attributes[$key] = String::convertCharset($val, NLS::getCharset(), $this->_params['charset']);
+            }
+        }
+    }
+
+    /**
      * Build an LDAP filter based on the objectclass parameter.
      *
      * @return string  An LDAP filter.
@@ -527,30 +557,19 @@
      */
     function _checkRequiredAttributes($objectclasses)
     {
-       require_once 'Net/LDAP.php';
-
-       $config = array('host' => $this->_params['server'],
-                       'port' => $this->_params['port']);
-
-       $retval = array();
-
-       $ldap = &new Net_LDAP($config);
-       $ldap->_link = $this->_ds;
-
-       if (!is_object($this->_schema)) {
-           $this->_schema = &$ldap->schema();
+       $schema = &$this->_getSchema();
+       if (is_a($schema, 'PEAR_Error')) {
+           return $schema;
        }
 
-       if (is_a($this->_schema, 'PEAR_Error')) {
-           return $this->_schema;
-       }
+       $retval = array();
 
        foreach ($objectclasses as $oc) {
            if (String::lower($oc) == 'top') {
                continue;
            }
 
-           $required = $this->_schema->must($oc);
+           $required = $schema->must($oc);
 
            if (is_array($required)) {
                foreach ($required as $v) {
@@ -589,8 +608,30 @@
                           15 => 1, /* Directory string. */
                           );
 
-        if (preg_match('/(\d+)\{\d+\}$/', $syntax, $matches) &&
-            isset($okSyntax[$matches[1]])) {
+        if (preg_match('/^(.*)\.(\d+)\{\d+\}$/', $syntax, $matches) &&
+            $matches[1] == "1.3.6.1.4.1.1466.115.121.1" &&
+            isset($okSyntax[$matches[2]])) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Checks if an attribute refers to a Postal Address.
+     *
+     * @access private
+     *
+     * @param string $attribute  An attribute name.
+     *
+     * @return boolean  True if the specified attribute refers to a Postal Address.
+     */
+    function _isPostalAddress($attribute)
+    {
+        $syntax = $this->_getSyntax($attribute);
+
+        /** LDAP postal address syntax
+         * 1.3.6.1.4.1.1466.115.121.1.41 */
+        if ($syntax == "1.3.6.1.4.1.1466.115.121.1.41") {
             return true;
         }
         return false;
@@ -607,7 +648,11 @@
      */
     function _getSyntax($att)
     {
-        $attv = $this->_schema->get('attribute', $att);
+        $schema = &$this->_getSchema();
+        if (is_a($schema, 'PEAR_Error')) {
+            return $schema;
+        }
+        $attv = $schema->get('attribute', $att);
 
         if (isset($attv['syntax'])) {
             return $attv['syntax'];
@@ -617,6 +662,34 @@
     }
 
     /**
+     * Returns an LDAP_Schema object that containts the LDAP schema.
+     *
+     * @access private
+     *
+     * @return Net_LDAP_Schema  Returns a reference to the ldap schema object.
+     */
+    function &_getSchema()
+    {
+        require_once 'Net/LDAP.php';
+
+        static $_schema;
+
+        /* Check if the cached schema is valid, */
+        if (is_object($_schema) && is_a($_schema, 'Net_LDAP_Schema')) {
+            return $_schema;
+        }
+
+        $config = array('host' => $this->_params['server'],
+                        'port' => $this->_params['port']);
+        $ldap = &new Net_LDAP($config);
+        $ldap->_link = $this->_ds;
+
+        $_schema = &$ldap->schema();
+
+        return $_schema;
+    }
+
+    /**
      * Take an array of DN elements and properly quote it according to
      * RFC 1485.
      *


--- orig/scripts/sql/turba_objects.mysql.sql
+++ mod/scripts/sql/turba_objects.mysql.sql
@@ -1,4 +1,4 @@
--- $Horde: turba/scripts/sql/turba_objects.mysql.sql,v 1.2.8.1 2005/08/14 09:28:21 jan Exp $
+-- $Horde: turba/scripts/sql/turba_objects.mysql.sql,v 1.2.8.2 2005/10/18 12:50:17 jan Exp $
 -- You can simply execute this file in your database.
 --
 -- Run as:


--- orig/minisearch.php
+++ mod/minisearch.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: turba/minisearch.php,v 1.20.4.3 2005/03/05 23:15:55 chuck Exp $
+ * $Horde: turba/minisearch.php,v 1.20.4.7 2006/02/18 03:32:46 chuck Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -15,10 +15,7 @@
 $results = array();
 
 // Make sure we have a source.
-$source = Util::getFormData('source');
-if (!isset($source) && isset($cfgSources) && is_array($cfgSources) && count($cfgSources) > 0) {
-    $source = $prefs->getValue('default_dir');
-}
+$source = Util::getFormData('source', Turba::getDefaultAddressBook());
 if (!isset($cfgSources[$source])) {
     reset($cfgSources);
     $source = key($cfgSources);
@@ -26,7 +23,7 @@
 
 // Do the search if we have one.
 if (!is_null($search)) {
-    $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+    $driver = &Turba_Driver::singleton($source);
     if (!is_a($driver, 'PEAR_Error')) {
         $criteria['name'] = trim($search);
         $res = $driver->search($criteria);
@@ -55,21 +52,18 @@
 require TURBA_TEMPLATES . '/common-header.inc';
 
 ?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 window.setTimeout('var status = window.parent.document.getElementById(\'turba_minisearch_searching\'); status.style.visibility = \'hidden\'', 10);
 window.parent.busyExpanding = false;
-//--//-->
+//-->
 </script>
 <?php
 if (count($results)) {
-    echo '<table width="100%"><tr><td class="control"><b>' . _("Search Results") . ':</b></td></tr>';
-
-    $i = 0;
+    echo '<ul style="margin-top:4px">';
     foreach ($results as $contact) {
-        $url = 'display.php';
-        $url = Util::addParameter($url, 'source', $contact['source']);
-        $url = Util::addParameter($url, 'key', $contact['key']);
+        $url = Util::addParameter('display.php', array('source' => $contact['source'],
+                                                       'key' => $contact['key']));
 
         $mail_link = $GLOBALS['registry']->call('mail/compose', array(array('to' => addslashes($contact['email']))));
         $target = ' target="_parent"';
@@ -78,11 +72,11 @@
             $target = '';
         }
 
-        echo '<tr><td class="item' . ($i++ % 2) . '">';
-        echo Horde::link(Horde::applicationUrl($url), _("View Contact"), '', '_parent') . Horde::img('contact.png', _("View Contact")) . '</a> ';
-        echo '<a href="' . $mail_link . '"' . $target . '>' . htmlspecialchars($contact['name'] . " <" . $contact['email'] . ">") . '</a></td></tr>';
+        echo '<li class="linedRow">' .
+            Horde::link(Horde::applicationUrl($url), _("View Contact"), '', '_parent') . Horde::img('contact.png', _("View Contact")) . '</a> ' .
+            '<a href="' . $mail_link . '"' . $target . '>' . htmlspecialchars($contact['name'] . ' <' . $contact['email'] . '>') . '</a></li>';
     }
-    echo '</table>';
+    echo '</ul>';
 } elseif (!is_null($search)) {
     echo _("No contacts found");
 }


--- orig/lib/ListView.php
+++ mod/lib/ListView.php
@@ -3,11 +3,10 @@
  * The Turba_ListView:: class provides an interface for objects that
  * visualize Turba_lists.
  *
- * $Horde: turba/lib/ListView.php,v 1.17.10.2 2005/06/08 00:48:12 selsky Exp $
+ * $Horde: turba/lib/ListView.php,v 1.17.10.9 2005/12/08 18:36:59 mrubinsk Exp $
  *
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @author  Jon Parise <jon at csh.rit.edu>
- * @since   Turba 0.0.1
  * @package Turba
  */
 class Turba_ListView {
@@ -20,21 +19,225 @@
     var $list;
 
     /**
+     * The header template.
+     *
+     * @var string
+     */
+    var $templateHeader;
+
+    /**
+     * The footer template.
+     *
+     * @var string
+     */
+    var $templateFooter;
+
+    /**
      * The template used to display each row of the list.
+     *
+     * @var string
+     */
+    var $templateRow;
+
+    /**
+     * Show/hide "mark" column in the display.
+     *
+     * @var boolean
+     */
+    var $showMark = false;
+
+    /**
+     * Show/hide "edit" column in the display.
+     *
+     * @var boolean
+     */
+    var $showEdit = false;
+
+    /**
+     * Show/hide "vcard" column in the display.
+     *
+     * @var boolean
+     */
+    var $showVcard = false;
+
+    /**
+     * Show/hide "group" column in the display.
+     *
+     * @var boolean
+     */
+    var $showGroup = false;
+
+    /**
+     * Show/hide "sort" column in the display.
+     *
+     * @var boolean
+     */
+    var $showSort = false;
+
+    /**
+     * Type of list.
+     *
      * @var string
      */
-    var $template;
+    var $type;
 
     /**
      * Constructs a new Turba_ListView object.
      *
-     * @param $list     List of contacts to display.
-     * @param $template What template file to display this contact with.
+     * @param Turba_List $list  List of contacts to display.
      */
-    function Turba_ListView(&$list, $template)
+    function Turba_ListView(&$list, $columns = null)
     {
+        if (is_null($columns)) {
+            $columns = array('Mark' => true,
+                             'Edit' => true,
+                             'Vcard' => true,
+                             'Group' => true,
+                             'Sort' => true);
+        }
+
         $this->list = &$list;
-        $this->template = $template;
+        $this->setColumns($columns);
+        $this->setTemplates(array('Header' => TURBA_TEMPLATES . '/browse/column_headers.inc',
+                                  'Footer' => TURBA_TEMPLATES . '/browse/column_footers.inc',
+                                  'Row' => TURBA_TEMPLATES . '/browse/row.inc'));
+    }
+
+    /**
+     * Control which columns are shown by the display templates.
+     *
+     * @param array $columns
+     */
+    function setColumns($columns)
+    {
+        foreach ($columns as $column => $show) {
+            $key = 'show' . $column;
+            $this->$key = (bool)$show;
+        }
+    }
+
+    /**
+     * Set the header, footer, and row templates for display.
+     *
+     * @param array $templates
+     */
+    function setTemplates($templates)
+    {
+        foreach ($templates as $template => $file) {
+            $key = 'template' . $template;
+            $this->$key = $file;
+        }
+    }
+
+    function setType($type)
+    {
+        $this->type = $type;
+    }
+
+    function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Returns the number of Turba_Objects that are in the list. Use this to
+     * hide internal implementation details from client objects.
+     *
+     * @return integer  The number of objects in the list.
+     */
+    function count()
+    {
+        return $this->list->count();
+    }
+
+    function display()
+    {
+        global $prefs, $conf, $source, $add_source_options;
+
+        $driver = &Turba_Driver::singleton($source);
+        if (!is_a($driver, 'PEAR_Error')) {
+            if ($driver->hasPermission(PERMS_DELETE)) {
+                $hasDelete = true;
+            }
+           if ($driver->hasPermission(PERMS_EDIT)) {
+                $hasEdit = true;
+           }
+        }
+        list($addToList, $addToListSources) = $this->getAddSources();
+        require TURBA_TEMPLATES . '/browse/actions.inc';
+
+        $viewurl = Util::addParameter('browse.php', array(
+            'sortby' => Util::getFormData('sortby'),
+            'sortdir' => Util::getFormData('sortdir'),
+            'key' => Util::getFormData('key'),
+            'source' => Util::getFormData('source', $source),
+            ));
+
+        if ($this->type == 'search') {
+            $page = Util::getFormData('page', 0);
+            $numitem = $this->count();
+            $maxpage = $prefs->getValue('maxpage');
+            $perpage = $prefs->getValue('perpage');
+
+            $min = $page * $perpage;
+            while ($min > $numitem) {
+                $page--;
+                $min = $page * $perpage;
+            }
+
+            $max = $min + $perpage;
+            $start = ($page * $perpage) + 1;
+            $end = min($numitem, $start + $perpage - 1);
+
+            $numDisplayed = $this->displayPage($min, $max);
+
+            require_once 'Horde/Variables.php';
+            $vars = &Variables::getDefaultVariables();
+            $crit = array();
+            if ($_SESSION['turba_search_mode'] == 'advanced') {
+                $map = $driver->getCriteria();
+                foreach ($map as $key => $value) {
+                    if ($key != '__key') {
+                        $val = Util::getFormData($key);
+                        if (!empty($val)) {
+                            $crit[$key] = $val;
+                        }
+                    }
+                }
+            }
+            $params = array_merge($crit, array(
+                'source' => $source,
+                'criteria' => Util::getFormData('criteria'),
+                'val' => Util::getFormData('val')
+            ));
+            $viewurl = Util::addParameter('search.php', $params);
+
+            require_once 'Horde/UI/Pager.php';
+            $pager = &new Horde_UI_Pager('page', $vars,
+                                         array('num' => $numDisplayed,
+                                               'url' => $viewurl,
+                                               'page_limit' => $maxpage,
+                                               'perpage' => $perpage));
+
+            $footer = 'footer.inc';
+        } else {
+            $page = Util::getFormData('page', '*');
+            if ($this->count() > $prefs->getValue('perpage') &&
+                (Util::getFormData('show') != 'lists' ||
+                !Util::getFormData('key'))) {
+                $page = Util::getFormData('page', 'A');
+            }
+
+            if (empty($page) || !preg_match('/^[A-Za-z*]$/', $page)) {
+                $page = '*';
+            }
+
+            $this->displayAlpha($page);
+            $footer = 'footerAlpha.inc';
+        }
+
+        require TURBA_TEMPLATES . '/browse/actions.inc';
+        require TURBA_TEMPLATES . '/browse/' . $footer;
     }
 
     /**
@@ -42,18 +245,34 @@
      *
      * @return integer $count The number of objects in the list.
      */
-    function display($min, $max)
+    function displayPage($min = null, $max = null)
     {
+        global $registry, $attributes, $columns, $source;
+
+        if (is_null($min)) {
+            $min = 0;
+        }
+        if (is_null($max)) {
+            $max = $this->list->count();
+        }
+
+        $sortby = $GLOBALS['prefs']->getValue('sortby');
+        $sortdir = (int)$GLOBALS['prefs']->getValue('sortdir');
+        $width = floor(90 / (count($columns) + 1));
+
+        include $this->templateHeader;
+
         $i = 0;
         $this->list->reset();
-
         while ($ob = $this->list->next()) {
             if ($i++ < $min || $i > $max) {
                 continue;
             }
 
-            include $this->template;
+            include $this->templateRow;
         }
+
+        include $this->templateFooter;
         return $i;
     }
 
@@ -64,10 +283,18 @@
      */
     function displayAlpha($alpha)
     {
-        $this->list->reset();
+        global $registry, $attributes, $columns, $source;
+
+        $sortby = $GLOBALS['prefs']->getValue('sortby');
+        $sortdir = (int)$GLOBALS['prefs']->getValue('sortdir');
+        $width = floor(90 / (count($columns) + 1));
+
+        include $this->templateHeader;
+
         $alpha = String::lower($alpha);
 
         $i = 0;
+        $this->list->reset();
         while ($ob = $this->list->next()) {
             $name = Turba::formatName($ob);
 
@@ -75,9 +302,54 @@
                 continue;
             }
 
-            include $this->template;
+            include $this->templateRow;
             $i++;
         }
+
+        include $this->templateFooter;
+        return $i;
+    }
+
+    function getAddSources()
+    {
+        global $addSources;
+
+        // Create list of lists for Add to.
+        $addToList = array();
+        $addToListSources = array();
+        foreach ($addSources as $src => $srcConfig) {
+            if (!empty($srcConfig['map']['__type'])) {
+                $addToListSources[] = array('key' => '',
+                                            'name' => '&nbsp;&nbsp;' . htmlspecialchars($srcConfig['title']),
+                                            'source' => htmlspecialchars($src));
+
+                $srcDriver = &Turba_Driver::singleton($src);
+                $listList = $srcDriver->search(array('__type' => 'Group'),
+                                               'name', 'AND', 0, array('name'));
+                if (is_a($listList, 'PEAR_Error')) {
+                    $GLOBALS['notification']->push($listList, 'horde.error');
+                } else {
+                    $listList->reset();
+                    $currentList = Util::getFormData('key');
+                    while ($listObject = $listList->next()) {
+                        if ($listObject->getValue('__key') != $currentList) {
+                            $addToList[] = array('name' => htmlspecialchars($listObject->getValue('name')),
+                                                 'source' => htmlspecialchars($src),
+                                                 'key' => htmlspecialchars($listObject->getValue('__key')));
+                        }
+                    }
+                }
+            }
+        }
+        if ($addToListSources) {
+            if ($addToList) {
+                array_unshift($addToList, '-----');
+            }
+            $addToList = array_merge(array(_("Create a new Contact List in:")), $addToListSources, $addToList);
+            $addToListSources = null;
+        }
+
+        return array($addToList, $addToListSources);
     }
 
 }


--- orig/po/fi_FI.po
+++ mod/po/fi_FI.po
@@ -1,43 +1,56 @@
 # Finnish translation for Turba.
 # Copyright (C)
-# Leena Heino <liinu at uta.fi>, 2001-2004.
+# Leena Heino <liinu at uta.fi>, 2001-2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba 2.0-cvs\n"
+"Project-Id-Version: Turba 2.1-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-09-01 17:22+0300\n"
-"PO-Revision-Date: 2004-12-10 12:59+0200\n"
+"POT-Creation-Date: 2006-02-24 10:46+0200\n"
+"PO-Revision-Date: 2006-02-13 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"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: browse.php:120
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr "Lisää IMSP-osoitekirja"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr "Poista IMSP-osoitekirja"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "\"%s\" on jo olemassa ja ei tuotu."
+
+#: browse.php:140
 #, php-format
 msgid "\"%s\" was not copied because it is a list."
 msgstr "\"%s\" ei kopioitu koska se on lista."
 
-#: browse.php:118
+#: browse.php:138
 #, php-format
 msgid "\"%s\" was not moved because it is a list."
 msgstr "\"%s\" ei siirretty koska se on lista."
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Etunimi Sukunimi\"  (esim. Matti Meikäläinen)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Sukunimi, Etunimi\" (esim. Meikäläinen, Matti)"
 
-#: add.php:87
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s lisätty."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "%s tiedoston tuonti onnistui"
@@ -47,48 +60,81 @@
 msgid "%s to %s of %s"
 msgstr "%s - %s / %s"
 
-#: lib/Block/minisearch.php:45
+#: lib/Turba.php:466
+#, php-format
+msgid "%s's Address Book"
+msgstr "%s:n osoitekirja"
+
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr "Tarvitaan selain, jossa on tuki iFrames toiminnolle"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "hakulomakkeen yläpuolella"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Ta_rkempi haku"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "%s käyttö kielletty"
 
-#: add.php:52
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "Lisää"
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "Lisää osoitekirja"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "Lisää ja poista IMSP-osoitekirjoja"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Lisää sarake"
 
-#: templates/browse/actions.inc:22
+#: edit.php:135
+msgid "Add file"
+msgstr "Lisää tiedosto"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Lisää kohteeseen"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "Yhteystietojen lisääminen ei ole käytettävissä."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "Osoitekirja"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Osoitekirjan selaus"
 
-#: add.php:86
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Osoitekirjat"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Osoitekirjan merkintä"
 
-#: lib/Driver.php:478
-msgid "Address book is read-only."
-msgstr "Osoitekirjaa voi vain lukea."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Osoitekirja tyhjennettiin."
 
-#: search.php:97 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "Poistettava osoitekirja "
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "Osoitekirjaa ei voitu näyttää: %s"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Tarkempi haku"
 
@@ -96,55 +142,37 @@
 msgid "Alias"
 msgstr "Alias"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/actions.inc:48 templates/browse/footerAlpha.inc:7
+#: templates/browse/footerAlpha.inc:10
 msgid "All"
 msgstr "Kaikki"
 
-#: lib/api.php:395
+#: lib/api.php:554
 msgid "Already Exists"
 msgstr "On jo olemassa"
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Oletko varma, että haluat poistaa %s?"
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Oletko varma, että haluat poistaa valitut?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Käytettävissäolevat sarakkeet:"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Pa_laa takaisin %s"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "Palaa takaisin %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Yksi_nkertainen haku"
-
-#: search.php:94 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Yksinkertainen haku"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "Hakulomakkeen alapuolella"
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Yhdistäminen epäonnistui (%s) %s"
@@ -153,51 +181,63 @@
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "Selaa"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Liiketoiminnan luokitus"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "P_oista hakuehdot"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "Ei voi lisätä ryhmää itseensä."
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Valitse _kaikki/ei mitään"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Voit valita oletushakemiston osoitekirjaksi, osoitelistaksi ja  "
-"käytettäväksi hakutoiminnoissa."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "Valitse nimi"
 
-#: add.php:44
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Valitse osoitekirja"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Valitse sarakkeiden järjestys osoitelistassa."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "Valitse osoitekirja:"
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "Poista hakuehdot"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr "Valitse mitkä osoitekirjat näytetään ja missä järjestyksessä:"
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "Valitse mitä osoitekirjoja käytetään."
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "Valitse mitkä sarakkeet näytetään ja missä järjestyksessä:"
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Sarakkeiden asetukset"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Sarakkeita, joita ei voitu näyttää:"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Pilkuilla erotetut arvot"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Pilkuilla erotetut arvot (Microsoft Outlook)"
 
@@ -209,70 +249,77 @@
 msgid "Company Address"
 msgstr "Yrityksen osoite"
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:384 lib/api.php:454
-#: lib/api.php:544 lib/api.php:590 lib/api.php:638 lib/api.php:825
-#: lib/api.php:918
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:840
+#: lib/api.php:1037 lib/api.php:1125
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Yhteys epäonnistui: %s"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Yhteys epäonnistui"
 
-#: browse.php:60
-msgid "Contact removed from list."
-msgstr "Yhteystiedot poistettiin listalta."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Yhteystietojen haku"
 
-#: browse.php:257
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Yhteystiedot listassa: %s"
 
-#: browse.php:281
-#, php-format
-msgid "Contents of %s"
-msgstr "%s:n sisältö"
-
-#: templates/browse/actions.inc:12
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "Kopioi"
 
-#: lib/ObjectView.php:134
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Luo"
+
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "Luo osoitekirja"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Luo uusi yhteystietolista osoitekirjaan:"
+
+#: lib/ObjectView.php:133
 msgid "Created"
 msgstr "Luotu"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Oletusnäkymä"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "Oletushakemisto osoitekirjaksi, osoitelistaksi ja haku toimintoihin."
-
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Oletusjärjestyksen suunta:"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Poista"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "Poista osoitekirja"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
-msgstr "Poista varmistus"
+msgstr "Poiston varmistus"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
-msgstr "Voit muokata poista-painikkeen toimintaa"
+msgstr "Voit muuttaa Poista painikkeen toimintaa"
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Poistaminen epäonnistui: (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "Yhteystietojen poisto ei ole käytettävissä."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Poistaminen epäonnistui"
 
@@ -280,38 +327,55 @@
 msgid "Department"
 msgstr "Osasto"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Laskeva"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Kuvaus"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Hakemisto"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Näkymä"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Näkymän asetukset"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "Varmista aina kun poistetaan merkintöjä."
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Tallenna"
+
+#: templates/browse/contactrow.inc:25 templates/browse/row.inc:17
 msgid "Download vCard"
 msgstr "Tallenna VCard"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/actions.inc:6
+#: templates/browse/column_headers.inc:10 templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/contactrow.inc:33 templates/browse/row.inc:25
 #, php-format
 msgid "Edit \"%s\""
 msgstr "Muokkaa \"%s\""
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "Muokkaa osoitekirjoja"
+
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Muokkaa %s:n merkintää"
@@ -320,59 +384,105 @@
 msgid "Email"
 msgstr "Sähköposti"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+"Merkintää %s päivitettiin, mutta tuodun tiedoston tallettaminen epäonnistui: "
+"%s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Merkintä %s:stä on päivitetty."
 
-#: templates/data/export.inc:46 templates/browse/actions.inc:6
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "Tapahtui virhe lisättäessä %d yhteystietoa listalle."
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr "Tapahtui virhe lisättäessä %d / %d yhteystietoa listalle."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Tapahtui virhe poistettaessa %d yhteystietoa."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "Tapahtui virhe poistettaessa %d / %d osoitetietoa."
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "Tapahtui virhe poistettaessa %d osoitetietoa listalta."
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr "Tapahtui virhe poistettaessa %d / %d osoitetietoa listalta."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "Tapahtui virhe haettaessa osoitekirjasta: %s"
+
+#: templates/data/export.inc:41 templates/browse/actions.inc:10
 msgid "Export"
 msgstr "Vie"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Vie osoitekirja"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Vie vain valitut yhteystiedot."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Vie seuraavat osoitekirjat kokonaan."
 
-#: browse.php:37 browse.php:94 browse.php:109 add.php:63 data.php:110
-#: data.php:228 search.php:52
+#: browse.php:35 browse.php:103 browse.php:130 add.php:67 data.php:134
+#: data.php:228 data.php:297 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Osoitekirjaan ei saatu yhteyttä: %s"
 
-#: browse.php:128
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "%s:n lisäys epäonnistui %s:ään: %s"
 
-#: browse.php:263
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "Listan selaus epäonnistui."
 
-#: browse.php:297
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "Hakemiston selaus epäonnistui"
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 "Nimen muuttaminen epäonnistui: (%s) %s; Uusi DN = %s, Vanha DN = %s, Juuri = "
 "%s"
 
-#: browse.php:114
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Lisättävän objektin haku epäonnistui: %s"
 
-#: data.php:124 search.php:88
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "Haku osoitekirjasta epäonnistui"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Haku epäonnistui hakemistosta: %s"
@@ -381,10 +491,18 @@
 msgid "Fax"
 msgstr "Faksi"
 
-#: templates/browse/search.inc:72
+#: display.php:100 edit.php:131
+msgid "Files"
+msgstr "Tiedostot"
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr "Haku"
 
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "Päätä"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Etunimi"
@@ -393,15 +511,15 @@
 msgid "Freebusy URL"
 msgstr "Freebusy URL"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "Lähde"
 
-#: config/sources.php.dist:563
+#: config/sources.php.dist:606
 msgid "Global Address Book"
 msgstr "Yleinen osoitekirja"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/contactrow.inc:44 templates/browse/row.inc:43
 msgid "Group"
 msgstr "Ryhmä"
 
@@ -419,11 +537,11 @@
 
 #: config/attributes.php.dist:150
 msgid "Home Phone"
-msgstr "Puhelin(koti)"
+msgstr "Puhelin (koti)"
 
 #: config/attributes.php.dist:103
 msgid "Home Postal Code"
-msgstr "Postinumero(koti)"
+msgstr "Postinumero (koti)"
 
 #: config/attributes.php.dist:98
 msgid "Home State/Province"
@@ -431,61 +549,61 @@
 
 #: config/attributes.php.dist:88
 msgid "Home Street Address"
-msgstr "Katuosoite(Koti)"
+msgstr "Katuosoite (koti)"
 
-#: config/sources.php.dist:488
+#: config/sources.php.dist:508
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "IMSP-osoitekirjan hallinta"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Osoitekirjan tuonti, askel %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Tuo/Vie osoitekirjoja"
 
-#: lib/api.php:378 lib/api.php:604
-msgid "Invalid Content-Type"
-msgstr "Virheellinen Content-Type"
-
-#: lib/api.php:441 lib/api.php:531
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "Virheellinen ID"
 
-#: lib/api.php:191 lib/api.php:336 lib/api.php:437 lib/api.php:527
-#: lib/api.php:580 lib/api.php:895
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1108
 msgid "Invalid address book"
 msgstr "Epäkelpo osoitekirja"
 
-#: lib/api.php:899 lib/api.php:973 lib/api.php:1026
+#: lib/api.php:1112 lib/api.php:1186 lib/api.php:1239
 msgid "Invalid email"
 msgstr "Virheellinen sähköpostiosoite"
 
-#: lib/api.php:907
+#: lib/api.php:1120
 msgid "Invalid entry"
 msgstr "Virheellinen merkintä"
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Määritelty avain on virheellinen"
 
-#: lib/api.php:903
+#: lib/api.php:1116
 msgid "Invalid name"
 msgstr "Virheellinen nimi"
 
-#: lib/api.php:584
+#: lib/api.php:753
 msgid "Invalid objectId"
 msgstr "Virheellinen objectId"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "LDAP-tuki on pakollinen, mutta LDAP-moduuli ei ole käytettävissä tai ladattu."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Muokattu viimeksi"
 
@@ -493,23 +611,27 @@
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Lista"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "On"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "Yhteystietojen enimmäismäärä"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Suurin sallittu määrä sivuja."
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Pieni haku"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Valikkolista"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "DN puuttuu LDAP lähdemäärittelyistä."
 
@@ -517,32 +639,34 @@
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Muokkaus epäonnistui: (%s) %s"
 
-#: lib/api.php:1012
+#: lib/api.php:1225
 msgid "More than 1 entry found"
 msgstr "Löytyi useampi kuin 1 merkintää"
 
-#: templates/browse/actions.inc:11
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Siirrä"
 
+#: templates/prefs/addressbookselect.inc:184
 #: templates/prefs/columnselect.inc:247
 msgid "Move left"
 msgstr "Siirrä vasemmalle"
 
+#: templates/prefs/addressbookselect.inc:186
 #: templates/prefs/columnselect.inc:249
 msgid "Move right"
 msgstr "Siirrä oikealle"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry-osoitekirja"
 
-#: lib/api.php:932
+#: lib/api.php:1144
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
@@ -550,31 +674,31 @@
 "Osoitekirjassa oli monta henkilöä osoitteella [%s], mutta ei ketään nimellä "
 "[%s]."
 
-#: config/sources.php.dist:87 config/sources.php.dist:221
-msgid "My Addressbook"
-msgstr "Osoitekirjani"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+msgid "My Address Book"
+msgstr "Oma osoitekirja"
+
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr "Omat osoitekirjat"
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nimi"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Nimen muoto"
 
-#: config/sources.php.dist:295
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter jäsenhakemisto"
 
-#: add.php:36 add.php:103 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "Uusi lista"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Seuraava"
 
@@ -582,20 +706,20 @@
 msgid "Nickname"
 msgstr "Lempinimi"
 
-#: lib/api.php:1014 lib/api.php:1063
+#: lib/api.php:1227 lib/api.php:1276
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Merkintää %s ei löytynyt %s:lle"
 
-#: lib/api.php:982
+#: lib/api.php:1195
 msgid "No address books found."
 msgstr "Ei löytynyt ainuttakaan osoitekirjaa."
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr "Ei löytynyt yhteystietoja"
 
-#: lib/api.php:358
+#: lib/api.php:513 lib/api.php:784
 msgid "No vCard data was found."
 msgstr "vCard tietoja ei löytynyt."
 
@@ -607,11 +731,11 @@
 msgid "Notes"
 msgstr "Muistiinpanot"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Tietoja lukumäärä sivulla"
 
-#: lib/api.php:460
+#: lib/api.php:632 lib/api.php:765
 msgid "Object not found"
 msgstr "Objektia ei löytynyt"
 
@@ -619,7 +743,21 @@
 msgid "Office"
 msgstr "Toimisto"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+"Kun talletat tämän asetussivun, niin osoitekirjasi poistuu lopullisesti. Jos "
+"et halua poistaa osoitekirjaasi, niin sinun pitää muuttaa valinnaksi \"Ei "
+"mitään\"."
+
+#: lib/api.php:792
+msgid "Only one vcard supported."
+msgstr "Tuettuna vain yksi vcard."
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Muut asetukset"
 
@@ -627,49 +765,65 @@
 msgid "PGP Public Key"
 msgstr "Julkinen PGP-avain"
 
-#: lib/api.php:342 lib/api.php:447 lib/api.php:537 lib/api.php:596
-#: lib/api.php:753 lib/api.php:913
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:965
+#: lib/api.php:1129
 msgid "Permission Denied"
 msgstr "Käyttö kielletty"
 
-#: lib/Driver.php:436
+#: lib/Driver.php:554
 msgid "Permission denied"
 msgstr "Käyttö kielletty"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Oikeudet"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine-osoitekirja"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
-msgstr "Anna nimi uudelle listalle:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "Anna nimi uudelle yhteystietolistalle:"
+
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "Edellinen"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Valitse hakemisto:"
-
-#: config/sources.php.dist:399
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Yksityinen osoitekirja"
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Kysely epäonnistui: (%s) %s"
 
-#: templates/block/minisearch.inc:18
+#: templates/block/minisearch.inc:15
 msgid "Quick Search"
 msgstr "Pikahaku"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Luku epäonnistui: (%s) %s"
 
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "Yhteystietojen luku ei ole käytettävissä."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "Haluatko poistaa tämän yhteystiedon?"
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Näytettävät tiedot:"
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "Poista osoitekirja"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Poista sarake"
@@ -678,19 +832,19 @@
 msgid "Remove from this list"
 msgstr "Poista tältä listalta"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Korvaa olemassaoleva osoitekirja tuodulla osoitekirjalla. <b>Varoitus: Tämä "
-"poistaa kaikki merkinnät nykyisestä osoitekirjastasi.</b>"
+"Korvaa olemassaoleva osoitekirja tuodulla osoitekirjalla. <strong>Varoitus: "
+"Tämä poistaa kaikki merkinnät nykyisestä osoitekirjastasi.</strong>"
 
-#: lib/Driver.php:330
+#: lib/Driver.php:442
 msgid "Requested object not found."
 msgstr "Pyydettyä objektia ei löytynyt."
 
-#: add.php:37 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Palauta oletukset"
 
@@ -698,162 +852,207 @@
 msgid "S/MIME Public Certificate"
 msgstr "Julkinen S/MIME-varmenne"
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr "STARTTLS epäonnistui: (%s) %s"
 
-#: add.php:37 edit.php:57
+#: add.php:37 edit.php:106 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Talleta"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "Yhteystietojen talletus ei ole käytettävissä."
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:18 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Haku"
 
-#: browse.php:241 minisearch.php:66
-msgid "Search Results"
-msgstr "Haun tulokset"
-
-#: lib/api.php:829
+#: lib/api.php:1042
 msgid "Search failed"
 msgstr "Haku epäonnistui"
 
-#: lib/api.php:922 lib/api.php:928 lib/api.php:937 lib/api.php:950
+#: lib/api.php:1134 lib/api.php:1140 lib/api.php:1149 lib/api.php:1162
 #, php-format
 msgid "Search failed: %s"
 msgstr "Haku epäonnistui: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Haun asetukset"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "Haku ei ole käytettävissä."
 
-#: templates/block/minisearch.inc:24
+#: templates/block/minisearch.inc:19
 msgid "Searching..."
 msgstr "Haetaan..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Valitse osoitekirja"
-
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "Valitse lista"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "Valitse poistettava osoitekirja"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "Valitse muokattava osoitekirja"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Valitse osoitekirja, josta viedään tietoja:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Valitse osoitekirja, johon tuodaan tietoja:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Valitse lähdetiedoston merkistö:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Valitse viennissä käytettävä muoto:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Valitse tiedosto, josta tuodaan tietoja:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Valitse lähdetiedoston muoto:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Valitse nimien esitysmuoto:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Voit valita oletusnäkymän."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr "Valitse oletusnäkymä, järjestysasetukset ja sivutusasetukset."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Valitse osoitelistassa näytettävät kentät."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Voit valita nimien esitysmuodon."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Valitut sarakkeet:"
-
-#: add.php:50
+#: add.php:54
 #, php-format
 msgid "Selected address book \"%s\"."
 msgstr "Valittu osoitekirja \"%s\"."
 
-#: config/sources.php.dist:154
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Jaettu hakemisto"
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "Näy_tä kaikki"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Näytä"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "Näytä %s"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Näytä kaikki"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Näytä yhteystiedot"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Näytä listat"
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "Näytä _yhteystiedot"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "Näytä _listat"
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr "Järjestyksen suunta"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "Lähteet"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr "Määrittele mihin haluat edistyneen haun tuloksien tulevan."
 
-#: browse.php:130
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "Onnistuttiin lisäämään %d yhteystietoa listalle."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "Onnistuttiin lisäämään %s %s:ään"
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Yhteystietolistan \"%s\" luonti onnistui."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "Onnistuttiin poistamaan %d yhteystietoa."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "Onnistuttiin poistamaan %d yhteystietoa listalta."
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tabulaattorein(TAB) erotetut arvot"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+"VFS-taustajärjestelmä pitää olla käytettävissä ennen kuin liitteitä voi "
+"tuoda."
+
+#: lib/Driver.php:1080
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Osoitekirjaa \"%s\" ei ole olemassa."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Osoitekirjan \"%s\" luonti onnistui."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Osoitekirjan \"%s\" poisto onnistui."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Osoitekirjan \"%s\" muokkaus onnistui."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Osoitekirjaa ei voitu tyhjentää: %s"
 
-#: edit.php:24 display.php:23 vcard.php:22
+#: display.php:23 edit.php:51 vcard.php:22 view.php:26
 msgid "The contact you requested does not exist."
-msgstr "Pyytämääsi ohjektia ei ole olemassa."
+msgstr "Pyytämääsi yhteystietoa ei ole olemassa."
+
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Tiedoston \"%s\" poisto onnistui."
 
-#: browse.php:33
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "Tuonnin voi suorittaa loppuun vaikka tulisi varoituksia."
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Osoitekirjoja ei voi selata."
 
@@ -867,7 +1066,7 @@
 "salli sinun lisätä niihin uusia osoitteita. Jos epäilet virhetilannetta, "
 "niin ota yhteys järjestelmän ylläpitäjään."
 
-#: add.php:99
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -875,94 +1074,117 @@
 "Tapahtui virhe uusien yhteystietojen lisäämisessä. Ota yhteyttä järjestelmän "
 "ylläpitäjään."
 
-#: browse.php:185
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "Tapahtui virhe tehtäessä uutta listaa."
 
-#: browse.php:136
+#: addressbooks.php:38
 #, php-format
-msgid "There was an error deleting %s from the source address book."
-msgstr "Tapahtui virhe poistettaessa %s lähteenä käytetystä osoitekirjasta."
+msgid "There was an error creating this address book: %s"
+msgstr "Tapahtui virhe luotaessa osoitekirjaa: %s"
 
-#: delete.php:31
+#: browse.php:166
+#, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr ""
+"Tapahtui virhe poistettaessa \"%s\" lähteenä käytetystä osoitekirjasta."
+
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Tapahtui virhe poistettaessa tätä yhteystietoa: %s"
 
-#: browse.php:68
-msgid "There was an error deleting this object."
-msgstr "Tapahtui virhe poistettaessa tätä objektia."
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "Tapahtui virhe näytettäessä listaa"
 
-#: browse.php:273
-msgid "There was an error displaying the select List"
-msgstr "Tapahtui virhe näytettäessä valittu listaa"
-
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Tapahtui virhe tuotaessa tietoa: %s"
 
-#: lib/api.php:354
+#: lib/api.php:509 lib/api.php:779
 msgid "There was an error importing the iCalendar data."
 msgstr "iCalendar-tietojen tuonnissa tapahtui virhe."
 
-#: browse.php:58
-msgid "There was an error removing this object."
-msgstr "Tapahtui virhe poistettaessa tätä objektia."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Tapahtui virhe poistettaessa tätä osoitekirjaa: %s."
 
-#: edit.php:84
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Tapahtui virhe päivitettäessä tätä osoitekirjaa: %s"
+
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Tämän merkinnän päivityksessä tapahtui virhe: %s."
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Ei ole yhtään vietävää osoitetta."
 
-#: lib/Driver.php:390 lib/Driver.php:427
-msgid "This address book is read-only"
-msgstr "Tätä osoitekirjaa voi vain lukea."
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "Nämä osoitekirjat näytetään tässä järjestyksessä:"
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Nämä sarakkeet näytetään tässä järjestyksessä:"
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Tämä tiedostomuoto ei ole tuettu."
 
-#: lib/api.php:941 lib/api.php:954
+#: lib/api.php:1153 lib/api.php:1166
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Tällä henkilöllä on jo %s merkintä osoitekirjassa"
 
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr "Tämä on oletusosoitekirja kun lisätään tai tuodaan yhteystietoja."
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Titteli"
 
-#: lib/Driver.php:834
+#: lib/Turba.php:451
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr "Ei voi luoda uutta jakoa. Lähteen tyyppi puuttuu."
+
+#: lib/Driver.php:1004
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Määrityksen %s lukeminen epäonnistui."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Peru muutokset"
 
-#: lib/api.php:489
-msgid "Unsupported Content-Type."
-msgstr "Ei tuettu Content-Type."
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Ei tuettu Content-Type: %s"
 
-#: config/sources.php.dist:358
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign hakemisto"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/contactrow.inc:27 templates/browse/row.inc:19
 #, php-format
 msgid "View \"%s\""
 msgstr "Näytä \"%s\""
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
 msgstr "Näytä yhteystiedot"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Oletuksena käytettävä näkymä:"
 
@@ -972,37 +1194,38 @@
 
 #: config/attributes.php.dist:113
 msgid "Work Address"
-msgstr "Osoite (Työ)"
+msgstr "Osoite (työ)"
 
 #: config/attributes.php.dist:124
 msgid "Work City"
-msgstr "Kapunki (Työ)"
+msgstr "Kaupunki (työ)"
 
 #: config/attributes.php.dist:139
 msgid "Work Country"
-msgstr "Maa (Työ)"
+msgstr "Maa (työ)"
 
 #: config/attributes.php.dist:156
 msgid "Work Phone"
-msgstr "Puhelin (Työ)"
+msgstr "Puhelin (työ)"
 
 #: config/attributes.php.dist:134
 msgid "Work Postal Code"
-msgstr "Postinumero (Työ)"
+msgstr "Postinumero (työ)"
 
 #: config/attributes.php.dist:129
 msgid "Work State/Province"
-msgstr "Lääni tai alue (Työ)"
+msgstr "Lääni tai alue (työ)"
 
 #: config/attributes.php.dist:119
 msgid "Work Street Address"
-msgstr "Katuosoite (Työ)"
+msgstr "Katuosoite (työ)"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "Olet tekemässä jakelulistaa."
+#: browse.php:106 browse.php:227 add.php:73 data.php:237
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "Ei voi luoda kuin enintään %d yhteystietoa \"%s\":een."
 
-#: edit.php:44 display.php:59
+#: display.php:58 edit.php:73 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Sinulla ei ole oikeuksia nähdä tätä yhteystietoa."
 
@@ -1010,7 +1233,11 @@
 msgid "You do not have permission to view this object."
 msgstr "Sinulla ei ole oikeuksia nähdä tämän objektin tietoja."
 
-#: templates/browse/javascript.inc:51
+#: lib/Turba.php:539
+msgid "You do not have permissions to delete this source."
+msgstr "Sinulla ei ole oikeuksia poistaa tätä lähdettä."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Sinun pitää ensin valita kohdeosoitekirja."
 
@@ -1018,44 +1245,60 @@
 msgid "You must select a target list."
 msgstr "Sinun pitää ensin valita kohdelista."
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "Sinun pitää ensin valita ainakin yksi yhteystieto."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Sinun pitää ensin valita ainakin yksi tietue."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr "Sinulla on oikeudet vain katsoa tätä yhteystietoa."
 
-#: browse.php:284
-msgid "Your default addressbook is not browseable."
+#: browse.php:318
+msgid "Your default address book is not browseable."
 msgstr "Oletusosoitekirjasi ei ole selattavissa."
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/contactrow.inc:12 templates/browse/row.inc:6
 msgid "[no value]"
 msgstr "[ei arvoa]"
 
-#: lib/Turba.php:286
-msgid "_Add"
-msgstr "_Lisää"
-
-#: lib/Turba.php:283
+#: lib/Turba.php:562
 msgid "_Browse"
 msgstr "_Selaa"
 
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "_Yhteystiedot"
+
 #: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "_Poista"
 
-#: lib/Turba.php:292
+#: lib/Turba.php:571
 msgid "_Import/Export"
 msgstr "_Tuo/Vie"
 
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "_Listat"
+
+#: lib/Turba.php:559
+msgid "_My Address Books"
+msgstr "O_mat osoitekirjat"
+
+#: lib/Turba.php:565
+msgid "_New Contact"
+msgstr "_Uusi yhteystieto"
+
 #: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "_Poista tältä listalta"
 
-#: lib/Turba.php:288
+#: lib/Turba.php:567
 msgid "_Search"
 msgstr "_Haku"
 
@@ -1063,19 +1306,35 @@
 msgid "contact.vcf"
 msgstr "contacts.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contacts.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contacts.csv"
 
-#: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
-msgstr "valittuun osoitekirjaan"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "contacts.vcf"
 
-#: data.php:30 templates/data/import.inc:20 templates/data/export.inc:20
-#: templates/browse/column_headers.inc:7
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr "ei muotoilua"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "Ei mitään"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "yhteystietolistaan"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "eri osoitekirjaan"
+
+#: data.php:51 templates/data/import.inc:15 templates/data/export.inc:15
+#: templates/browse/column_headers.inc:13
 msgid "vCard"
 msgstr "vCard"


--- orig/LICENSE
+++ mod/LICENSE
@@ -48,4 +48,4 @@
 the Horde Project, please see <http://www.horde.org/>.
 
 ----------
-$Horde: turba/LICENSE,v 1.1.2.1 2005/03/05 23:15:55 chuck Exp $
\ No newline at end of file
+$Horde: turba/LICENSE,v 1.1.2.2 2005/10/18 12:50:03 jan Exp $
\ No newline at end of file


--- orig/po/de_DE.po
+++ mod/po/de_DE.po
@@ -4,40 +4,53 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba 2.0-cvs\n"
+"Project-Id-Version: Turba 2.1-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-10-13 17:13+0200\n"
-"PO-Revision-Date: 2005-09-26 09:17+0200\n"
+"POT-Creation-Date: 2006-03-06 12:47+0100\n"
+"PO-Revision-Date: 2005-12-28 14:23+0100\n"
 "Last-Translator: Jan Schneider <jan at horde.org>\n"
 "Language-Team: German <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: browse.php:120
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr "IMSP-Adressbuch hinzufügen"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr "IMSP-Adressbuch löschen"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "\"%s\" existiert bereits und wurde nicht importiert."
+
+#: browse.php:140
 #, php-format
 msgid "\"%s\" was not copied because it is a list."
 msgstr "\"%s\" wurde nicht kopiert, da es sich um eine Liste handelt."
 
-#: browse.php:118
+#: browse.php:138
 #, php-format
 msgid "\"%s\" was not moved because it is a list."
 msgstr "\"%s\" wurde nicht verschoben, da es sich um eine Liste handelt."
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Vorname Nachname\" (z.B. Max Mustermann)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Nachname, Vorname\" (z.B. Mustermann, Max)"
 
-#: add.php:87
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s hinzugefügt."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "Die %s-Datei wurde erfolgreich importiert"
@@ -47,48 +60,81 @@
 msgid "%s to %s of %s"
 msgstr "%s bis %s von %s"
 
-#: lib/Block/minisearch.php:45
+#: lib/Turba.php:458
+#, php-format
+msgid "%s's Address Book"
+msgstr "%ss Adressbuch"
+
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr "Ein Browser, der IFrames unterstützt, wird benötigt"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "Über dem Suchformular"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Er_weiterte Suche"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "Zugriff auf %s verweigert"
 
-#: add.php:52
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "Hinzufügen"
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "Adressbuch hinzufügen"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "IMSP-Adressbücher löschen und hinzufügen"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Spalte hinzufügen"
 
-#: templates/browse/actions.inc:22
+#: edit.php:135
+msgid "Add file"
+msgstr "Datei hinzufügen"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Hinzufügen zu"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "Hinzufügen von Kontakten nicht unterstützt."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "Adressbuch"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Adressbuchliste"
 
-#: add.php:86
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Adressbücher"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Adressbucheintrag"
 
-#: lib/Driver.php:478
-msgid "Address book is read-only."
-msgstr "Das Adressbuch kann nur gelesen werden."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Adressbuch wurde erfolgreich geleert."
 
-#: search.php:97 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "Zu löschendes Adressbuch"
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "Adressbücher, die nicht angezeigt werden:"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -96,55 +142,37 @@
 msgid "Alias"
 msgstr "Spitzname"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr "Alle"
 
-#: lib/api.php:395
+#: lib/api.php:553
 msgid "Already Exists"
 msgstr "Existiert bereits"
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Sind Sie sicher, dass Sie %s löschen möchten?"
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Sind Sie sicher, dass Sie die ausgewählten Einträge löschen möchten?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Verfügbare Spalten:"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "_Zurück zu %s"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "Zurück zu %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Ein_fache Suche"
-
-#: search.php:94 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Einfache Suche"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "Unter dem Suchformular"
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Verbindung fehlgeschlagen: (%s) %s"
@@ -153,51 +181,67 @@
 msgid "Birthday"
 msgstr "Geburtstag"
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "Liste"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Geschäftskategorie"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "Suche _zurücksetzen"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "Eine Gruppe kann nicht zu sich selbst hinzugefügt werden."
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "_Alle/Keine auswählen"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Legen Sie das Standardverzeichnis für Ihr persönliches Adressbuch, die "
-"Kontaktlisten und die Suche fest."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "Wählen Sie einen Namen"
 
-#: add.php:44
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Wählen Sie ein Adressbuch"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Legen Sie die Reihenfolge der Spalten in der Adressenliste fest."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "Wählen Sie ein Adressbuch:"
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "Suche zurücksetzen"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+"Wählen Sie aus, welche Adressbücher in welcher Reihenfolge angezeigt werden "
+"sollen:"
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "Wählen Sie die zu benutzenden Adressbücher aus."
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr ""
+"Wählen Sie aus, welche Spalten in welcher Reihenfolge angezeigt werden "
+"sollen:"
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Adressspalten"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Spalten, die nicht angezeigt werden:"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Kommagetrennte Werte"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Kommagetrennte Werte (Microsoft Outlook)"
 
@@ -209,72 +253,77 @@
 msgid "Company Address"
 msgstr "Firmenadresse"
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:384 lib/api.php:454
-#: lib/api.php:544 lib/api.php:590 lib/api.php:638 lib/api.php:825
-#: lib/api.php:918
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:492
+#: lib/api.php:618 lib/api.php:705 lib/api.php:758 lib/api.php:839
+#: lib/api.php:1036 lib/api.php:1124
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Verbindung fehlgeschlagen: %s"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Verbindung fehlgeschlagen"
 
-#: browse.php:60
-msgid "Contact removed from list."
-msgstr "Kontakt wurde aus der Liste gelöscht."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Kontaktsuche"
 
-#: browse.php:257
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Kontakte in Liste: %s"
 
-#: browse.php:281
-#, php-format
-msgid "Contents of %s"
-msgstr "Inhalt von %s"
-
-#: templates/browse/actions.inc:12
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "Kopieren"
 
-#: lib/ObjectView.php:134
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Erstellen"
+
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "Adressbuch Erstellen"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Neue Kontaktliste anlegen in:"
+
+#: lib/ObjectView.php:133
 msgid "Created"
 msgstr "Erstellt"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Standardansicht"
-
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr ""
-"Standardverzeichnis für Ihr persönliches Adressbuch, die Kontaktlisten und "
-"die Suche."
-
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Sortierrichtung:"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Löschen"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "Adressbuch Löschen"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Löschbestätigung"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Verhalten beim Löschen."
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Löschen fehlgeschlagen: (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "Löschen von Kontakten nicht unterstützt."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Löschen ist fehlgeschlagen"
 
@@ -282,38 +331,55 @@
 msgid "Department"
 msgstr "Abteilung"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Absteigend"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Beschreibung"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Anzeige"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Anzeige-Einstellungen"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "Möchten Sie das Löschen von Einträgen bestätigen?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Herunterladen"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "vCard herunterladen"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
 msgid "Edit \"%s\""
 msgstr "\"%s\" bearbeiten"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "Adressbücher Bearbeiten"
+
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Eintrag von %s bearbeiten"
@@ -322,60 +388,106 @@
 msgid "Email"
 msgstr "Email"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+"Eintrag von %s aktualisiert, aber die hochgeladene Datei konnte nicht "
+"gespeichert werden: %s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Eintrag von %s aktualisiert."
 
-#: templates/browse/actions.inc:6 templates/data/export.inc:46
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "Fehler beim Hinzufügen von %d Kontakten zur Liste."
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr "Fehler beim Hinzufügen von %d von %d Kontakten zur Liste."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Fehler beim Löschen von %d Kontakten."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "Fehler beim Löschen von %d von %d Kontakten."
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "Fehler beim Entfernen von %d Kontakten aus der Liste."
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr "Fehler beim Entfernen von %d von %d Kontakten aus der Liste."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "Das Adressbuch konnte nicht durchsucht werden: %s"
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportieren"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Adressbuch exportieren"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Nur die ausgewählten Kontakte exportieren."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Das folgende Adressbuch komplett exportieren."
 
-#: data.php:110 data.php:228 browse.php:37 browse.php:94 browse.php:109
-#: add.php:63 search.php:52
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Das Adressbuch konnte nicht geöffnet werden: %s"
 
-#: browse.php:128
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "%s konnte nicht zu %s hinzugefügt werden: %s"
 
-#: browse.php:263
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "Die Liste konnte nicht angezeigt werden"
 
-#: browse.php:297
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "Das Verzeichnis konnte nicht angezeigt werden"
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 "Name konnte nicht geändert werden: (%s) %s; Alte DN = %s, Neue DN = %s, Root "
 "= %s"
 
-#: browse.php:114
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr ""
 "Das Objekt, das hinzugefügt werden sollte, konnte nicht gefunden werden: %s"
 
-#: data.php:124 search.php:88
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "Das Adressbuch konnte nicht durchsucht werden"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Das Verzeichnis %s konnte nicht durchsucht werden."
@@ -384,10 +496,18 @@
 msgid "Fax"
 msgstr "Fax"
 
-#: templates/browse/search.inc:72
+#: edit.php:131 display.php:102
+msgid "Files"
+msgstr "Dateien"
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr "Durchsuchen von "
 
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "Beenden"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Vorname"
@@ -396,15 +516,15 @@
 msgid "Freebusy URL"
 msgstr "Frei-/Gebucht-URL"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "Von"
 
-#: config/sources.php.dist:562
+#: config/sources.php.dist:606
 msgid "Global Address Book"
 msgstr "Allgemeines Adressbuch"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Gruppe"
 
@@ -436,60 +556,60 @@
 msgid "Home Street Address"
 msgstr "Straße privat"
 
-#: config/sources.php.dist:487
+#: config/sources.php.dist:508
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "IMSP-Adressbuchverwaltung"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Adressbuch importieren, Schritt %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Adressbücher Import/Export"
 
-#: lib/api.php:378 lib/api.php:604
-msgid "Invalid Content-Type"
-msgstr "Ungültiger Inhaltstyp"
-
-#: lib/api.php:441 lib/api.php:531
+#: lib/api.php:613 lib/api.php:700
 msgid "Invalid ID"
 msgstr "Ungültige ID"
 
-#: lib/api.php:191 lib/api.php:334 lib/api.php:437 lib/api.php:527
-#: lib/api.php:580 lib/api.php:895
+#: lib/api.php:232 lib/api.php:404 lib/api.php:487 lib/api.php:609
+#: lib/api.php:696 lib/api.php:748 lib/api.php:1107
 msgid "Invalid address book"
 msgstr "Ungültiges Adressbuch"
 
-#: lib/api.php:899 lib/api.php:973 lib/api.php:1026
+#: lib/api.php:1111 lib/api.php:1185 lib/api.php:1238
 msgid "Invalid email"
 msgstr "Ungültige Email-Adresse"
 
-#: lib/api.php:907
+#: lib/api.php:1119
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Ungültiger Schlüssel angegeben."
 
-#: lib/api.php:903
+#: lib/api.php:1115
 msgid "Invalid name"
 msgstr "Ungültiger Name"
 
-#: lib/api.php:584
+#: lib/api.php:752
 msgid "Invalid objectId"
 msgstr "Ungültige Objekt ID"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "LDAP-Unterstützung wird benötigt, aber das LDAP-Modul ist nicht verfügbar "
 "oder wurde nicht geladen."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Letzte Änderung"
 
@@ -497,23 +617,27 @@
 msgid "Last Name"
 msgstr "Nachname"
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Liste"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "nach"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "Maximale Anzahl an Kontakten"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Maximale Seitenzahl"
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Minisuche"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "Menüliste"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "DN fehlt in der LDAP-Konfiguration."
 
@@ -521,32 +645,34 @@
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Änderung fehlgeschlagen: (%s) %s"
 
-#: lib/api.php:1012
+#: lib/api.php:1224
 msgid "More than 1 entry found"
 msgstr "Mehr als 1 Eintrag zurückgeliefert"
 
-#: templates/browse/actions.inc:11
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Verschieben"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Nach links"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Nach rechts"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry-Adressbuch"
 
-#: lib/api.php:932
+#: lib/api.php:1143
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
@@ -554,31 +680,31 @@
 "Mehrere Personen mit der Adresse [%s], aber keine mit dem Namen [%s] im "
 "Adressbuch"
 
-#: config/sources.php.dist:87 config/sources.php.dist:221
+#: config/sources.php.dist:107 config/sources.php.dist:243
 msgid "My Address Book"
 msgstr "Mein Adressbuch"
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:119
+msgid "My Address Books"
+msgstr "Meine Adressbücher"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Name"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Namensformat"
 
-#: config/sources.php.dist:295
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter Mitgliederverzeichnis"
 
-#: add.php:36 add.php:102 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "Neue Liste"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Weiter"
 
@@ -586,20 +712,20 @@
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: lib/api.php:1014 lib/api.php:1063
+#: lib/api.php:1226 lib/api.php:1275
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Es wurde kein %s Eintrag für %s gefunden"
 
-#: lib/api.php:982
+#: lib/api.php:1194
 msgid "No address books found."
 msgstr "Keine Adressbücher gefunden."
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
 msgstr "Keine Kontakte gefunden."
 
-#: lib/api.php:356
+#: lib/api.php:512 lib/api.php:783
 msgid "No vCard data was found."
 msgstr "Es wurden keine vCard-Daten gefunden."
 
@@ -611,11 +737,11 @@
 msgid "Notes"
 msgstr "Bemerkungen"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Anzahl der Einträge pro Seite"
 
-#: lib/api.php:460
+#: lib/api.php:631 lib/api.php:764
 msgid "Object not found"
 msgstr "Objekt nicht gefunden"
 
@@ -623,7 +749,21 @@
 msgid "Office"
 msgstr "Büro"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+"Wenn Sie diese Einstellung speichern, wird das angegebene Adressbuch "
+"endgültig gelöscht. Wenn Sie das nicht möchten, ändern Sie Ihre Auswahl auf "
+"\"kein\"."
+
+#: lib/api.php:791
+msgid "Only one vcard supported."
+msgstr "Nur einzelne vCards werden unterstützt."
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Andere Einstellungen"
 
@@ -631,49 +771,65 @@
 msgid "PGP Public Key"
 msgstr "Öffentlicher PGP-Schlüssel"
 
-#: lib/api.php:340 lib/api.php:447 lib/api.php:537 lib/api.php:596
-#: lib/api.php:753 lib/api.php:913
+#: lib/api.php:496 lib/api.php:622 lib/api.php:709 lib/api.php:964
+#: lib/api.php:1128
 msgid "Permission Denied"
 msgstr "Zugriff verweigert"
 
-#: lib/Driver.php:436
+#: lib/Driver.php:551
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Rechte"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine-Adressbuch"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
-msgstr "Bitte geben Sie den Namen für die neue Liste an:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "Bitte einen Namen für die neue Kontakliste angeben:"
+
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "Zurück"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Bitte wählen Sie ein Verzeichnis aus:"
-
-#: config/sources.php.dist:399
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Privates Adressbuch"
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Abfrage fehlgeschlagen: (%s) %s"
 
-#: templates/block/minisearch.inc:18
+#: templates/block/minisearch.inc:15
 msgid "Quick Search"
 msgstr "Schnellsuche"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Lesen fehlgeschlagen: (%s) %s"
 
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "Anzeigen von Kontakten nicht unterstützt."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "Diesen Kontakt wirklich löschen?"
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Angezeigte Einträge:"
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "Adressbuch entfernen"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Spalte entfernen"
@@ -682,19 +838,19 @@
 msgid "Remove from this list"
 msgstr "Aus dieser Liste entfernen"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"Existierendes Adressbuch mit dem importierten ersetzen? <b>Warnung: Damit "
-"werden alle aktuellen Einträge in dem Adressbuch gelöscht.</b>"
+"Existierendes Adressbuch mit dem importierten ersetzen? <strong>Warnung: "
+"Damit werden alle aktuellen Einträge in dem Adressbuch gelöscht.</strong>"
 
-#: lib/Driver.php:330
+#: lib/Driver.php:439
 msgid "Requested object not found."
 msgstr "Gewünschtes Objekt nicht gefunden."
 
-#: add.php:37 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Zurücksetzen"
 
@@ -702,164 +858,210 @@
 msgid "S/MIME Public Certificate"
 msgstr "Öffentliches S/MIME-Zertifikat"
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr "STARTTLS fehlgeschlagen: (%s) %s"
 
-#: edit.php:57 add.php:37
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "Speichern von Kontakten nicht unterstützt."
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:18 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Suche"
 
-#: browse.php:241 minisearch.php:66
-msgid "Search Results"
-msgstr "Suchergebnisse"
-
-#: lib/api.php:829
+#: lib/api.php:1041
 msgid "Search failed"
 msgstr "Suche fehlgeschlagen"
 
-#: lib/api.php:922 lib/api.php:928 lib/api.php:937 lib/api.php:950
+#: lib/api.php:1133 lib/api.php:1139 lib/api.php:1148 lib/api.php:1161
 #, php-format
 msgid "Search failed: %s"
 msgstr "Suche fehlgeschlagen: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Sucheinstellungen"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "Suchen von Kontakten nicht unterstützt."
 
-#: templates/block/minisearch.inc:24
+#: templates/block/minisearch.inc:19
 msgid "Searching..."
 msgstr "Suche..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Adressbuch auswählen"
-
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "Liste auswählen"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "Wählen Sie das Adressbuch, das gelöscht werden soll"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "Wählen Sie das Adressbuch, das bearbeitet werden soll"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Wählen Sie das Adressbuch, aus dem exportiert werden soll:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Wählen Sie das Adressbuch, in das importiert werden soll:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Wählen Sie den Zeichensatz der importierten Datei:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Wählen Sie das Exportformat:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Wählen Sie die Datei, die importiert werden soll:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Wählen Sie das Format der importierten Datei:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Legen Sie fest, wie die Namen angezeigt werden sollen:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "Wählen Sie die Standardansicht."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
+"Wählen Sie die Standardansicht und Einstellungen fürs Sortieren und Blättern."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr ""
 "Wählen Sie die Felder aus, die in der Adressliste angezeigt werden sollen."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Wählen Sie das Format, in dem die Namen angezeigt werden sollen."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Ausgewählte Spalten:"
-
-#: add.php:50
+#: add.php:54
 #, php-format
 msgid "Selected address book \"%s\"."
 msgstr "Adressbuch \"%s\" ausgewählt."
 
-#: config/sources.php.dist:154
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Gemeinsames Verzeichnis"
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "_Alle anzeigen"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Zeigen"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "%s anzeigen"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Alle anzeigen"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Kontakte anzeigen"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Listen anzeigen"
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "_Kontakte anzeigen"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "Lis_ten anzeigen"
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr "Sortierrichtung"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "Quellen"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr ""
 "Geben Sie an, wo die Ergebnisse der erweiterten Suche erscheinen sollen."
 
-#: browse.php:130
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "%d Kontakte erfolgreich zur Liste hinzugefügt."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s wurde erfolgreich zu %s hinzugefügt"
 
-#: data.php:29
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Die Kontaktliste \"%s\" wurde erfolgreich erstellt."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "%d Kontakte erfolgreich gelöscht."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "%d Kontakte erfolgreich aus der Liste entfernt."
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tabgetrennte Werte"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+"Das VFS-Backend muss konfiguriert sein, um das Hochladen von Dateien zu "
+"erlauben."
+
+#: lib/Driver.php:1077
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Das Adressbuch \"%s\" existiert nicht."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Das Adressbuch \"%s\" wurde erfolgreich erstellt."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Das Adressbuch \"%s\" wurde erfolgreich gelöscht."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Das Adressbuch \"%s\" wurde erfolgreich aktualisiert."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Das Adressbuch konnte nicht geleert werden: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "Der ausgewählte Kontakt existiert nicht."
 
-#: browse.php:33
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Die Datei \"%s\" wurde erfolgreich gelöscht."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "Der Import kann trotz der Warnungen abgeschlossen werden."
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Es gibt keine Adressbücher, die aufgelistet werden können."
 
@@ -874,7 +1076,7 @@
 "dass es sich dabei um einen Fehler handelt, wenden Sie sich bitte an Ihren "
 "System-Administrator."
 
-#: add.php:99
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -882,94 +1084,119 @@
 "Beim Hinzufügen dieses Kontakts ist ein Fehler aufgetreten. Bitte wenden Sie "
 "sich an Ihren Systemadministrator für weitere Hilfe."
 
-#: browse.php:185
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "Beim Erstellen einer neuen Liste ist ein Fehler aufgetreten."
 
-#: browse.php:136
+#: addressbooks.php:38
 #, php-format
-msgid "There was an error deleting %s from the source address book."
-msgstr "Beim Löschen von %s aus dem Adressbuch ist ein Fehler aufgetreten."
+msgid "There was an error creating this address book: %s"
+msgstr "Beim Erstellen des Adressbuchs ist ein Fehler aufgetreten: %s"
 
-#: delete.php:31
+#: browse.php:166
+#, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Beim Löschen von \"%s\" aus dem Adressbuch ist ein Fehler aufgetreten."
+
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Beim Löschen des Kontakts ist ein Fehler aufgetreten: %s"
 
-#: browse.php:68
-msgid "There was an error deleting this object."
-msgstr "Beim Löschen dieses Objekts ist ein Fehler aufgetreten."
-
-#: browse.php:273
-msgid "There was an error displaying the select List"
-msgstr "Beim Anzeigen der ausgewählten Liste ist ein Fehler aufgetreten"
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "Beim Anzeigen der Liste ist ein Fehler aufgetreten"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Beim Importieren der Daten ist ein Fehler aufgetreten: %s"
 
-#: lib/api.php:352
+#: lib/api.php:508 lib/api.php:778
 msgid "There was an error importing the iCalendar data."
 msgstr "Beim Importieren der iCalendar Daten ist ein Fehler aufgetreten."
 
-#: browse.php:58
-msgid "There was an error removing this object."
-msgstr "Beim Löschen dieses Objektes ist ein Fehler aufgetreten."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Beim Löschen des Adressbuchs ist ein Fehler aufgetreten: %s"
+
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Beim Aktualisieren des Adressbuchs ist ein Fehler aufgetreten: %s"
 
-#: edit.php:84
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Beim Aktualisieren dieses Eintrags ist ein Fehler aufgetreten: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Es konnten keine Adressen zum Exportieren gefunden werden."
 
-#: lib/Driver.php:390 lib/Driver.php:427
-msgid "This address book is read-only"
-msgstr "Dieses Adressbuch kann nur gelesen werden"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "Diese Adressbücher werden in der folgenden Reihenfolge angezeigt:"
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Diese Spalten werden in der folgenden Reihenfolge angezeigt:"
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Dieses Dateiformat wird nicht unterstützt."
 
-#: lib/api.php:941 lib/api.php:954
+#: lib/api.php:1152 lib/api.php:1165
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Diese Person hat bereits einen %s-Eintrag in Ihrem Adressbuch"
 
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+"Dies wird als Standardadressbuch für das Hinzufügen oder Importieren von "
+"Kontakten benutzt."
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Position"
 
-#: lib/Driver.php:835
+#: lib/Turba.php:443
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr ""
+"Das gemeinsame Adressbuch konnte nicht erstellt werden, der Quelltyp fehlt."
+
+#: lib/Driver.php:1001
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Der %s-Treiber konnte nicht geladen werden."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Änderungen rückgängig machen"
 
-#: lib/api.php:489
-msgid "Unsupported Content-Type."
-msgstr "Nicht unterstützter Inhaltstyp."
+#: lib/api.php:541 lib/api.php:660 lib/api.php:796
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "Nicht unterstützter Inhaltstyp: %s"
 
-#: config/sources.php.dist:358
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign Verzeichnis"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
 msgid "View \"%s\""
 msgstr "\"%s\" anzeigen"
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
 msgstr "Kontakt anzeigen"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Standardansicht:"
 
@@ -1005,11 +1232,12 @@
 msgid "Work Street Address"
 msgstr "Straße geschäftlich"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "Sie erzeugen eine Adressliste."
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "Sie dürfen nicht mehr als %d Kontakte in \"%s\" erstellen."
 
-#: edit.php:44 display.php:59
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Sie haben nicht genügend Rechte, um diesen Kontakt zu sehen."
 
@@ -1017,7 +1245,11 @@
 msgid "You do not have permission to view this object."
 msgstr "Sie haben nicht genügend Rechte, um dieses Objekt zu sehen."
 
-#: templates/browse/javascript.inc:51
+#: lib/Turba.php:531
+msgid "You do not have permissions to delete this source."
+msgstr "Sie haben nicht genügend Rechte, um diese Quelle zu löschen."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Sie müssen erst ein Zieladressbuch auswählen."
 
@@ -1025,44 +1257,60 @@
 msgid "You must select a target list."
 msgstr "Sie müssen erst eine Zielliste angeben."
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "Sie müssen erst mindestens einen Kontakt auswählen."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Sie müssen erst mindestens einen Eintrag auswählen."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr "Sie haben nur das Recht, diesen Kontakt anzusehen."
 
-#: browse.php:284
-msgid "Your default addressbook is not browseable."
-msgstr "Ihr Standard-Adressbuch kann nicht aufgelistet werden."
+#: browse.php:318
+msgid "Your default address book is not browseable."
+msgstr "Ihr Standard-Adressbuch kann nicht angezeigt werden."
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[kein Wert]"
 
-#: lib/Turba.php:286
-msgid "_Add"
-msgstr "Hi_nzufügen"
-
-#: lib/Turba.php:283
+#: lib/Turba.php:554
 msgid "_Browse"
 msgstr "_Liste"
 
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "_Kontakte"
+
 #: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "Lös_chen"
 
-#: lib/Turba.php:292
+#: lib/Turba.php:563
 msgid "_Import/Export"
 msgstr "_Import/Export"
 
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "_Listen"
+
+#: lib/Turba.php:551
+msgid "_My Address Books"
+msgstr "_Meine Adressbücher"
+
+#: lib/Turba.php:557
+msgid "_New Contact"
+msgstr "_Neuer Kontakt"
+
 #: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "_Aus dieser Liste entfernen"
 
-#: lib/Turba.php:288
+#: lib/Turba.php:559
 msgid "_Search"
 msgstr "_Suche"
 
@@ -1070,19 +1318,35 @@
 msgid "contact.vcf"
 msgstr "adresse.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "adressen.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "adressen.tsv"
 
-#: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
-msgstr "zum ausgewählten Adressbuch"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "adressen.vcf"
+
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr "Keine Formatierung"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "kein"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "zu einer Kontaktliste"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "zu einem anderen Adressbuch"
 
-#: data.php:30 templates/browse/column_headers.inc:7
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/docs/LDAP
+++ mod/docs/LDAP
@@ -21,14 +21,7 @@
    the fields, settings, and schema of your LDAP server, but it's a solid
    place to start.
 
-2. Patch your ``core.schema`` file in the ``/etc/openldap/schema`` directory.
-
-   This patch is located in ``turba/scripts/ldap/core.schema.patch``.
-
-   .. Note:: The patch adds the ``organizationName`` to the ``orgperson``
-             objectclass and removes the MUST ``sn`` to the person ``oc``.
-
-3. Enforce ACL's to personal address books.
+2. Enforce ACLs to personal address books.
 
    Add this to your LDAP ACL so users can only see their own address book::
 
@@ -39,7 +32,7 @@
    .. Note:: This assumes that you store your users in the same LDAP
              directory. If not, modify appropriately for your setup.
 
-4. Make ``ou``'s for all of your users.
+3. Make ``ou``'s for all of your users.
 
    You'll also have to add this to the script you use to add users to your
    LDAP directory.
@@ -53,6 +46,31 @@
    created by some distributions).
 
 
+Entries for Turba-specific information (contact groups) from horde/scripts/ldap/horde.schema::
+
+   #
+   # Turba attribute branch 1.3.6.1.4.1.13040.4.1.*
+   #
+   attributetype ( 1.3.6.1.4.1.13040.4.1.2
+     NAME 'turbaType'
+     DESC 'Turba Object Type: Contact/List'
+     EQUALITY caseIgnoreIA5Match
+     SUBSTR caseIgnoreIA5SubstringsMatch
+     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{8} )
+
+   attributetype ( 1.3.6.1.4.1.13040.4.1.3
+     NAME 'turbaMembers'
+     DESC 'Encoded members of a Turba list'
+     EQUALITY caseIgnoreIA5Match
+     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4000} )
+
+   attributetype ( 1.3.6.1.4.1.13040.4.1.4
+     NAME 'turbaPGPPublicKey'
+     DESC 'PGP/GPG Public Key'
+     EQUALITY caseIgnoreIA5Match
+     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4000} )
+
+
 Entries for calendaring information (free/busy, etc.) from RFC 2739::
 
    attribute (1.2.840.113556.1.4.478


--- orig/po/zh_TW.po
+++ mod/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Turba 2.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-08-05 09:38+0800\n"
+"POT-Creation-Date: 2006-01-05 15:04+0800\n"
 "PO-Revision-Date: 2003-01-08 10:53+0100\n"
 "Last-Translator: David Cahng <david at tmv.gov.tw>\n"
 "Language-Team: Traditional Chinese <i18n at lists.horde.org>\n"
@@ -14,20 +14,43 @@
 "Content-Type: text/plain; charset=BIG5\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:40
+msgid " Add an IMSP Address Book"
+msgstr "·s¼W¤@¥» IMSP ³q°T¿ý"
+
+#: templates/prefs/imsp_opt.inc:29
+msgid " Delete IMSP Address Book"
+msgstr "§R°£ IMSP ³q°T¿ý:"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "\"%s\" ¤w¦s¦b¦Ó¥B¨S¦³¶×¤J¸ê®Æ."
+
+#: browse.php:140
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "¥Ñ©ó \"%s\" ¬O¤@­Ó¸s²Õ¦]¦¹µLªk³Q½Æ»s."
+
+#: browse.php:138
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "¥Ñ©ó \"%s\" ¬O¤@­Ó¸s²Õ¦]¦¹µLªk³Q·h²¾."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"¦W¦r ©m¤ó\" (¨Ò¦p. ¤ô«ó ³¯)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"©m¤ó ¦W¦r\" (¨Ò¦p. ³¯ ¤ô«ó)"
 
-#: add.php:87
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s ¤w·s¼W."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "ÀÉ®× %s ¤w¶×¤J§¹¦¨"
@@ -37,58 +60,81 @@
 msgid "%s to %s of %s"
 msgstr " %s ¨ì %s ¦@ %s"
 
-#: browse.php:120
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "¥Ñ©ó'%s'¬O¤@­Ó¸s²Õ¦]¦¹µLªk³Q½Æ»s."
-
-#: browse.php:118
+#: lib/Turba.php:464
 #, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "¥Ñ©ó'%s'¬O¤@­Ó¸s²Õ¦]¦¹µLªk³Q·h²¾."
+msgid "%s's Address Book"
+msgstr "%s ªº³q°T¿ý"
 
-#: lib/Block/minisearch.php:45
+#: lib/Block/minisearch.php:42
 msgid "A browser that supports iFrames is required"
 msgstr "ÂsÄý¾¹¥²¶·¤ä´© iFrames"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "·j´Mªí³æ¤W­±"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "¶i¶¥·j´M_v"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "¦s¨ú %s ¾D©Ú"
 
-#: add.php:52
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "·s¼W"
 
+#: templates/prefs/addressbookselect.inc:174
+msgid "Add address book"
+msgstr "·s¼W³q°T¿ý"
+
+#: config/prefs.php.dist:48
+msgid "Add and Delete IMSP address books"
+msgstr "·s¼W»P§R°£ IMSP ³q°T¿ý"
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "·s¼WÄæ¦ì"
 
-#: templates/browse/actions.inc:22
+#: edit.php:135
+msgid "Add file"
+msgstr "·s¼WÀÉ®×"
+
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "·s¼W¨ì"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: lib/Driver/null.php:57
+msgid "Adding contacts is not available."
+msgstr "©Ò·s¼Wªº³sµ¸¤HµL®Ä."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "³q°T¿ý"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "ÂsÄý"
 
-#: add.php:86
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "³q°T¿ý"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "³q°T¿ý¸ê®Æ."
 
-#: lib/Driver.php:478
-msgid "Address book is read-only."
-msgstr "³q°T¿ý¥u¯àŪ¨ú."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "³q°T¿ý¤w§¹¦¨²MªÅ."
 
-#: search.php:97 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+msgid "Address book to delete "
+msgstr "§R°£³q°T¿ý "
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr "¤£Åã¥Üªº³q°T¿ý:"
+
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "¶i¶¥·j´M"
 
@@ -96,55 +142,37 @@
 msgid "Alias"
 msgstr "¶l¥ó§O¦W"
 
-#: templates/browse/footerAlpha.inc:6 templates/browse/footerAlpha.inc:9
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr "©Ò¦³"
 
-#: lib/api.php:393
+#: lib/api.php:554
 msgid "Already Exists"
 msgstr "¤w¦s¦b"
 
-#: templates/browse/javascript.inc:89
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "§A½T©w­n§R°£ %s ?"
 
-#: templates/browse/javascript.inc:63
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "§A½T©w­n§R°£©Ò¿ï¾Üªº¸ê®Æ¶Ü ?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "¤É¾­"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "¥i¥ÎªºÄæ¦ì:"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "ªð¦^%s_c"
-
-#: templates/browse/actions.inc:44
-#, php-format
-msgid "Back to %s"
-msgstr "ªð¦^%s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "°ò¥»·j´M_c"
-
-#: search.php:94 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "°ò¥»·j´M"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "·j´Mªí³æ¤U­±"
 
-#: lib/Driver/ldap.php:85 lib/Driver/ldap.php:88
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "³sµ²¥¢±Ñ: (%s) %s"
@@ -153,49 +181,63 @@
 msgid "Birthday"
 msgstr "¥Í¤é"
 
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr "ÂsÄý"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "°Ó·~¤ÀÃþ"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "³rÂI¤À¹j®æ¦¡ .csv"
 
-#: templates/browse/actions.inc:48
-msgid "C_lear Search"
-msgstr "²M°£·j´M_l"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr "µLªk±N¸s²Õ¨ì¥»¨­."
 
-#: templates/browse/column_headers.inc:5
+#: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Àˬd ¥þ³¡/µL_A"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr "¬°§Aªº­Ó¤H³q°T¿ý,Ápµ¸¤H,¥H¤Î·j´M¿ï©w¤@­Ó¹w³]ªº¥Ø¿ý."
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr "¿ï¾Ü¤@­Ó¦WºÙ"
 
-#: add.php:44
+#: add.php:48
 msgid "Choose an address book"
 msgstr "¿ï¾Ü¤@¥»³q°T¿ý"
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "¿ï¨ú¥Î¥HÅã¥Üªº³q°T¿ýÄæ¦ì¶¶§Ç."
+#: templates/prefs/columnselect.inc:221
+msgid "Choose an address book:"
+msgstr "¿ï¾Ü¤@¥»³q°T¿ý:"
 
-#: templates/browse/actions.inc:48
-msgid "Clear Search"
-msgstr "²M°£·j´M"
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr "¿ï¾Ü­nÅã¥Üªº³q°T¿ý,¤Î¨ä¶¶§Ç:"
 
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr "¿ï¾Ü­n¨Ï¥Îªº³q°T¿ý."
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "¿ï¾Ü­nÅã¥ÜªºÄæ¦ì¦WºÙ,¤Î¨ä¶¶§Ç:"
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Äæ¦ì¿ï¶µ"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "¤£Åã¥ÜªºÄæ¦ì¦WºÙ:"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "³rÂI¤À¹j­È (*.csv)"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "³rÂI¤À¹j­È (Microsoft Outlook *.csv)"
 
@@ -207,70 +249,77 @@
 msgid "Company Address"
 msgstr "¤½¥q¦a§}"
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:382 lib/api.php:452
-#: lib/api.php:542 lib/api.php:588 lib/api.php:636 lib/api.php:823
-#: lib/api.php:916
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:837
+#: lib/api.php:1024 lib/api.php:1112
 #, php-format
 msgid "Connection failed: %s"
 msgstr "³sµ²¥¢±Ñ: %s"
 
-#: lib/Driver/ldap.php:66
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "³sµ²¥¢±Ñ"
 
-#: browse.php:60
-msgid "Contact removed from list."
-msgstr "¦Û¸s²Õ¤¤²¾°£Ápµ¸¤H."
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "³sµ¸¤H·j´M"
 
-#: browse.php:257
+#: browse.php:299
 #, php-format
 msgid "Contacts in list: %s"
-msgstr "¸s²Õ: %s ¤¤ªºÁpµ¸¤H"
-
-#: browse.php:281
-#, php-format
-msgid "Contents of %s"
-msgstr "%s ªº¤º®e"
+msgstr "¸s²Õ: %s ¤¤ªº³sµ¸¤H"
 
-#: templates/browse/actions.inc:12
+#: templates/browse/actions.inc:18
 msgid "Copy"
 msgstr "½Æ»s"
 
-#: lib/ObjectView.php:134
-msgid "Created"
+#: templates/addressbooks.inc:53
+msgid "Create"
 msgstr "«Ø¥ß"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "¹w³]Åã¥Ü"
+#: templates/addressbooks.inc:40
+msgid "Create Address Book"
+msgstr "«Ø¥ß³q°T¿ý"
+
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "¦b¤U¦C³q°T¿ý«Ø¥ß·s¸s²Õ:"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "¬°§Aªº­Ó¤H³q°T¿ý,Ápµ¸¤H,¥H¤Î·j´M¿ï©w¤@­Ó¹w³]ªº¥Ø¿ý."
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "«Ø¥ß"
 
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "¹w³]±Æ§Ç¤è¦V:"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "§R°£"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+msgid "Delete Address Book"
+msgstr "§R°£³q°T¿ý:"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "§R°£½T»{"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "§R°£«ö¶sªº¦æ¬°"
 
-#: lib/Driver/ldap.php:283
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "§R°£¥¢±Ñ: (%s) %s"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+msgid "Deleting contacts is not available."
+msgstr "©Ò§R°£ªº³sµ¸¤HµL®Ä."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "§R°£¥¢±Ñ"
 
@@ -278,38 +327,55 @@
 msgid "Department"
 msgstr "³¡ªù"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "­°¾­"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "´y­z"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "¥Ø¿ý"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Åã¥Ü"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Åã¥Ü¿ï¶µ"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "§R°£°O¿ý®É¬O§_»Ý­n½T»{ ?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+msgid "Download"
+msgstr "¤U¸ü"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "¤U¸ü vCard"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "½s¿è"
 
-#: templates/browse/contactrow.inc:33
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
 #, php-format
-msgid "Edit '%s'"
-msgstr "½s¿è '%s'"
+msgid "Edit \"%s\""
+msgstr "½s¿è \"%s\""
+
+#: templates/addressbooks.inc:81
+msgid "Edit Address Books"
+msgstr "½s¿è³q°T¿ý"
 
-#: edit.php:53 edit.php:80
+#: edit.php:85 edit.php:161
 #, php-format
 msgid "Edit entry for %s"
 msgstr "½s¿è°O¿ý %s"
@@ -318,57 +384,98 @@
 msgid "Email"
 msgstr "¹q¤l¶l¥ó"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr "%sªº°O¿ý¤w§ó·s,¦ýÀx¦s¤W¶ÇÀɮ׮ɥ¢±Ñ:%s"
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
 msgstr "%s ªº°O¿ý¤w§ó·s."
 
-#: templates/browse/actions.inc:6 templates/data/export.inc:46
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr "·s¼W %d ­Ó³sµ¸¤H¨ì¸s²Õ¤¤®Éµo¥Í¿ù»~."
+
+#: browse.php:218 browse.php:266
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr "·s¼W²Ä %d ­Ó¦@ %d ­Ó³sµ¸¤H¨ì¸s²Õ¤¤®Éµo¥Í¿ù»~."
+
+#: browse.php:86
+#, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "§R°£ %d ­Ó³sµ¸¤H®Éµo¥Í¿ù»~."
+
+#: browse.php:88
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr "§R°£²Ä %d ­Ó¦@ %d ­Ó³sµ¸¤H®Éµo¥Í¿ù»~."
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr "¦Û¸s²Õ¤¤²¾°£ %d ­Ó³sµ¸¤H®Éµo¥Í¿ù»~."
+
+#: browse.php:68
+msgid "Error removing %d of %d requested contact(s) from list."
+msgstr "¦Û¸s²Õ¤¤²¾°£²Ä %d ­Ó¦@ %d ­Ó³sµ¸¤H®Éµo¥Í¿ù»~."
+
+#: lib/api.php:415
+#, php-format
+msgid "Error searching the address book: %s"
+msgstr "·j´M³q°T¿ý: %s ¥¢±Ñ"
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "¶×¥X"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "¶×¥X³q°T¿ý"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "¥u¶×¥X¤w¿ï¨úªº³sµ¸¤H."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
-msgstr "¤U¦C³q°T¿ý¤w§¹¥þ¶×¥X."
+msgstr "§¹¾ã¶×¥X¤U¦C³q°T¿ý."
 
-#: data.php:110 data.php:228 browse.php:37 browse.php:94 browse.php:109
-#: add.php:63 search.php:52
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "¦s¨ú³q°T¿ý: %s ¥¢±Ñ."
 
-#: browse.php:128
+#: browse.php:158
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "·s¼W %s ¨ì %s: %s"
 
-#: browse.php:263
+#: browse.php:305
 msgid "Failed to browse list"
 msgstr "ÂsÄý¸s²Õ¥¢±Ñ"
 
-#: browse.php:297
+#: browse.php:343
 msgid "Failed to browse the directory"
 msgstr "·j´M¥Ø¿ý¥¢±Ñ"
 
-#: lib/Driver/ldap.php:321
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
-msgstr "Åܧó¦WºÙ¥¢±Ñ: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr "Åܧó¦WºÙ¥¢±Ñ:(%s) %s; Old DN = %s, New DN = %s, Root = %s"
 
-#: browse.php:114
+#: browse.php:134
 #, php-format
 msgid "Failed to find object to be added: %s"
-msgstr "§ä´Mª«¥ó¥H·s¼W¨ì: %s ¥¢±Ñ"
+msgstr "§ä´Mª«¥ó¥H·s¼W¨ì:%s¥¢±Ñ"
+
+#: search.php:79
+msgid "Failed to search the address book"
+msgstr "·j´M³q°T¿ý¥¢±Ñ"
 
-#: data.php:124 search.php:88
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "·j´M¥Ø¿ý: %s ¥¢±Ñ"
@@ -377,10 +484,18 @@
 msgid "Fax"
 msgstr "¶Ç¯u"
 
-#: templates/browse/search.inc:72
+#: edit.php:131 display.php:100
+msgid "Files"
+msgstr "ªþ¥ó"
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr "´M§ä"
 
+#: edit.php:104 edit.php:194
+msgid "Finish"
+msgstr "§¹¦¨"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "¦W¦r"
@@ -389,15 +504,15 @@
 msgid "Freebusy URL"
 msgstr "Freebusy ºô§}"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "±q"
 
-#: config/sources.php.dist:620
+#: config/sources.php.dist:664
 msgid "Global Address Book"
 msgstr "¥þ°ì³q°T¿ý"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "¸s²Õ"
 
@@ -427,64 +542,64 @@
 
 #: config/attributes.php.dist:88
 msgid "Home Street Address"
-msgstr "¦í®a¦a§}"
+msgstr "¦í®a¦í§}"
 
-#: config/sources.php.dist:546
+#: config/sources.php.dist:566
 msgid "IMSP"
 msgstr "IMSP"
 
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr "IMSP ³q°T¿ýºÞ²z"
+
 #: config/attributes.php.dist:238
 msgid "Id"
-msgstr "­û¤u¸¹½X"
+msgstr "ÃѧO¸¹½X"
 
-#: templates/data/import.inc:9
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "¶×¤J³q°T¿ý, ¨BÆJ %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "¶×¤J/¶×¥X ³q°T¿ý"
 
-#: lib/api.php:376 lib/api.php:602
-msgid "Invalid Content-Type"
-msgstr "µL®Äªº¤º®e«¬ºA"
-
-#: lib/api.php:439 lib/api.php:529
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "µL®Äªº½s¸¹"
 
-#: lib/api.php:191 lib/api.php:334 lib/api.php:435 lib/api.php:525
-#: lib/api.php:578 lib/api.php:893
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1095
 msgid "Invalid address book"
 msgstr "µL®Äªº³q°T¿ý."
 
-#: lib/api.php:897 lib/api.php:971 lib/api.php:1024
+#: lib/api.php:1099 lib/api.php:1172 lib/api.php:1225
 msgid "Invalid email"
 msgstr "µL®Äªº¹q¤l¦í§}."
 
-#: lib/api.php:905
+#: lib/api.php:1107
 msgid "Invalid entry"
 msgstr "µL®Äªº°O¿ý"
 
-#: lib/Driver/ldap.php:279
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "«ü©wªºª÷Æ_µL®Ä"
 
-#: lib/api.php:901
+#: lib/api.php:1103
 msgid "Invalid name"
 msgstr "µL®Äªº¦WºÙ"
 
-#: lib/api.php:582
+#: lib/api.php:753
 msgid "Invalid objectId"
 msgstr "µL®Äªº¤À¨Éª«¥ó."
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr "¥²¶·­n¦³ LDAP ªº¤ä´©,¦ý¬O LDAP ¼Ò²Õ¤£¬O¥¼¦w¸Ë´N¬O¨S¦³¸ü¤J."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "³Ìªñ¤@¦¸§ó·s"
 
@@ -492,23 +607,27 @@
 msgid "Last Name"
 msgstr "©m"
 
-#: templates/browse/column_headers.inc:8
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "²M³æ"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "¤Ç°t"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:207
+msgid "Maximum Number of Contacts"
+msgstr "³sµ¸¤H¤W­­¼Æ¥Ø"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "­¶¼Æ¤W­­"
 
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "·j´M"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr "¥\¯àªí"
 
-#: lib/Driver/ldap.php:315
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "§ä¤£¨ì LDAP ³]©w©Ò»Ý­nªº DN ­È."
 
@@ -516,32 +635,34 @@
 msgid "Mobile Phone"
 msgstr "¦æ°Ê¹q¸Ü"
 
-#: lib/Driver/ldap.php:344 lib/Driver/ldap.php:361
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Åܧ󥢱Ñ: (%s) %s"
 
-#: lib/api.php:1010
+#: lib/api.php:1211
 msgid "More than 1 entry found"
 msgstr "¶W¹L 1 µ§°O¿ý³Q¶Ç¦^"
 
-#: templates/browse/actions.inc:11
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "·h²¾"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "½Õª@"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "½Õ­°"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry ³q°T¿ý"
 
-#: lib/api.php:930
+#: lib/api.php:1131
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
@@ -549,31 +670,31 @@
 "¦b³q°T¿ý¤¤¦³¦n´X¦ì³sµ¸¤Hªº¶l¥ó¦í§}³£¬O [%s],¦ý³o¨Ç³sµ¸¤H¨S¦³¤@­Ó¬O¥s°µ [%s] "
 "ªº."
 
-#: config/sources.php.dist:87 config/sources.php.dist:285
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:301
+msgid "My Address Book"
+msgstr "§Úªº³q°T¿ý"
+
+#: addressbooks.php:119
+msgid "My Address Books"
 msgstr "§Úªº³q°T¿ý"
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
-msgstr "©m¦W"
+msgstr "¦WºÙ"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "¦WºÙ®æ¦¡"
 
-#: config/sources.php.dist:359
+#: config/sources.php.dist:373
 msgid "Netcenter Member Directory"
 msgstr "Netscape ·|­û¥Ø¿ý"
 
-#: add.php:36 add.php:103 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
-msgstr "·s¼WÁpµ¸¤H"
+msgstr "·s¼W³sµ¸¤H"
 
-#: templates/browse/actions.inc:26
-msgid "New List"
-msgstr "·s¸s²Õ"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "¤U¤@¨B"
 
@@ -581,20 +702,20 @@
 msgid "Nickname"
 msgstr "¼ÊºÙ"
 
-#: lib/api.php:1012 lib/api.php:1061
+#: lib/api.php:1213 lib/api.php:1262
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "§ä¤£¨ì %2$s ªº %1$s °O¿ý"
 
-#: lib/api.php:980
+#: lib/api.php:1181
 msgid "No address books found."
 msgstr "§ä¤£¨ì³q°T¿ý."
 
-#: minisearch.php:87
+#: minisearch.php:81
 msgid "No contacts found"
-msgstr "§ä¤£¨ìÁpµ¸¤H"
+msgstr "§ä¤£¨ì³sµ¸¤H"
 
-#: lib/api.php:356
+#: lib/api.php:513 lib/api.php:784
 msgid "No vCard data was found."
 msgstr "§ä¤£¨ì vCard ¸ê®Æ."
 
@@ -606,11 +727,11 @@
 msgid "Notes"
 msgstr "³Æµù"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "¨C­¶¼Æ¥Ø"
 
-#: lib/api.php:458
+#: lib/api.php:632 lib/api.php:765
 msgid "Object not found"
 msgstr "§ä¤£¨ìª«¥ó"
 
@@ -618,7 +739,18 @@
 msgid "Office"
 msgstr "¿ì¤½«Ç"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:792
+msgid "Only one vcard supported."
+msgstr "¶È¤ä´©³æ¤@VCARD."
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "¨ä¥L¿ï¶µ"
 
@@ -626,32 +758,36 @@
 msgid "PGP Public Key"
 msgstr "PGP ¤½¶}ª÷Æ_"
 
-#: lib/api.php:340 lib/api.php:445 lib/api.php:535 lib/api.php:594
-#: lib/api.php:751 lib/api.php:911
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:952
+#: lib/api.php:1116
 msgid "Permission Denied"
 msgstr "¦s¨ú¾D©Ú"
 
-#: lib/Driver.php:436
+#: lib/Driver.php:550
 msgid "Permission denied"
 msgstr "¦s¨ú¾D©Ú"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Åv­­"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine ³q°T¿ý"
 
-#: templates/browse/javascript.inc:30
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
 msgstr "½Ð¿é¤J·s¸s²Õªº¦WºÙ:"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "½Ð¿ï¾Ü¤@­Ó¥Ø¿ý:"
+#: edit.php:98 edit.php:101 edit.php:201
+msgid "Previous"
+msgstr "¤W¤@±i"
 
-#: config/sources.php.dist:463
+#: config/sources.php.dist:474
 msgid "Private Address Book"
 msgstr "¨p¤H³q°T¿ý"
 
-#: lib/Driver/ldap.php:155
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "¬d¸ß¥¢±Ñ: (%s) %s"
@@ -660,15 +796,27 @@
 msgid "Quick Search"
 msgstr "§Ö³t·j´M"
 
-#: lib/Driver/ldap.php:199 lib/Driver/ldap.php:207 lib/Driver/ldap.php:442
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Ū¨ú¥¢±Ñ: (%s) %s"
 
+#: lib/Driver/null.php:52
+msgid "Reading contacts is not available."
+msgstr "©ÒŪ¨úªº³sµ¸¤HµL®Ä."
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr "½T©w§R°£¦¹³sµ¸¤H?"
+
 #: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "¤wÅã¥Ü°O¿ý:"
 
+#: templates/prefs/addressbookselect.inc:176
+msgid "Remove address book"
+msgstr "²¾°£³q°T¿ý"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "²¾°£Äæ¦ì"
@@ -677,19 +825,19 @@
 msgid "Remove from this list"
 msgstr "±q³o­Ó¸s²Õ¤¤²¾°£"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
-"¥H¶×¤Jªº³q°T¿ý»s´«¦s¦bªº³q°T¿ý ? <b>ĵ§i: ³o±N·|§R°£¥Ø«e³o³q°T¿ý¤¤ªº©Ò¦³¬ö¿ý."
-"</b>"
+"¥H¶×¤Jªº³q°T¿ý¸m´«¦s¦bªº³q°T¿ý ? <strong>ĵ§i: ³o±N·|§R°£¥Ø«e³q°T¿ý¤¤ªº©Ò¦³¬ö"
+"¿ý.</strong>"
 
-#: lib/Driver.php:330
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "§ä¤£¨ì©Ò»Ýªºª«¥ó."
 
-#: add.php:37 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "­«³]¦^¤º©w­È"
 
@@ -697,166 +845,205 @@
 msgid "S/MIME Public Certificate"
 msgstr "S/MIME ¤½¶}¾ÌÃÒ"
 
-#: lib/Driver/ldap.php:77
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr "STARTTLS ¥¢±Ñ: (%s) %s"
 
-#: edit.php:57 add.php:37
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Àx¦s"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:23 config/prefs.php.dist:100
+#: lib/Driver/null.php:67
+msgid "Saving contacts is not available."
+msgstr "©ÒÀx¦sªº³sµ¸¤HµL®Ä."
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "·j´M"
 
-#: browse.php:241 minisearch.php:66
-msgid "Search Results"
-msgstr "·j´Mµ²ªG"
-
-#: lib/api.php:827
+#: lib/api.php:1029
 msgid "Search failed"
 msgstr "·j´M¥¢±Ñ"
 
-#: lib/api.php:920 lib/api.php:926 lib/api.php:935 lib/api.php:948
+#: lib/api.php:1121 lib/api.php:1127 lib/api.php:1136 lib/api.php:1149
 #, php-format
 msgid "Search failed: %s"
 msgstr "·j´M¥¢±Ñ: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "·j´M¿ï¶µ"
+#: lib/Driver/null.php:47
+msgid "Searching is not available."
+msgstr "·j´M¥\¯àµL®Ä."
 
-#: templates/block/minisearch.inc:24
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "·j´M¤¤..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "¿ï¾Ü³q°T¿ý"
-
-#: templates/browse/actions.inc:24
-msgid "Select List"
-msgstr "½Ð¿ï¾Ü¸s²Õ"
+#: templates/addressbooks.inc:66
+msgid "Select an address book to delete"
+msgstr "¿ï¾Ü­n§R°£ªº¤@¥»³q°T¿ý"
+
+#: templates/addressbooks.inc:90
+msgid "Select an address book to edit"
+msgstr "¿ï¾Ü­n½s¿èªº¤@¥»³q°T¿ý"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "¿ï¾Ü­n¶×¥Xªº³q°T¿ý:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "¿ï¾Ü­n¶×¤Jªº³q°T¿ý:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "¿ï¾Ü¨Ó·½Àɮתº¦r¤¸½s½X®æ¦¡:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "¿ï¾Ü¶×¥X®æ¦¡:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "¿ï¾ÜÀÉ®×¥H¶×¤J:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "¿ï¾Ü¨Ó·½Àɮתº®æ¦¡:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "¿ï¾Ü¥Î¨ÓÅã¥Ü¦WºÙªº®æ¦¡:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
-msgstr "¿ï¨úÀ˵ø¬°¹w³]­È."
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr "¿ï¨ú¹w³]ªºÀ˵ø¤è¦¡,±Æ§Ç¤è¦V,¥H¤Î­¶­±¿ï¶µ."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "¿ï¨ú¥Î¥HÅã¥Üªº³q°T¿ýÄæ¦ì."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "¿ï¾Ü¥Î¨ÓÅã¥Ü¦WºÙªº®æ¦¡."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "¤w¿ï¾ÜªºÄæ¦ì:"
-
-#: add.php:50
+#: add.php:54
 #, php-format
-msgid "Selected address book '%s'."
-msgstr "¤w¿ï¾Üªº³q°T¿ý '%s'."
-
-#: config/sources.php.dist:146
-msgid "Shared Addressbook"
-msgstr "¦@¨É³q°T¿ý"
+msgid "Selected address book \"%s\"."
+msgstr "¤w¿ï¾Üªº³q°T¿ý \"%s\"."
 
-#: config/sources.php.dist:213
+#: config/sources.php.dist:231
 msgid "Shared Directory"
 msgstr "¦@¨É¥Ø¿ý"
 
-#: templates/browse/actions.inc:42
-msgid "Sho_w All"
-msgstr "Åã¥Ü¥þ³¡_w"
-
-#: templates/browse/select.inc:11
-msgid "Show"
-msgstr "Åã¥Ü"
+#: templates/browse/actions.inc:46
+#, php-format
+msgid "Show %s"
+msgstr "Åã¥Ü %s"
 
-#: templates/browse/actions.inc:42
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Åã¥Ü¥þ³¡"
 
-#: templates/browse/actions.inc:41
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
-msgstr "Åã¥ÜÁpµ¸¤H"
+msgstr "Åã¥Ü³sµ¸¤H"
 
-#: templates/browse/actions.inc:40
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Åã¥Ü¸s²Õ"
 
-#: templates/browse/actions.inc:41
-msgid "Show _Contacts"
-msgstr "Åã¥ÜÁpµ¸¤H_C"
-
-#: templates/browse/actions.inc:40
-msgid "Show _Lists"
-msgstr "Åã¥Ü¸s²Õ_L"
-
-#: templates/browse/column_headers.inc:10
-#: templates/browse/column_headers.inc:15
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 msgid "Sort Direction"
 msgstr "±Æ§Ç¤è¦V"
 
-#: lib/api.php:154
+#: lib/api.php:200
 msgid "Sources"
 msgstr "¨Ó·½"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr "«ü©ú­n±N¶i¶¥·j´Mªºµ²ªG©ñ¦b­þ¸Ì."
 
-#: browse.php:130
+#: browse.php:214 browse.php:262
+#, php-format
+msgid "Successfully added %d contact(s) to list."
+msgstr "¤w¦¨¥\¦a¥[¤J %d ­Ó³sµ¸¤H¨ì¸s²Õ¤¤."
+
+#: browse.php:160
 #, php-format
 msgid "Successfully added %s to %s"
-msgstr "%s ¤w¦¨¥\ªº¥[¤J¨ì %s ¨t²Î¤¤."
+msgstr "%s ¤w¦¨¥\¦a¥[¤J¨ì %s ¨t²Î¤¤."
+
+#: browse.php:248
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "¤w¦¨¥\ªº«Ø¥ß¸s²Õ \"%s\"."
+
+#: browse.php:84
+#, php-format
+msgid "Successfully deleted %d contact(s)."
+msgstr "%d ­Ó³sµ¸¤H¤w§R°£§¹¦¨."
+
+#: browse.php:64
+#, php-format
+msgid "Successfully removed %d contact(s) from list."
+msgstr "¤w¦¨¥\¦a±q¸s²Õ²¾°£ %d ­Ó³sµ¸¤H."
 
-#: data.php:29
+#: data.php:50
 msgid "TSV"
 msgstr "Tab ¤À¹j®æ¦¡"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tab ¤À¹j­È (*.tsv)"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr "­n±Ò¥Îªþ¥ó¤W¶Ç¥\¯à«e,µêÀÀÀɮרt²Î(VFS)¦øªAºÝ¥²¶·³]©w§¹¦¨."
+
+#: lib/Driver.php:1076
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "³q°T¿ý \"%s\" ¤£¦s¦b."
+
+#: addressbooks.php:48
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "³q°T¿ý \"%s\" «Ø¥ß§¹¦¨."
+
+#: addressbooks.php:71
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "³q°T¿ý \"%s\" ²¾°£§¹¦¨."
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "³q°T¿ý \"%s\" §ó·s§¹¦¨."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "¦¹³q°T¿ýµLªk³Q²MªÅ: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
-msgstr "¸ÓÁpµ¸¤H¤£¦s¦b."
+msgstr "¸Ó³sµ¸¤H¤£¦s¦b."
 
-#: browse.php:33
+#: edit.php:123
+#, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "ÀÉ®× \"%s\" ¤w§R°£§¹¦¨."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr "¾¨ºÞ¦³Äµ§i°T®§¦ý¤´µM¥i¥H§¹¦¨¸ê®Æªº¶×¤J."
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "µL¥i¨ÑÂsÄýªº³q°T¿ý."
 
@@ -868,108 +1055,130 @@
 msgstr ""
 "µL¥i¥Î¨Ó·s¼W°O¿ýªº³q°T¿ý¥i¥Î.¦pªG§A»{¬°³o©Î³\¬O­Ó¿ù»~,½ÐÁpµ¸§Aªº¨t²ÎºÞ²z­û."
 
-#: add.php:99
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
-msgstr "·s¼WÁpµ¸¤H®Éµo¥Í¤@­Ó¿ù»~.½ÐÁpµ¸§Aªº¨t²ÎºÞ²z­û¥H¨ó§U³B²z."
+msgstr "·s¼W³sµ¸¤H®Éµo¥Í¤@­Ó¿ù»~.½ÐÁpµ¸§Aªº¨t²ÎºÞ²z­û¥H¨ó§U³B²z."
 
-#: browse.php:185
+#: browse.php:271
 msgid "There was an error creating a new list."
 msgstr "«Ø¥ß·s¸s²Õ®Éµo¥Í¿ù»~."
 
-#: browse.php:136
+#: addressbooks.php:38
 #, php-format
-msgid "There was an error deleting %s from the source address book."
-msgstr "¦Û¨Ó·½³q°T¿ý¤¤§R°£ %s ®Éµo¥Í¤@­Ó¿ù»~."
+msgid "There was an error creating this address book: %s"
+msgstr "«Ø¥ß³q°T¿ý: %s ®Éµo¥Í¤@­Ó¿ù»~."
 
-#: delete.php:31
+#: browse.php:166
 #, php-format
-msgid "There was an error deleting this contact: %s"
-msgstr "§R°£Ápµ¸¤H: %s ®Éµo¥Í¤@­Ó¿ù»~."
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "¦Û¨Ó·½³q°T¿ý¤¤§R°£ \"%s\" ®Éµo¥Í¤@­Ó¿ù»~."
 
-#: browse.php:68
-msgid "There was an error deleting this object."
-msgstr "§R°£¦¹ª«¥ó®Éµo¥Í¿ù»~."
+#: delete.php:37
+#, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "§R°£³sµ¸¤H: %s ®Éµo¥Í¤@­Ó¿ù»~."
 
-#: browse.php:273
-msgid "There was an error displaying the select List"
-msgstr "Åã¥Ü¸s²Õ¸ê®Æ®Éµo¥Í¿ù»~"
+#: browse.php:311
+msgid "There was an error displaying the list"
+msgstr "Åã¥Ü¸s²Õ®Éµo¥Í¤@­Ó¿ù»~"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "¶×¤J¸ê®Æ:%s ®Éµo¥Í¤@­Ó¿ù»~"
 
-#: lib/api.php:352
+#: lib/api.php:509 lib/api.php:779
 msgid "There was an error importing the iCalendar data."
 msgstr "¶×¤J iCalendar ¸ê®Æ®Éµo¥Í¤@­Ó¿ù»~."
 
-#: browse.php:58
-msgid "There was an error removing this object."
-msgstr "²¾°£¦¹ª«¥ó®Éµo¥Í¿ù»~."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "²¾°£³q°T¿ý: %s ®Éµo¥Í¤@­Ó¿ù»~"
+
+#: addressbooks.php:87
+#, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "§ó·s³q°T¿ý: %s ®Éµo¥Í¤@­Ó¿ù»~"
 
-#: edit.php:84
+#: edit.php:165
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "§ó·s³oµ§¸ê®Æ: %s ®Éµo¥Í¤@­Ó¿ù»~"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "µL³q°T¿ý¸ê®Æ¥i¨Ñ¶×¥X³q°T¿ý."
 
-#: lib/Driver.php:390 lib/Driver.php:427
-msgid "This address book is read-only"
-msgstr "¦¹³q°T¿ý¥u¯àŪ¨ú."
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr "³q°T¿ýÅã¥Ü¶¶§Ç¦p¤U:"
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Äæ¦ì¦WºÙÅã¥Ü¶¶§Ç¦p¤U:"
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "¦¹ºØÀɮ׮榡¨Ã¥¼³Q¤ä´©."
 
-#: lib/api.php:939 lib/api.php:952
+#: lib/api.php:1140 lib/api.php:1153
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "³o­Ó¤Hªº %s °O¿ý¤w¦s¦b©ó³q°T¿ý¤¤."
 
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr "·s¼W©Î¶×¤J³sµ¸¤Hªº¹w³]³q°T¿ý."
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "ºÙ¿×"
 
-#: lib/Driver.php:834
+#: lib/Turba.php:449
+#, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr "µLªk«Ø¥ß·sªº¦@¨É. ¯Ê¤Ö¨Ó·½«¬ºA."
+
+#: lib/Driver.php:1000
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "µLªk¸ü¤J %s ªº©w¸q¸ê®Æ."
 
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "«ì´_Åܧó"
 
 #: config/attributes.php.dist:228
 msgid "Unit"
-msgstr "³æ¦ì"
+msgstr "½Ò«Ç"
 
-#: lib/api.php:487
-msgid "Unsupported Content-Type."
-msgstr "¥¼¤ä´©ªº¤º®e«¬ºA."
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr "¥¼¤ä´©ªº¤º®e«¬ºA: %s"
 
 #: config/attributes.php.dist:233
 msgid "Url"
 msgstr "ºô§}"
 
-#: config/sources.php.dist:422
+#: config/sources.php.dist:434
 msgid "Verisign Directory"
 msgstr "Verisign ¥Ø¿ý"
 
-#: templates/browse/contactrow.inc:27
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
 #, php-format
-msgid "View '%s'"
-msgstr "À˵ø '%s'"
+msgid "View \"%s\""
+msgstr "À˵ø \"%s\""
 
-#: minisearch.php:82
+#: minisearch.php:76
 msgid "View Contact"
-msgstr "À˵øÁpµ¸¤H"
+msgstr "À˵ø³sµ¸¤H"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "¹w³]À˵ø:"
 
@@ -1003,21 +1212,26 @@
 
 #: config/attributes.php.dist:119
 msgid "Work Street Address"
-msgstr "¿ì¤½«Ç¦a§}"
+msgstr "¿ì¤½«Ç¦í§}"
 
-#: templates/browse/javascript.inc:30
-msgid "You are creating a distribution list."
-msgstr "§A¥¿¦b«Ø¥ß¤@­Ó°t¸m¸s²Õ."
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "¤£¤¹³\§A¦b \"%2$s\" ¤¤«Ø¥ß %1$d ­Ó¥H¤Wªº³sµ¸¤H."
 
-#: edit.php:44 display.php:59
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
-msgstr "§A¨S¦³À˵ø³o­ÓÁpµ¸¤HªºÅv­­."
+msgstr "§A¨S¦³À˵ø³o­Ó³sµ¸¤HªºÅv­­."
 
 #: vcard.php:40
 msgid "You do not have permission to view this object."
 msgstr "§A¨S¦³À˵ø¦¹ª«¥óªºÅv­­."
 
-#: templates/browse/javascript.inc:51
+#: lib/Turba.php:537
+msgid "You do not have permissions to delete this source."
+msgstr "§A¨S¦³§R°£¦¹¨Ó·½ªºÅv­­."
+
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "§A¥²¶·¥ý¿ï¾Ü¤@­Ó¥Ø¦a³q°T¿ý."
 
@@ -1025,44 +1239,60 @@
 msgid "You must select a target list."
 msgstr "§A¥²¶·¿ï¾Ü¤@­Ó¥Ø¦a¸s²Õ."
 
-#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:45
-#: templates/browse/javascript.inc:68
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr "§A¥²¶·¿ï¾Ü¦Ü¤Ö¤@­Ó³sµ¸¤H."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "­º¥ý,§A¥²¶·¦Ü¤Ö¿ï¾Ü¤@µ§¸ê®Æ."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
-msgstr "§A¥u¦³À˵ø³o­ÓÁpµ¸¤HªºÅv­­."
+msgstr "§A¥u¦³À˵ø³o­Ó³sµ¸¤HªºÅv­­."
 
-#: browse.php:284
-msgid "Your default addressbook is not browseable."
+#: browse.php:318
+msgid "Your default address book is not browseable."
 msgstr "§Aªº¹w³]³q°T¿ý¤£¥iÂsÄý."
 
-#: templates/browse/contactrow.inc:12
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[ªÅ¥Õ]"
 
-#: lib/Turba.php:286
-msgid "_Add"
-msgstr "·s¼W_A"
-
-#: lib/Turba.php:283
+#: lib/Turba.php:560
 msgid "_Browse"
 msgstr "ÂsÄý_B"
 
+#: templates/browse/actions.inc:47
+msgid "_Contacts"
+msgstr "³sµ¸¤H_C"
+
 #: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "§R°£_D"
 
-#: lib/Turba.php:292
+#: lib/Turba.php:569
 msgid "_Import/Export"
 msgstr "¶×¤J/¶×¥X_I"
 
+#: templates/browse/actions.inc:46
+msgid "_Lists"
+msgstr "¸s²Õ_L"
+
+#: lib/Turba.php:557
+msgid "_My Address Books"
+msgstr "§Úªº³q°T¿ý_M"
+
+#: lib/Turba.php:563
+msgid "_New Contact"
+msgstr "·s¼W³sµ¸¤H_N"
+
 #: templates/browse/actions.inc:3
 msgid "_Remove from this list"
 msgstr "±q³o­Ó¸s²Õ¤¤²¾°£_R"
 
-#: lib/Turba.php:288
+#: lib/Turba.php:565
 msgid "_Search"
 msgstr "·j´M_S"
 
@@ -1070,19 +1300,35 @@
 msgid "contact.vcf"
 msgstr "³q°T¿ý.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "³q°T¿ý.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "³q°T¿ý.tsv"
 
-#: templates/browse/actions.inc:14
-msgid "to Selected Address Book"
-msgstr "¨ì©Ò¿ï¾Üªº³q°T¿ý"
+#: data.php:219
+msgid "contacts.vcf"
+msgstr "contacts.vcf"
+
+#: config/prefs.php.dist:138
+msgid "no formatting"
+msgstr "µL"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "¨S¦³"
+
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "¨ì¸s²Õ"
+
+#: templates/browse/actions.inc:21
+msgid "to a different Address Book"
+msgstr "¨ì¨ä¥Lªº³q°T¿ý"
 
-#: data.php:30 templates/browse/column_headers.inc:7
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/lib/List.php
+++ mod/lib/List.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * The Turba_List:: class provides an interface for dealing with a list of
- * Turba_AbstractObjects.
+ * The Turba_List:: class provides an interface for dealing with a
+ * list of Turba_Objects.
  *
- * $Horde: turba/lib/List.php,v 1.41.10.3 2005/06/23 00:47:16 selsky Exp $
+ * $Horde: turba/lib/List.php,v 1.41.10.4 2005/10/18 12:50:05 jan Exp $
  *
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @author  Jon Parise <jon at csh.rit.edu>
- * @since   Turba 0.0.1
  * @package Turba
  */
 class Turba_List {
@@ -20,13 +19,6 @@
     var $objects = array();
 
     /**
-     * An array of objects which have just been added during this page load.
-     *
-     * @var array
-     */
-    var $fresh = array();
-
-    /**
      * The field to compare objects by.
      *
      * @var string
@@ -34,55 +26,32 @@
     var $_usortCriteria;
 
     /**
-     * Inserts a new list.
-     *
-     * @param Turba_Object $object  The object to insert.
-     * @param boolean $new          This object is from a new search (defaults
-     *                              to true).
+     * Constructor.
      */
-    function insert($object, $new = true)
+    function Turba_List($ids = array())
     {
-        if (is_a($object, 'Turba_AbstractObject')) {
-            $key = $object->driver->name . ':' . $object->getValue('__key');
-            if (!isset($this->objects[$key])) {
-                if ($new) {
-                    $this->fresh[$key] = 1;
+        if ($ids) {
+            foreach ($ids as $value) {
+                list($source, $key) = explode(':', $value);
+                $driver = &Turba_Driver::singleton($source);
+                if (is_a($driver, 'Turba_Driver')) {
+                    $this->insert($driver->getObject($key));
                 }
-                $this->objects[$key] = $object;
             }
         }
     }
 
     /**
-     * Removes an entry from the list.
-     *
-     * @param string $key  The key of the object to remove.
+     * Inserts a new object into the list.
      *
-     * @since Turba 1.2
-     */
-    function remove($key)
-    {
-        if (isset($this->objects[$key])) {
-            unset($this->objects[$key]);
-        }
-    }
-
-    /**
-     * Merges an existing Turba_List into this one.
-     *
-     * @param mixed $list   The list to merge - either a Turba_List object or
-     *                      an array.
-     * @param boolean $new  These objects are coming from a new search
-     *                      (defaults to true).
+     * @param Turba_Object $object  The object to insert.
      */
-    function merge($list, $new = true)
+    function insert($object)
     {
-        if (is_a($list, 'Turba_List')) {
-            $list = $list->objects;
-        }
-        if (is_array($list)) {
-            foreach ($list as $object) {
-                $this->insert($object, $new);
+        if (is_a($object, 'Turba_Object')) {
+            $key = $object->getSource() . ':' . $object->getValue('__key');
+            if (!isset($this->objects[$key])) {
+                $this->objects[$key] = $object;
             }
         }
     }
@@ -169,12 +138,12 @@
     /**
      * Usort helper function.
      *
-     * Compares two Turba_AbstractObjects based on the member variable
+     * Compares two Turba_Objects based on the member variable
      * $_usortCriteria, taking care to sort numerically if it is an integer
      * field.
      *
-     * @param $a  The first Turba_AbstractObject to compare.
-     * @param $b  The second Turba_AbstroctObject to compare.
+     * @param Turba_Object $a  The first Turba_Object to compare.
+     * @param Turba_Object $b  The second Turba_Object to compare.
      *
      * @return integer  Comparison of the two field values.
      */
@@ -195,41 +164,4 @@
         }
     }
 
-    function isFresh($object)
-    {
-        return isset($this->fresh[$object->driver->name . ':' . $object->getValue('__key')]);
-    }
-
-    function serialize()
-    {
-        $data = array();
-        $data['keys'] = array();
-        $data['fresh'] = $this->fresh;
-        foreach ($this->objects as $key => $object) {
-            $data['keys'][] = $object->driver->name . ':' . $object->getValue('__key');
-        }
-        return $data;
-    }
-
-    function unserialize($data)
-    {
-        if (!isset($data) || !is_array($data)) {
-            return null;
-        }
-
-        $tmp = &new Turba_List();
-        $objects = array();
-        foreach ($data['keys'] as $value) {
-            list($source, $key) = explode(':', $value);
-            if (isset($GLOBALS['cfgSources'][$source])) {
-                $driver = &Turba_Driver::singleton($source, $GLOBALS['cfgSources'][$source]);
-                $tmp->insert($driver->getObject($key));
-            }
-        }
-
-        /* Not the best way of doing this, but it works for now. */
-        $tmp->fresh = $data['fresh'];
-        return $tmp;
-    }
-
 }


--- orig/po/el_GR.po
+++ mod/po/el_GR.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba: 1.2-cvs\n"
-"POT-Creation-Date: 2002-11-07 12:11+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2001-07-26 11:36+0200\n"
 "Last-Translator: Stefanos I. Dimitriou <support_webmail at teiath.gr>\n"
 "Language-Team: Greek <dev at lists.horde.org>\n"
@@ -15,533 +16,1378 @@
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "ÄéåõèõíóéïãñÜöïò Pine"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "ÅðéëÝîôå ÄéåõèõíóéïãñÜöï"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "%s Åðéôõ÷þò åéóáãùãÞ ôïõ áñ÷åßïõ"
 
-msgid "Add Contact ..."
-msgstr "ÍÝá êáñôÝëá ..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
+
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "ÄéåõèõíóéïãñÜöïò Pine"
+
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
+
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
+msgid "Add"
+msgstr "ÐñïóèÞêç"
+
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "ËáíèáóìÝíï Âéâëßï Äéåõèýíóåùí."
 
-msgid "Add a new contact"
-msgstr "ÐñïóèÞêç íÝáò êáñôÝëáò"
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Äåí õðÜñ÷ïõí äéåõèõíóéïãñÜöïé óôïõò ïðïßïõò ìðïñåßôå íá ãñÜøåôå."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "ðñïóèÞêç óôÞëçò"
 
-msgid "Add failed"
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
 msgstr "Ç ðñïóèÞêç áðÝôõ÷å"
 
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "ÐñïóèÞêç óôï"
 
-msgid "Add"
-msgstr "ÐñïóèÞêç"
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "ÄéåõèõíóéïãñÜöïò Pine"
 
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Ëßóôá Äéåõèýíóåùí"
 
-msgid "Address book is read-only."
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "¸îïäïò áðü ôï ÄéåõèõíóéïãñÜöï"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
 msgstr "Ï äéåõèõíóéïãñÜöïò åßíáé ìüíï ãéá áíÜãíùóç."
 
-#, c-format
-msgid "Addresses in list: %s"
-msgstr "Äéåõèýíóåéò óôç ëßóôá: %s"
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "¸ãéíå åðéôõ÷þò åéóáãùãÞ ôïõ äéåõèõíóéïãñÜöïõ Pine"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Ï äéåõèõíóéïãñÜöïò åßíáé ìüíï ãéá áíÜãíùóç."
 
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "ÅéäéêÞ ÁíáæÞôçóç"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Øåõäþíõìï"
 
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "¼ëá"
 
-msgid "An illegal value was specified."
-msgstr "Ïñßóôçêå ìßá ìç åðéôñåðüìåíç ôéìÞ."
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
 
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
+
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Áýîïõóá"
 
-msgid "Available Columns:"
-msgstr "ÄéáèÝóéìá Ðåäßá:"
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "ÁíáæÞôçóç"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
 
-#, c-format
-msgid "Back to %s"
-msgstr "ÅðéóôñïöÞ óôï %s"
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
 
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Ëßóôá"
 
-msgid "Cancel"
-msgstr "Áêýñùóç"
+#: config/attributes.php.dist:173
+#, fuzzy
+msgid "Business Category"
+msgstr "Êáôçãïñßá Åñãáóßáò"
+
+#: data.php:49
+msgid "CSV"
+msgstr ""
+
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "ËáíèáóìÝíï Âéâëßï Äéåõèýíóåùí."
 
-msgid "Checkbox"
-msgstr "ÅðéëïãÞ ôùí äéåõèýíóåùí"
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "ËáíèáóìÝíï Âéâëßï Äéåõèýíóåùí."
 
-msgid "Choose the order of the columns to display in the address list."
-msgstr "ÅðéëïãÞ ôçò óåéñÜò ôùí óôçëþí êáôÜ ôçí ðñïâïëÞ ôçò ëßóôáò ôùí äéåõèýíóåùí."
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
 
-msgid "Clear Search"
-msgstr "Áêýñùóç ÁíáæÞôçóçò"
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
 
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr ""
+"ÅðéëïãÞ ôçò óåéñÜò ôùí óôçëþí êáôÜ ôçí ðñïâïëÞ ôçò ëßóôáò ôùí äéåõèýíóåùí."
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "ÅðéëïãÝò Óôçëþí"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "ÔéìÝò äéá÷ùñéóìÝíåò ìå êüììá"
 
+#: templates/data/export.inc:13
+#, fuzzy
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr "ÔéìÝò äéá÷ùñéóìÝíåò ìå êüììá"
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Åôáéñßá"
 
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Äéåýèõíóç Êáôïéêßáò"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "ÄéáãñáöÞ áðÝôõ÷å"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "ÄéáãñáöÞ áðÝôõ÷å"
+
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "Ç êáñôÝëá áöáéñÝèçêå áðü ôç ëßóôá."
+
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "Ç êáñôÝëá áöáéñÝèçêå áðü ôç ëßóôá."
 
-#, c-format
-msgid "Contents of %s"
-msgstr "Ðåñéå÷üìåíá ôïõ %s"
+#: browse.php:266
+#, fuzzy, php-format
+msgid "Contacts in list: %s"
+msgstr "Äéåõèýíóåéò óôç ëßóôá: %s"
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "Åôáéñßá"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "ÅîáãùãÞ Âéâëßïõ Äéåõèýíóåùí"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
 
-msgid "Default Display"
-msgstr "ÐñïåðéëåãìÝíç ÅìöÜíéóç"
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
 
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "ÐñïåðéëåãìÝíç êáôåýèõíóç ôáîéíüìçóçò:"
 
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "ÄéáãñáöÞ"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "ÅðéëÝîôå ÄéåõèõíóéïãñÜöï"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "ÄéáãñáöÞ áðÝôõ÷å"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "ÄéáãñáöÞ áðÝôõ÷å"
 
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Öèßíïõóá"
 
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "ÅðéëïãÝò ×ñÞóôç"
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "ÊáôÜëïãïò"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "ÅðéëïãÝò ÅìöÜíéóçò"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "ÅðéëïãÝò ÅìöÜíéóçò"
 
-#, c-format
-msgid "Edit '%s'"
-msgstr "Åðåîåñãáóßá '%s'"
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
 
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Åðåîåñãáóßá"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Åðåîåñãáóßá '%s'"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "¸îïäïò áðü ôï ÄéåõèõíóéïãñÜöï"
+
+#: edit.php:78 edit.php:154
+#, fuzzy, php-format
+msgid "Edit entry for %s"
+msgstr "Äåí âñÝèçêå %s êáôá÷þñéóç ãéá %s."
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "Email"
 
-msgid "Error while searching directory."
-msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí áíáæÞôçóç óôïí êáôÜëïãï."
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Error"
-msgstr "ËÜèïò"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
 
-msgid "Exit Address Book"
-msgstr "¸îïäïò áðü ôï ÄéåõèõíóéïãñÜöï"
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s Åðéôõ÷þò åéóáãùãÞ ôïõ áñ÷åßïõ"
 
-msgid "Export Address Book"
-msgstr "ÅîáãùãÞ Âéâëßïõ Äéåõèýíóåùí"
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Äåí õðÜñ÷ïõí äéåõèõíóéïãñÜöïé óôïõò ïðïßïõò ìðïñåßôå íá ãñÜøåôå."
 
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "ÅîáãùãÞ"
 
-msgid "Failed to access the specified address book."
+#: templates/data/export.inc:6
+msgid "Export Address Book"
+msgstr "ÅîáãùãÞ Âéâëßïõ Äéåõèýíóåùí"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
 msgstr "Áðïôõ÷ßá êáôÜ ôç óýíäåóç óôïí åðéëåãìÝíï äéåõèõíóéïãñÜöï."
 
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Áðïôõ÷ßá êáôÜ ôçí áíáæÞôçóç óôïí êáôÜëïãï : %s"
+
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "Áðïôõ÷ßá êáôÜ ôçí åìöÜíéóç ôçò ëßóôáò"
 
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "Áðïôõ÷ßá êáôÜ ôçí ðñïâïëÞ ôïõ êáôáëüãïõ"
 
-msgid "Failed to connect to the specified directory."
-msgstr "Áðïôõ÷ßá óýíäåóçò óôïí åðéëåãìÝíï êáôÜëïãï."
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
 
-#, c-format
-msgid "Failed to search the directory: %s"
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
 msgstr "Áðïôõ÷ßá êáôÜ ôçí áíáæÞôçóç óôïí êáôÜëïãï : %s"
 
-msgid "Failed to search the specified directory."
-msgstr "Áðïôõ÷ßá êáôÜ ôçí áíáæÞôçóç óôïí åðéëåãìÝíï êáôÜëïãï."
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Áðïôõ÷ßá êáôÜ ôç óýíäåóç óôïí åðéëåãìÝíï äéåõèõíóéïãñÜöï."
+
+#: data.php:149
+#, php-format
+msgid "Failed to search the directory: %s"
+msgstr "Áðïôõ÷ßá êáôÜ ôçí áíáæÞôçóç óôïí êáôÜëïãï : %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Öáî"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Ôßôëïò"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "ÁíáæÞôçóç"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "ÁíáæÞôçóç"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Áðü"
 
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "ÄéåõèõíóéïãñÜöïò Mulberry"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "ÏìÜäá"
 
-msgid "Help"
-msgstr "ÂïÞèåéá"
-
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Äéåýèõíóç Êáôïéêßáò"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "ÔçëÝöùíï Êáôïéêßáò"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "ÔçëÝöùíï Êáôïéêßáò"
 
-msgid "If importing CSV data: does the first row contain the field names?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "ÔçëÝöùíï Êáôïéêßáò"
+
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "ÔçëÝöùíï Êáôïéêßáò"
+
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Äéåýèõíóç Êáôïéêßáò"
+
+#: config/sources.php.dist:506
+msgid "IMSP"
 msgstr ""
-"Áí åéóÜãåôå äéåõèýíóåéò áðü áñ÷åßï ÷áñáêôÞñùí, ç ðñþôç ãñáììÞ ðåñéÝ÷åé ôá "
-"ïíüìáôá ôùí ðåäßùí;"
 
-msgid "Illegal or malformed form data."
-msgstr "ËáíèáóìÝíç ìïñöÞ Þ ôýðïò äåäïìÝíùí."
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Ëßóôá Äéåõèýíóåùí"
 
-msgid "Import Address Book"
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
 msgstr "ÅéóáãùãÞ Âéâëßïõ Äéåõèýíóåùí"
 
-msgid "Import"
-msgstr "ÅéóáãùãÞ"
-
-msgid "Import/Export Addressbooks"
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "ÅéóáãùãÞ/ÅîáãùãÞ ÄéåõèõíóéïãñÜöïõ"
 
-msgid "Import/Export"
-msgstr "ÅéóáãùãÞ/ÅîáãùãÞ"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "ËÜèïò üíïìá"
 
-msgid "Invalid address book."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "ËáíèáóìÝíï Âéâëßï Äéåõèýíóåùí."
 
-msgid "Invalid e-mail address."
-msgstr "ËÜèïò 'e-mail' äéåýèõíóç"
-
-msgid "Invalid email."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "ËÜèïò email."
 
-msgid "Invalid entry."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
 msgstr "ËÜèïò Êáôá÷þñéóç."
 
-msgid "Invalid name."
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "ËÜèïò email."
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
 msgstr "ËÜèïò üíïìá"
 
-msgid "Language"
-msgstr "Ãëþóóá"
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "ËÜèïò Êáôá÷þñéóç."
+
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
 
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "¼íïìá"
+
+#: templates/browse/column_headers.inc:16
+#, fuzzy
+msgid "List"
+msgstr "ÍÝá Ëßóôá"
+
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "ÔáéñéÜæåé ìå"
 
-msgid "Message"
-msgstr "ÌÞíõìá"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "ÍÝá Ëßóôá"
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "ÁíáæÞôçóç"
 
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "Êéíçôü ÔçëÝöùíï"
 
-msgid "More than 1 entry returned."
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+#, fuzzy
+msgid "More than 1 entry found"
 msgstr "ÅðéóôñÜöçêáí ðåñéóóüôåñåò áðü ìßá êáôá÷ùñÞóåéò."
 
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "ÌåôáöïñÜ ÁñéóôåñÜ"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "ÌåôáöïñÜ ÄåîéÜ"
+
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "ÄéåõèõíóéïãñÜöïò Mulberry"
 
-msgid "Mulberry addressbook sucessfully imported"
-msgstr "¸ãéíå åðéôõ÷þò åéóáãùãÞ ôïõ äéåõèõíóéïãñÜöïõ Mulberry"
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "ÄéåõèõíóéïãñÜöïò Mulberry"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "ÄéåõèõíóéïãñÜöïò Mulberry"
 
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "¼íïìá"
 
-msgid "New List"
-msgstr "ÍÝá Ëßóôá"
+#: config/prefs.php.dist:31
+msgid "Name Format"
+msgstr ""
+
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "ÅìöÜíéóç Åðáöþí"
 
-#, c-format
-msgid "No %s entry found for %s."
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "¼íïìá"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, fuzzy, php-format
+msgid "No %s entry found for %s"
 msgstr "Äåí âñÝèçêå %s êáôá÷þñéóç ãéá %s."
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "Ï äéåõèõíóéïãñÜöïò åßíáé ìüíï ãéá áíÜãíùóç."
+
+#: minisearch.php:83
+#, fuzzy
+msgid "No contacts found"
+msgstr "ÅìöÜíéóç Åðáöþí"
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
 msgstr ""
-"ÊáíÝíáò áðü ôïõò äéáèÝóéìïõò äéåõèõíóéïãñÜöïõò äåí Ý÷åé ñõèìéóôåß þóôå íá "
-"ìðïñåß íá êáôá÷ùñåß åããñáöÝò. Ìðïñåßôå íá åíçìåñþóåôå ôï äéá÷åéñéóôÞ ôïõ "
-"óõóôÞìáôïò óáò."
 
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "ÊáíÝíá"
 
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Óçìåéþóåéò"
 
-msgid "Options"
-msgstr "ÅðéëïãÝò"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
+
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
+
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "ÅðéëïãÝò ×ñÞóôç"
+
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
+
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
 
-msgid "Outlook"
-msgstr "Ðñüãñáììá Outlook"
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
 
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "ÄéåõèõíóéïãñÜöïò Pine"
 
-msgid "Pine addressbook sucessfully imported"
-msgstr "¸ãéíå åðéôõ÷þò åéóáãùãÞ ôïõ äéåõèõíóéïãñÜöïõ Pine"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
+msgstr "Ðáñáêáëþ äþóôå ôï üíïìá ãéá ôç íÝá ëßóôá:"
 
-msgid "Please choose an address book to add a contact to."
-msgstr "Ðáñáêáëþ åðéëÝîôå Ýíá äéåõèõíóéïãñÜöï ãéá íá ðñïóèÝóåôå ìßá êáñôÝëá óå áõôüí."
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-msgid "Please enter the name of the new list:"
-msgstr "Ðáñáêáëþ äþóôå ôï üíïìá ãéá ôç íÝá ëßóôá:"
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "ÄéåõèõíóéïãñÜöïò Pine"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "ÁíáæÞôçóç"
 
-msgid "Please select a directory:"
-msgstr "Ðáñáêáëþ åðéëÝîôå Ýíá êáôÜëïãï:"
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
 
-msgid "Problem?"
-msgstr "Ðñüâëçìá;"
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
 
-msgid "Reset"
-msgstr "Áêýñùóç"
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
 
-msgid "Save Changes"
-msgstr "ÁðïèÞêåõóç áëëáãþí"
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "ËáíèáóìÝíï Âéâëßï Äéåõèýíóåùí."
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "Áöáßñåóç ÓôÞëçò"
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "Remove from this list"
+msgstr "Ç êáñôÝëá áöáéñÝèçêå áðü ôç ëßóôá."
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
 
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "ÁðïèÞêåõóç"
 
-msgid "Search Results"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "ÁíáæÞôçóç"
+
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "ÁðïôåëÝóìáôá ÁíáæÞôçóçò"
 
-msgid "Search"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "ÁíáæÞôçóç"
+
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
 msgstr "ÁíáæÞôçóç"
 
-msgid "Search&nbsp;Results"
-msgstr "ÁðïôåëÝóìáôá&nbsp;ÁíáæÞôçóçò"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "ÅðéëÝîôå ÄéåõèõíóéïãñÜöï"
 
-msgid "Select Address Book"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
 msgstr "ÅðéëÝîôå ÄéåõèõíóéïãñÜöï"
 
-msgid "Select List"
-msgstr "Ëßóôá ÅðéëïãÞò"
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "ÅðéëÝîôå áðü ðïõ èá åîÜãåôå ôá äåäïìÝíá:"
 
-msgid "Select the destination to import to:"
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "ÅðéëÝîôå ðïõ èá ãßíåé ç åéóáãùãÞ:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "ÅðéëÝîôå áðü ðïõ èá åîÜãåôå ôá äåäïìÝíá:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "ÅðéëÝîôå áðü ðïõ èá åîÜãåôå ôá äåäïìÝíá:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "ÅðéëÝîôå ôï áñ÷åßï ðïõ èá åéóá÷èåß:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "ÅðéëÝîôå ôçí ìïñöÞ åîáãùãÞò ôùí äåäïìÝíùí:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "ÅðéëÝîôå ôçí ìïñöÞ åéóáãùãÞò ôùí äåäïìÝíùí:"
 
-msgid "Select the source to export from:"
-msgstr "ÅðéëÝîôå áðü ðïõ èá åîÜãåôå ôá äåäïìÝíá:"
-
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "ÅðéëïãÞ ôçò ðñïåðéëåãìÝíçò ðñïâïëÞò."
 
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "ÅðéëïãÞ ôùí ðåäßùí ðïõ èá åìöáíßæïíôáé óôç ëßóôá ôùí äéåõèýíóåùí."
 
-msgid "Select your preferred language:"
-msgstr "ÅðéëÝîôå ôçí ðñïôéìïýìåíç ãëþóóá:"
-
-msgid "Select"
-msgstr "ÅðéëïãÞ"
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "ÅðéëïãÞ ôùí ðåäßùí ðïõ èá åìöáíßæïíôáé óôç ëßóôá ôùí äéåõèýíóåùí."
 
-msgid "Selected Columns:"
-msgstr "ÅðéëåãìÝíåò ÓôÞëåò:"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "ÅðéëÝîôå ÄéåõèõíóéïãñÜöï"
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "ÁðïóôïëÞ email ðñïò %s"
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "ÊáôÜëïãïò"
 
-msgid "Set your preferred display language."
-msgstr "Ñõèìßóôå ôçí ãëþóóá ðñïôßìçóçò óáò."
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "ÅìöÜíéóç"
 
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "ÅìöÜíéóç ¼ëùí"
 
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "ÅìöÜíéóç Åðáöþí"
 
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "ÅìöÜíéóç Ëéóôþí"
 
-msgid "Show"
-msgstr "ÅìöÜíéóç"
-
-msgid "Some of Turba's configuration files are missing:"
-msgstr "ÊÜðïéá áðü ôá áñ÷åßá ñõèìßóåùí ôïõ Turba's ëåßðïõí:"
-
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "Êáôåýèõíóç Ôáîéíüìçóçò"
 
-msgid "Success"
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
 msgstr "Åðéôõ÷ßá"
 
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
+
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
+
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
+
+#: data.php:50
+msgid "TSV"
+msgstr ""
+
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "ÔéìÞò äéá÷ùñéóìÝíåò ìå 'Tab'"
 
-msgid "The data got lost"
-msgstr "Ôá äåäïìÝíá ÷Üèçêáí"
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
+
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "¸ãéíå åðéôõ÷þò åéóáãùãÞ ôïõ äéåõèõíóéïãñÜöïõ Pine"
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
 
-msgid "The data got lost."
-msgstr "Ôá äåäïìÝíá ÷Üèçêáí."
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s Åðéôõ÷þò åéóáãùãÞ ôïõ áñ÷åßïõ"
 
-msgid "The file contained no data."
-msgstr "Ôï áñ÷åßï äåí ðåñéåß÷å äåäïìÝíá."
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
 
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Äåí õðÜñ÷ïõí äéåõèõíóéïãñÜöïé ôïõò ïðïßïõò ìðïñåßôå íá äåßôå."
 
-msgid "There are no writeable address books."
-msgstr "Äåí õðÜñ÷ïõí äéåõèõíóéïãñÜöïé óôïõò ïðïßïõò ìðïñåßôå íá ãñÜøåôå."
-
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"ÕðÞñîå ðñüâëçìá êáôÜ ôçí ìåôáöïñÜ ôïõ áñ÷åßïõ. Ôï áñ÷åßï ìðïñåß íá åßíáé "
-"ìåãáëýôåñï áðü ôï åðéôñåðüìåíï ìÝãåèïò."
+"ÊáíÝíáò áðü ôïõò äéáèÝóéìïõò äéåõèõíóéïãñÜöïõò äåí Ý÷åé ñõèìéóôåß þóôå íá "
+"ìðïñåß íá êáôá÷ùñåß åããñáöÝò. Ìðïñåßôå íá åíçìåñþóåôå ôï äéá÷åéñéóôÞ ôïõ "
+"óõóôÞìáôïò óáò."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+"There was an error adding the new contact. Contact your system administrator "
+"for further help."
 msgstr ""
 "ÕðÞñîå ðñüâëçìá óôçí ðñïóèÞêç ôïõ áíôéêåéìÝíïõ. ÅðéêïéíùíÞóôå ìå ôïí "
 "äéá÷åéñéóôÞ."
 
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äéáãñáöÞ áõôïý ôïõ áíôéêåéìÝíïõ."
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äçìéïõñãßá ôçò íÝáò ëßóôáò."
 
-msgid ""
-"There was an error deleting this object. Contact your system administrator "
-"for further help."
-msgstr ""
-"ÐáñïõóéÜóôçêå ðñüâëçìá êáôÜ ôçí äéáãñáöÞ áõôïý ôïõ áíôéêåéìÝíïõ. ÅðéêïéíùíÞóôå ìå ôïí "
-"äéá÷åéñéóôÞ ãéá ðåñéóóüôåñåò ðëçñïöïñßåò."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äçìéïõñãßá ôçò íÝáò ëßóôáò."
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äéáãñáöÞ áõôïý ôïõ áíôéêåéìÝíïõ."
 
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äéáãñáöÞ áõôïý ôïõ áíôéêåéìÝíïõ."
+
+#: browse.php:72
 msgid "There was an error deleting this object."
 msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äéáãñáöÞ áõôïý ôïõ áíôéêåéìÝíïõ."
 
-msgid "There was an error displaying the select List"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
 msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ åìöÜíéóç ôçò ëßóôáò"
 
-msgid "There was an error importing the data."
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
 msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí åéóáãùãÞ äåäïìÝíùí."
 
-msgid "There was an error importing the uploaded file"
-msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ìåôáöïñÜ ôïõ áñ÷åßïõ óôïí server"
-
-msgid "There was an error importing the vCard data."
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
 msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí åéóáãùãÞ ôçò ØçöéáêÞò ÊÜñôáò."
 
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äçìéïõñãßá ôçò íÝáò ëßóôáò."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äéáãñáöÞ áõôïý ôïõ áíôéêåéìÝíïõ."
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
-msgstr ""
-"Áõôü ôï áñ÷åßï åëÝã÷åé ôéò ðñïêáèïñéóìÝíåò ñõèìßóåéò ôïõ Turba, êáé åðßóçò "
-"ðïéåò áðü áõôÝò ìðïñïýí íá ôñïðïðïéÞóïõí ïé ÷ñÞóôåò."
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äéáãñáöÞ áõôïý ôïõ áíôéêåéìÝíïõ."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr ""
-"Áõôü ôï áñ÷åßï ðåñéÝ÷åé ôéò ñõèìßóåéò ãéá ôá ÷ñþìáôá êáé ôéò ãñáììáôïóåéñÝò."
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí äéáãñáöÞ áõôïý ôïõ áíôéêåéìÝíïõ."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
-msgstr ""
-"Áõôü ôï áñ÷åßï ïñßæåé ôéò ãåíéêÝò éäéüôçôåò ôïõ ðñïãñÜììáôïò Turba - "
-"ôïõò ôýðïõò, ôï üíïìá, ôï email, ê.ô.ë"
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Äåí õðÜñ÷ïõí äéåõèõíóéïãñÜöïé óôïõò ïðïßïõò ìðïñåßôå íá ãñÜøåôå."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "Áõôü ôï áñ÷åßï ïñßæåé ôçí ëßóôá ìå ôéò äéáèÝóéìåò ðçãÝò ôïõ Turba."
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
 msgstr ""
-"Áõôü åßíáé ôï âáóéêü áñ÷åßï ñõèìßóåùí ôïõ ðñïãñÜììáôïò Turba. ÐåñéëáìâÜíåé "
-"ôá ìïíïðÜôéá êáé ôéò åðéëïãÝò ãéá üëá ôïõ ôá script."
 
-msgid "This number must be at least one."
-msgstr "Áõôüò ï áñéèìüò ðñÝðåé íá åßíáé ôïõëÜ÷éóôïí Ýíá."
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
 
-#, c-format
-msgid "This person already has a %s entry in the address book."
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "ÁõôÞ ç åðáöÞ %s Ý÷åé Þäç êáôá÷ùñçèåß óôï äéåõèõíóéïãñÜöï."
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
-msgid "This person is already in your address book."
-msgstr "ÁõôÞ ç åðáöÞ õðÜñ÷åé Þäç óôï äéåõèõíóéïãñÜöï óáò."
-
-msgid "This value must be a number."
-msgstr "ÁõôÞ ç ôéìÞ ðñÝðåé íá åßíáé áñéèìüò."
-
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Ôßôëïò"
 
-msgid "Turba is not properly configured"
-msgstr "Ôï ðñüãñáììá Turba äåí Ý÷åé ñõèìéóôåß ðëÞñùò."
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Äåí ìðïñïýí íá ãßíïõí ïé ñõèìßóåéò ôïõ %s."
 
-msgid "Unnamed Contact"
-msgstr "Óôçí åðáöÞ äåí Ý÷åé óõìðëçñùèåß üíïìá."
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "ÁðïèÞêåõóç áëëáãþí"
 
-msgid "User Options"
-msgstr "ÅðéëïãÝò ×ñÞóôç"
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
 
-msgid "View map"
-msgstr "ÅìöÜíéóç ×Üñôç"
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "ÊáôÜëïãïò"
 
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "ÅìöÜíéóç Åðáöþí"
+
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Ç ðñïâïëÞ ðïõ èá åìöáíßæåôáé:"
 
-msgid "Warning"
-msgstr "Ðñïåéäïðïßçóç"
-
-msgid "Web Site"
+#: config/attributes.php.dist:208
+#, fuzzy
+msgid "Website URL"
 msgstr "ÇëåêôñïíéêÞ Äéåýèõíóç(URL)"
 
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Äéåýèõíóç Åñãáóßáò"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "ÔçëÝöùíï Åñãáóßáò"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "ÔçëÝöùíï Åñãáóßáò"
 
-msgid "You are creating a distribution list."
-msgstr "Äçìéïõñãåßôå ìßá ëßóôá äéáíïìÞò."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "ÔçëÝöùíï Åñãáóßáò"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
-msgstr "Äåí áíôéóôïé÷Þèçêáí ðåäßá áðü ôï áñ÷åßï ðïõ åéóÞ÷èç óôá áíôßóôïé÷á ôïõ äéåõèõíóéïãñÜöïõ."
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "ÔçëÝöùíï Åñãáóßáò"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Äéåýèõíóç Åñãáóßáò"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
+
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
+
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
+
+#: templates/browse/javascript.inc:55
+#, fuzzy
+msgid "You must select a target address book."
+msgstr "ÐñÝðåé ðñþôá íá åðéëÝîåôå ìßá åðáöÞ."
 
+#: templates/browse/javascript.inc:23
+#, fuzzy
+msgid "You must select a target list."
+msgstr "ÐñÝðåé ðñþôá íá åðéëÝîåôå ìßá åðáöÞ."
+
+#: edit.php:32
 msgid "You must select at least one contact first."
 msgstr "ÐñÝðåé ðñþôá íá åðéëÝîåôå ìßá åðáöÞ."
 
-msgid "Your Information"
-msgstr "Ïé ðëçñïöïñßåò Óáò"
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+#, fuzzy
+msgid "You must select at least one entry first."
+msgstr "ÐñÝðåé ðñþôá íá åðéëÝîåôå ìßá åðáöÞ."
 
-msgid "Your options have been updated."
-msgstr "Ïé åðéëïãÝò óáò Ý÷ïõí áðïèçêåõôåß."
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
 
-msgid "[Edit]"
-msgstr "[Åðåîåñãáóßá]"
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
 
-msgid "add column"
-msgstr "ðñïóèÞêç óôÞëçò"
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
 
-msgid "businesscategory"
-msgstr "Êáôçãïñßá Åñãáóßáò"
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "Ëßóôá"
 
-msgid "move left"
-msgstr "ÌåôáöïñÜ ÁñéóôåñÜ"
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "ÅìöÜíéóç Åðáöþí"
 
-msgid "move right"
-msgstr "ÌåôáöïñÜ ÄåîéÜ"
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "ÄéáãñáöÞ"
 
-msgid "remove column"
-msgstr "Áöáßñåóç ÓôÞëçò"
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "ÅéóáãùãÞ/ÅîáãùãÞ"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "ÅìöÜíéóç Ëéóôþí"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "ÄéåõèõíóéïãñÜöïò Mulberry"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "ÅìöÜíéóç Åðáöþí"
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Remove from this list"
+msgstr "Ç êáñôÝëá áöáéñÝèçêå áðü ôç ëßóôá."
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "ÁíáæÞôçóç"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "ÊáíÝíá"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "ÅìöÜíéóç Åðáöþí"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "ÅðéëÝîôå ÄéåõèõíóéïãñÜöï"
 
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "ØçöéáêÞ ÊÜñôá"


--- orig/po/mk_MK.po
+++ mod/po/mk_MK.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mk_MK\n"
-"POT-Creation-Date: 2003-06-06 14:30+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-06-26 14:59+0200\n"
 "Last-Translator: Stojan Pesov <ssp at eureka.com.mk>\n"
 "Language-Team: Macedonian <i18n at lists.horde.org>\n"
@@ -15,299 +16,1356 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "%s ÔÞÚãÜÕÝâÞâ Õ ãáßÕèÝÞ ØÜßÞàâØàÐÝ"
 
-msgid "Add Contact ..."
-msgstr "´ÞÔÐÔØ ÚÞÝâÐÚâ"
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "´ÞÔÐÔØ ÝÞÒ ÚÞÝâÐÚâ"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
 
-msgid "Add failed"
-msgstr "´ÞÔÐÒÐúÕâÞ Õ ÝÕãáßÕèÝÞ"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
 
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "´ÞÔÐø"
 
-msgid "Addressbook is read-only."
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "°ÔàÕáÐàÞâ Õ ÝÕÒÐÛØÔÕÝ"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "½ÕÜÐ ÐÔàÕáÐà ÒÞ ÚÞø Õ ÔÞ×ÒÞÛÕÝÞ ×ÐßØèãÒÐúÕ."
+
+#: templates/prefs/columnselect.inc:237
+msgid "Add column"
+msgstr ""
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "´ÞÔÐÒÐúÕâÞ Õ ÝÕãáßÕèÝÞ"
+
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "´ÞÔÐø"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
+
+#: browse.php:28 config/prefs.php.dist:125
+#, fuzzy
+msgid "Address Book Listing"
 msgstr "²Þ ÐÔàÕáÐàÞâ ÝÕ ÜÞÖÕ ÔÐ áÕ ×ÐßØèãÒÐ "
 
-msgid "Advanced Directory Search"
-msgstr "½ÐßàÕÔÝÞ ßÞÑÐàãÒÐúÕ ÝÐ ÔØàÕÚâÞàØãÜØ"
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "²Þ ÐÔàÕáÐàÞâ ÝÕ ÜÞÖÕ ÔÐ áÕ ×ÐßØèãÒÐ "
+
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "%s ÔÞÚãÜÕÝâÞâ Õ ãáßÕèÝÞ ØÜßÞàâØàÐÝ"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "²Þ ÐÔàÕáÐàÞâ ÝÕ ÜÞÖÕ ÔÐ áÕ ×ÐßØèãÒÐ "
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
 
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "½ÐßàÕÔÝÞ ßàÕÑÐàãÒÐúÕ"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "°ÛØÐá"
 
-msgid "Bcc"
-msgstr "½ÕÒØÔÛØÒÐ ÚÞßØøÐ"
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
 
-msgid "Cancel"
-msgstr "¾âÚÐÖØ"
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
 
-msgid "Cc"
-msgstr "ºÞßØøÐ"
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "¼ÞÑØÛÕÝ"
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "¿àÕÑÐàãÒÐø"
 
-msgid "Clear Search"
-msgstr "½ÞÒÞ ÑÐàÐúÕ"
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr ""
 
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
+
+#: data.php:49
+msgid "CSV"
+msgstr ""
+
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "°ÔàÕáÐàÞâ Õ ÝÕÒÐÛØÔÕÝ"
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "°ÔàÕáÐàÞâ Õ ÝÕÒÐÛØÔÕÝ"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:17
+msgid "Column Options"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "ÄØàÜÐ"
 
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "´ÞÜÐèÝÐ ÐÔàÕáÐ"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "´ÞÔÐÒÐúÕâÞ Õ ÝÕãáßÕèÝÞ"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "´ÞÔÐÒÐúÕâÞ Õ ÝÕãáßÕèÝÞ"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "ÄØàÜÐ"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
+
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "¸×ÑàØèØ"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "´ÞÔÐÒÐúÕâÞ Õ ÝÕãáßÕèÝÞ"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "´ÞÔÐÒÐúÕâÞ Õ ÝÕãáßÕèÝÞ"
 
-msgid "Directory Search"
-msgstr "¿àÕÑÐàãÒÐúÕ ÔØàÕÚâÞàØãÜ"
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
 
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "´ØàÕÚâÞàØãÜ"
 
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr ""
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
+msgid "Display Options"
+msgstr ""
+
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "ÃàÕÔØ"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "ÃàÕÔØ"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "Õ-ßÞèâÐ"
 
-msgid "Error"
-msgstr "³àÕèÚÐ"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Export Addressbook"
-msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s ÔÞÚãÜÕÝâÞâ Õ ãáßÕèÝÞ ØÜßÞàâØàÐÝ"
 
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "½ÕÜÐ ÐÔàÕáÐà ÒÞ ÚÞø Õ ÔÞ×ÒÞÛÕÝÞ ×ÐßØèãÒÐúÕ."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "µÚáßÞàâØàÐø"
 
-msgid "Failed to connect to the specified directory."
-msgstr "½Õ ÜÞÖÐÜ ÔÐ ÓÞ ÞâÒÞàÐÜ ÑÐàÐÝØÞâ ÔØàÕÚâÞàØãÜ"
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
+msgstr "½Õ ÜÞÖÐÜ ÔÐ ßàÕÑÐàãÒÐÜ ßÞ ÔØàÕÚâÞàØãÜÞâ %s"
+
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "½Õ ÜÞÖÐÜ ÔÐ ßàÕÑÐàãÒÐÜ ßÞ ÔØàÕÚâÞàØãÜÞâ %s"
+
+#: browse.php:272
+msgid "Failed to browse list"
+msgstr ""
+
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
+msgstr "½Õ ÜÞÖÐÜ ÔÐ ßàÕÑÐàãÒÐÜ ßÞ ÔØàÕÚâÞàØãÜÞâ %s"
+
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "½Õ ÜÞÖÐÜ ÔÐ ßàÕÑÐàãÒÐÜ ßÞ ÔØàÕÚâÞàØãÜÞâ %s"
 
-#, c-format
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "½Õ ÜÞÖÐÜ ÔÐ ßàÕÑÐàãÒÐÜ ßÞ ÔØàÕÚâÞàØãÜÞâ %s"
+
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "½Õ ÜÞÖÐÜ ÔÐ ßàÕÑÐàãÒÐÜ ßÞ ÔØàÕÚâÞàØãÜÞâ %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "ÄÐÚá"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "½ÐáÛÞÒ"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "±ÐàÐø"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "±ÐàÐø"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "¾Ô"
 
-msgid "Help"
-msgstr "¿ÞÜÞè"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
 
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
+
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "´ÞÜÐèÝÐ ÐÔàÕáÐ"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "´ÞÜÐèÕÝ âÕÛÕäÞÝ"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "´ÞÜÐèÕÝ âÕÛÕäÞÝ"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "°ÚÞ ØÜßÞàâØàÐâÕ CSV ßÞÔÐâÞæØ ÔÐÛØ ßàÒØÞâ àÕÔ ÓØ áÞÔàÖØ ØÜØúÐâÐ ÝÐ áØâÕ ßÞÛØúÐ?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "´ÞÜÐèÕÝ âÕÛÕäÞÝ"
 
-msgid "Illegal or malformed form data."
-msgstr "³àÕèÚÐ ßàØ âàÐÝáßÞàÞâ ÝÐ ØÝäÞàÜÐæØØ"
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "´ÞÜÐèÕÝ âÕÛÕäÞÝ"
 
-msgid "Import Addressbook"
-msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "´ÞÜÐèÝÐ ÐÔàÕáÐ"
 
-msgid "Import"
-msgstr "¸ÜßÞàâØàÐø"
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
 
-msgid "Import/Export Addressbooks"
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr ""
+
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
+
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "¸ÜßÞàâ/µÚáßÞàâ ÝÐ ÐÔàÕáÐà"
 
-msgid "Import/Export"
-msgstr "¸ÜßÞàâ/µÚáßÞàâ"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "¸ÜÕâÞ ÝÕ Õ ÒÐÛØÔÝÞ."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "°ÔàÕáÐàÞâ Õ ÝÕÒÐÛØÔÕÝ"
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "°ÔàÕáÐâÐ ÝÕ Õ ÒÐÛØÔÝÐ"
 
-msgid "Invalid name."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
+msgstr "¸ÜÕâÞ ÝÕ Õ ÒÐÛØÔÝÞ."
+
+#: lib/Driver/ldap.php:266
+msgid "Invalid key specified."
+msgstr ""
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "¸ÜÕâÞ ÝÕ Õ ÒÐÛØÔÝÞ."
+
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
 msgstr "¸ÜÕâÞ ÝÕ Õ ÒÐÛØÔÝÞ."
 
-msgid "Language"
-msgstr "¨Ð×ØÚ"
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
 
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "¸ÜÕ"
+
+#: templates/browse/column_headers.inc:16
+msgid "List"
+msgstr ""
+
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "ÁÕ ßÞÚÛÞßãÒÐ"
 
-msgid "Message"
-msgstr "¿ÞàÐÚÐ"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr ""
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "¿àÕÑÐàãÒÐø"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "´ÞÜÐèÕÝ âÕÛÕäÞÝ"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+msgid "Move left"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+msgid "Move right"
+msgstr ""
+
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
 
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "¸ÜÕ"
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
-msgstr "½ØÕÔÕÝ ÞÔ ÐÔàÕáÐàØâÕ ÝÕ Õ ßÞÔÕáÕÝ ×Ð ÒÞÒÕÔãÒÐúÕ ÝÞÒØ áâÐÒÚØ. °ÚÞ ÜØáÛØâÕ ÔÕÚÐ áÕ àÐÑÞâØ ×Ð ÓàÕèÚÐ, ÒÕ ÜÞÛØÜÕ ÚÞÝâÐÚâØàÐøâÕ áÞ ÒÐèØÞâ ÐÔÜØÝØáâàÐâÞà."
+#: config/prefs.php.dist:31
+msgid "Name Format"
+msgstr ""
+
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "´ÞÔÐÔØ ÝÞÒ ÚÞÝâÐÚâ"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "¸ÜÕ"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
+
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "²Þ ÐÔàÕáÐàÞâ ÝÕ ÜÞÖÕ ÔÐ áÕ ×ÐßØèãÒÐ "
+
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
 
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "·ÐÑÕÛÕèÚØ"
+
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "·ÐÑÕÛÕèÚØ"
 
-msgid "Please choose an address book to add a contact to."
-msgstr "²Õ ÜÞÛØÜÕ ÞÔÑÕàÕâÕ ÐÔàÕáÐà ÒÞ ÚÞø üÕ ÓØ áÜÕáâØâÕ ÚÞÝâÐÚâÝØâÕ ßÞÔÐâÞæØ."
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
 
-msgid "Problem?"
-msgstr "¿àÞÑÛÕÜ?"
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
 
-msgid "Reset"
-msgstr "¾ÔÝÞÒÞ"
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
 
-msgid "Save Changes"
-msgstr "·ÐçãÒÐø ÓØ ßàÞÜÕÝØâÕ"
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+msgid "Other Options"
+msgstr ""
+
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
+
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
+
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
+
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
+
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "¿àÕÑÐàãÒÐø"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
+
+#: templates/prefs/columnselect.inc:239
+msgid "Remove column"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "·ÐçãÒÐø"
 
-msgid "Search Results"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "¿àÕÑÐàãÒÐø"
+
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "ÀÕ×ãÛâÐâØ ÞÔ ßàÕÑÐàãÒÐúÕâÞ"
 
-msgid "Search"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "¿àÕÑÐàãÒÐø"
+
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
 msgstr "¿àÕÑÐàãÒÐø"
 
-msgid "Search&nbsp;Results"
-msgstr "ÀÕ×ãÛâÐâØ&nbsp;ÞÔ&nbsp;ßàÕÑÐàãÒÐúÕâÞ"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "²Õ ÜÞÛØÜÕ ÞÔÑÕàÕâÕ ÐÔàÕáÐà ÒÞ ÚÞø üÕ ÓØ áÜÕáâØâÕ ÚÞÝâÐÚâÝØâÕ ßÞÔÐâÞæØ."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "²Õ ÜÞÛØÜÕ ÞÔÑÕàÕâÕ ÐÔàÕáÐà ÒÞ ÚÞø üÕ ÓØ áÜÕáâØâÕ ÚÞÝâÐÚâÝØâÕ ßÞÔÐâÞæØ."
+
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "¾ÔÑÕàØ ÞÔ ÚÐÔÕ üÕ ÕÚáßÞàâØàÐè:"
 
-msgid "Select the destination to import to:"
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "¾ÑÕàØ ÔÕáâØÝÐæØøÐ ×Ð ØÜßÞàâØàÐúÕ:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "¾ÔÑÕàØ ÞÔ ÚÐÔÕ üÕ ÕÚáßÞàâØàÐè:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "¾ÔÑÕàØ ÞÔ ÚÐÔÕ üÕ ÕÚáßÞàâØàÐè:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "¾ÑÕàØ ÓÞ ÔÞÚãÜÕÝâÞâ ÒÞ ÚÞø üÕ ØÜßÞàâØàÐè:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "¾ÔÑÕàØ ÓÞ äÞàÜÐâÞâ ×Ð ÕÚáßÞàâ:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "¾ÔÑÕàØ ÓÞ äÞàÜÐâÞâ ×Ð ØÜßÞàâ:"
 
-msgid "Select the source to export from:"
-msgstr "¾ÔÑÕàØ ÞÔ ÚÐÔÕ üÕ ÕÚáßÞàâØàÐè:"
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
+
+#: config/prefs.php.dist:18
+msgid "Select which fields to display in the address lists."
+msgstr ""
+
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "¾ÔÑÕàØ ÓÞ äÞàÜÐâÞâ ×Ð ØÜßÞàâ:"
 
-msgid "Select your preferred language:"
-msgstr "¾ÔÑÕàØ ÓÞ áÒÞøÞâ ÜÐâØçÕÝ øÐ×ØÚ:"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "°ÔàÕáÐàÞâ Õ ÝÕÒÐÛØÔÕÝ"
 
-msgid "Send Message"
-msgstr "¸áßàÐâØ ßÞàÐÚÐ"
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "´ØàÕÚâÞàØãÜ"
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "¸áßàÐâØ ßÞàÐÚÐ ÔÞ %s"
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
 
-msgid "Set the your preferred display language."
-msgstr "¾ÔÑÕàØ ÓÞ áÒÞøÞâ ÜÐâØçÕÝ øÐ×ØÚ."
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "´ÕÛ ÞÔ ÚÞÝäØÓãàÐæØøÐâÐ ÝÐ áØáâÕÜÞâ ×Ð ÚÞÝâÐÚâ ÝÕÔÞáâÐáãÒÐ:"
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr ""
 
-msgid "Success"
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr ""
+
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "´ØàÕÚâÞàØãÜ"
+
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
 msgstr "ÃáßÕèÝÞ"
 
-msgid "The data got lost"
-msgstr "¿ÞÔÐâÞæØâÕ áÕ ×ÐÓãÑÕÝØ"
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
+
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
+
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
 
-msgid "The data got lost."
-msgstr "¿ÞÔÐâÞæØâÕ áÕ ×ÐÓãÑÕÝØ."
+#: data.php:50
+msgid "TSV"
+msgstr ""
 
-msgid "The file contained no data."
-msgstr "´ÞÚãÜÕÝâÞâ ÝÕ áÞÔàÖØ ßÞÔÐâÞæØ."
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
 
-msgid "There are no writeable address books."
-msgstr "½ÕÜÐ ÐÔàÕáÐà ÒÞ ÚÞø Õ ÔÞ×ÒÞÛÕÝÞ ×ÐßØèãÒÐúÕ."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ áÝØÜÐúÕâÞ ÝÐ ÔÞÚãÜÕÝâÞâ. ¼ÞÖÕÑØ ÔÞÚãÜÕÝâÞâ Õ ßÞÓÞÛÕÜ ÞÔ ÜÐÚáØÜÐÛÝÞ ÔÞ×ÒÞÛÕÝÐâÐ ÓÞÛÕÜØÝÐ."
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
 
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s ÔÞÚãÜÕÝâÞâ Õ ãáßÕèÝÞ ØÜßÞàâØàÐÝ"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
+#, fuzzy
+msgid "There are no browseable address books."
+msgstr "½ÕÜÐ ÐÔàÕáÐà ÒÞ ÚÞø Õ ÔÞ×ÒÞÛÕÝÞ ×ÐßØèãÒÐúÕ."
+
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÔÞÔÐÒÐúÕ ÝÐ ÞÑøÕÚâÞâ. ºÞÝâÐÚâØàÐøâÕ áÞ ÒÐèØÞâ ÐÔÜØÝØáâàÐâÞà ×Ð ßÞÝÐâÐÜÞèÝØ ØÝáâàãÚæØØ."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
+msgstr ""
+"½ØÕÔÕÝ ÞÔ ÐÔàÕáÐàØâÕ ÝÕ Õ ßÞÔÕáÕÝ ×Ð ÒÞÒÕÔãÒÐúÕ ÝÞÒØ áâÐÒÚØ. °ÚÞ ÜØáÛØâÕ "
+"ÔÕÚÐ áÕ àÐÑÞâØ ×Ð ÓàÕèÚÐ, ÒÕ ÜÞÛØÜÕ ÚÞÝâÐÚâØàÐøâÕ áÞ ÒÐèØÞâ ÐÔÜØÝØáâàÐâÞà."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error deleting this object. Contact your system administrator "
+"There was an error adding the new contact. Contact your system administrator "
 "for further help."
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÑàØèÕúÕ ÝÐ ÞÑøÕÚâÞâ. ºÞÝâÐÚâØàÐøâÕ áÞ ÒÐèØÞâ ÐÔÜØÝØáâàÐâÞà ×Ð ßÞÝÐâÐÜÞèÝØ ØÝáâàãÚæØØ."
+msgstr ""
+"½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÔÞÔÐÒÐúÕ ÝÐ ÞÑøÕÚâÞâ. ºÞÝâÐÚâØàÐøâÕ áÞ ÒÐèØÞâ "
+"ÐÔÜØÝØáâàÐâÞà ×Ð ßÞÝÐâÐÜÞèÝØ ØÝáâàãÚæØØ."
 
-msgid "There was an error importing the data."
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
 msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
 
-msgid "There was an error importing the uploaded file"
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
+
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
 msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ÒÞ ØÜßÞàâØàÐúÕâÞ ÝÐ áØÜÝÐâØÞÝ ÔÞÚãÜÕÝâ."
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
-msgstr "¾ÒÞø ÔÞÚãÜÕÝâ ßàÕâáâÐÒãÒÐ ÚÞÝäØÓãàÐæØøÐ ×Ð áØáâÕÜÞâ ÝÐ ÐÔàÕáÐàØ, Ð ØáâÞ âÐÚÐ ÓØ áÞÔàÖØ ÚÞàØáÝØçÚØâÕ ßÞÔÕáãÒÐúÐ."
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ÒÞ ØÜßÞàâØàÐúÕâÞ ÝÐ áØÜÝÐâØÞÝ ÔÞÚãÜÕÝâ."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr "¾ÒÞø ÔÞÚãÜÕÝâ áÞÔàÖØ ßÞÔÕáãÒÐúÐ ÚÞØ ÓØ ×ÐÜÕÝãÒÐÐâ ØÛØ ÔÞßÞÛÝãÒÐÐâ ßÞçÕâÝØâÕ ßÞÔÕáãÒÐúÐ ×Ð Horde."
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
-msgstr "¾ÒÞø ÔÞÚãÜÕÝâÞ ÓØ áÞÔàÖØ ÓÛÞÑÐÛÝØâÕ ØÜØúÐ Ø âØßÞÒØ ÝÐ ßÐàÐÜÕâàØâÐ ÝÐ áØáâÕÜÞâ ×Ð ÐÔàÕáÐàØ."
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "¾ÒÞø ÔÞÚãÜÕÝâ ßàÕâáâÐÒãÒÐ ÛØáâÐ ÞÔ Ø×ÒÞàÝØâÕ ßÞÔÐâÞæØ ×Ð áØáâÕÜÞâ ×Ð ÐÔàÕáÐàØ."
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
-msgstr "¾ÒÞø ÔÞÚãÜÕÝâ Õ ÓÛÐÒÝØÞâ ÚÞÝäØÓãàÐæØÞÝÕÝ ÔÞÚãÜÕÝâ ÝÐ áØáâÕÜÞâ ×Ð ÐÔàÕáÐàØ. ³Ø áÞÔàÖØ ßÐâÕÚØâÕ ÔÞ áÚàØßâØâÕ ×Ð áØáâÕÜÞâ."
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
+
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ÒÞ ØÜßÞàâØàÐúÕâÞ ÝÐ áØÜÝÐâØÞÝ ÔÞÚãÜÕÝâ."
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ÒÞ ØÜßÞàâØàÐúÕâÞ ÝÐ áØÜÝÐâØÞÝ ÔÞÚãÜÕÝâ."
 
-msgid "This person is already in your addressbook."
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ØÜßÞàâØàÐúÕâÞ ÝÐ ßÞÔÐâÞæØâÕ."
+
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "½ÕÜÐ ÐÔàÕáÐà ÒÞ ÚÞø Õ ÔÞ×ÒÞÛÕÝÞ ×ÐßØèãÒÐúÕ."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
+
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
 msgstr "»ØçÝÞáâÐ Õ ÒÕüÕ ÒÝÕáÕÝÐ ÒÞ ÒÐèØÞâ ÐÔàÕáÐà."
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "½ÐáÛÞÒ"
 
-msgid "To"
-msgstr "´Þ"
-
-msgid "Turba is not properly configured"
-msgstr "ÁØáâÕÜÞâ ×Ð ÐÔàÕáÐàØ ÝÕ Õ âÞçÝÞ ÚÞÝäØÓãàØàÐÝ."
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "½Õ ÜÞÖÐÜ ÔÐ ÓØ ßàÞçØâÐÜ ØÝäÞàÜÐæØØâÕ ×Ð %s."
 
-msgid "Warning"
-msgstr "²ÝØÜÐÝØÕ"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "·ÐçãÒÐø ÓØ ßàÞÜÕÝØâÕ"
+
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "´ØàÕÚâÞàØãÜ"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
 
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "´ÞÔÐÔØ ÝÞÒ ÚÞÝâÐÚâ"
+
+#: config/prefs.php.dist:124
+msgid "View to display by default:"
+msgstr ""
+
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
+
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "°ÔàÕáÐ ÝÐ àÐÑÞâÐ"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "ÂÕÛÕäÞÝ ÝÐ àÐÑÞâÐ"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "ÂÕÛÕäÞÝ ÝÐ àÐÑÞâÐ"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
-msgstr "½ÕÜÐ áÞÒßÐóÐúÕ ßÞÜÕóã ßÞÔÐâÞæØâÕ ÞÔ ØÜßÞàâØàÐÝØÞâ ÔÞÚãÜÕÝâ áÞ áÞÞÔÒÕâÝØâÕ ßÞÔÐâÞæØ ÒÞ áØáâÕÜÞâ ×Ð ÐÔàÕáÐàØ."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "ÂÕÛÕäÞÝ ÝÐ àÐÑÞâÐ"
 
-msgid "Your Information"
-msgstr "²ÐèØ ØÝäÞàÜÐæØØ"
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "ÂÕÛÕäÞÝ ÝÐ àÐÑÞâÐ"
 
-msgid "[Edit]"
-msgstr "ÃàÕÔØ"
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "°ÔàÕáÐ ÝÐ àÐÑÞâÐ"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
+
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
+
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
+
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
+
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
+
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
+
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+msgid "_Browse"
+msgstr ""
+
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "¸×ÑàØèØ"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "¸ÜßÞàâ/µÚáßÞàâ"
+
+#: templates/browse/actions.inc:39
+msgid "_Lists"
+msgstr ""
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "¸ÜßÞàâØàÐø ÐÔàÕáÐà"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "´ÞÔÐÔØ ÝÞÒ ÚÞÝâÐÚâ"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "¿àÕÑÐàãÒÐø"
 
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "µÚáßÞàâØàÐø ÐÔàÕáÐà"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/po/pl_PL.po
+++ mod/po/pl_PL.po
@@ -9,14 +9,24 @@
 msgstr ""
 "Project-Id-Version: Turba h3-2.0.3\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-08-21 14:18+0200\n"
-"PO-Revision-Date: 2005-08-21 14:38+0200\n"
+"POT-Creation-Date: 2005-11-24 20:47+0100\n"
+"PO-Revision-Date: 2005-11-24 20:49+0100\n"
 "Last-Translator: Krzysztof Kozlowski <kozik1 at o2.pl>\n"
 "Language-Team: Polish <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: browse.php:120
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "\"%s\" nie zosta³ skopiowany, poniewa¿ jest list±."
+
+#: browse.php:118
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "\"%s\" nie zosta³ przeniesiony, poniewa¿ jest list±."
+
 #: config/prefs.php.dist:111
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Imiê Nazwisko\" (np. Jan Kowalski)"
@@ -40,16 +50,6 @@
 msgid "%s to %s of %s"
 msgstr "%s do %s z %s"
 
-#: browse.php:120
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s' nie zosta³ skopiowany, poniewa¿ jest list±."
-
-#: browse.php:118
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s' nie zosta³ przeniesiony, poniewa¿ jest list±."
-
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
 msgstr "Wymagana jest obs³uga iFrames(p³ywaj±cych ramek) przez przegl±darkê"
@@ -103,7 +103,7 @@
 msgid "All"
 msgstr "Wszystko"
 
-#: lib/api.php:393
+#: lib/api.php:395
 msgid "Already Exists"
 msgstr "Ju¿ istnieje"
 
@@ -212,9 +212,9 @@
 msgid "Company Address"
 msgstr "Adres firmy"
 
-#: lib/api.php:247 lib/api.php:268 lib/api.php:382 lib/api.php:452
-#: lib/api.php:542 lib/api.php:588 lib/api.php:636 lib/api.php:823
-#: lib/api.php:916
+#: lib/api.php:247 lib/api.php:268 lib/api.php:384 lib/api.php:454
+#: lib/api.php:544 lib/api.php:590 lib/api.php:638 lib/api.php:825
+#: lib/api.php:918
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Po³±czenie nie powiod³o siê: %s"
@@ -260,7 +260,7 @@
 msgid "Default sorting direction:"
 msgstr "Domy¶lny sposób sortowania:"
 
-#: templates/browse/actions.inc:3 lib/Renderer.php:48
+#: lib/Renderer.php:48 templates/browse/actions.inc:3
 msgid "Delete"
 msgstr "Usuñ"
 
@@ -306,15 +306,15 @@
 msgid "Download vCard"
 msgstr "¦ci±gnij vCard"
 
-#: templates/browse/column_headers.inc:6 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: lib/Renderer.php:46 templates/browse/column_headers.inc:6
+#: templates/browse/contactrow.inc:33
 msgid "Edit"
 msgstr "Edytuj"
 
 #: templates/browse/contactrow.inc:33
 #, php-format
-msgid "Edit '%s'"
-msgstr "Edytuj '%s'"
+msgid "Edit \"%s\""
+msgstr "Edytuj \"%s\""
 
 #: edit.php:53 edit.php:80
 #, php-format
@@ -346,8 +346,8 @@
 msgid "Export the following address book completely."
 msgstr "Eksport nastêpuj±cej ksi±¿ki adresowej zakoñczony."
 
-#: data.php:110 data.php:228 browse.php:37 browse.php:94 browse.php:109
-#: add.php:63 search.php:52
+#: add.php:63 data.php:110 data.php:228 search.php:52 browse.php:37
+#: browse.php:94 browse.php:109
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Nieudany dostêp do ksi±¿ki adresowej: %s"
@@ -401,7 +401,7 @@
 msgid "From"
 msgstr "Od"
 
-#: config/sources.php.dist:556
+#: config/sources.php.dist:562
 msgid "Global Address Book"
 msgstr "Ogólna ksi±¿ka adresowa"
 
@@ -437,7 +437,7 @@
 msgid "Home Street Address"
 msgstr "Adres domowy"
 
-#: config/sources.php.dist:482
+#: config/sources.php.dist:487
 msgid "IMSP"
 msgstr "IMSP"
 
@@ -450,24 +450,24 @@
 msgid "Import/Export Address Books"
 msgstr "Import/Eksport ksi±¿ki adresowej"
 
-#: lib/api.php:376 lib/api.php:602
+#: lib/api.php:378 lib/api.php:604
 msgid "Invalid Content-Type"
 msgstr "Niepoprawny Content-Type"
 
-#: lib/api.php:439 lib/api.php:529
+#: lib/api.php:441 lib/api.php:531
 msgid "Invalid ID"
 msgstr "Niepoprawny ID"
 
-#: lib/api.php:191 lib/api.php:334 lib/api.php:435 lib/api.php:525
-#: lib/api.php:578 lib/api.php:893
+#: lib/api.php:191 lib/api.php:334 lib/api.php:437 lib/api.php:527
+#: lib/api.php:580 lib/api.php:895
 msgid "Invalid address book"
 msgstr "Niepoprawna ksi±¿ka adresowa"
 
-#: lib/api.php:897 lib/api.php:971 lib/api.php:1024
+#: lib/api.php:899 lib/api.php:973 lib/api.php:1026
 msgid "Invalid email"
 msgstr "Niepoprawny email"
 
-#: lib/api.php:905
+#: lib/api.php:907
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
@@ -475,11 +475,11 @@
 msgid "Invalid key specified."
 msgstr "Niepoprawna definicja klucza."
 
-#: lib/api.php:901
+#: lib/api.php:903
 msgid "Invalid name"
 msgstr "Niepoprawna nazwa"
 
-#: lib/api.php:582
+#: lib/api.php:584
 msgid "Invalid objectId"
 msgstr "Niepoprawny objectId"
 
@@ -527,7 +527,7 @@
 msgid "Modify failed: (%s) %s"
 msgstr "Modyfikacja niepowiad³a siê: (%s) %s"
 
-#: lib/api.php:1010
+#: lib/api.php:1012
 msgid "More than 1 entry found"
 msgstr "Wiêcej ni¿ 1 wpis znaleziony"
 
@@ -547,14 +547,14 @@
 msgid "Mulberry Address Book"
 msgstr "Ksi±zka adresowa Mulberry"
 
-#: lib/api.php:930
+#: lib/api.php:932
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr "Istnieje wiele osób z adresem [%s], ale ¿adna z nazw± [%s]"
 
 #: config/sources.php.dist:87 config/sources.php.dist:221
-msgid "My Addressbook"
+msgid "My Address Book"
 msgstr "Moja ksi±¿ka adresowa"
 
 #: config/attributes.php.dist:42
@@ -569,7 +569,7 @@
 msgid "Netcenter Member Directory"
 msgstr "Katalog Netcenter Member"
 
-#: add.php:36 add.php:103 lib/Block/minisearch.php:27
+#: add.php:36 add.php:102 lib/Block/minisearch.php:27
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
@@ -585,12 +585,12 @@
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: lib/api.php:1012 lib/api.php:1061
+#: lib/api.php:1014 lib/api.php:1063
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Nie znaleziony wpis %s dla %s"
 
-#: lib/api.php:980
+#: lib/api.php:982
 msgid "No address books found."
 msgstr "Nie znaleziono ksi±¿ki adresowej."
 
@@ -614,7 +614,7 @@
 msgid "Number of items per page"
 msgstr "Ilo¶æ wpisów na stronê"
 
-#: lib/api.php:458
+#: lib/api.php:460
 msgid "Object not found"
 msgstr "Objekt nieznaleziony"
 
@@ -630,8 +630,8 @@
 msgid "PGP Public Key"
 msgstr "Klucz publiczny PGP"
 
-#: lib/api.php:340 lib/api.php:445 lib/api.php:535 lib/api.php:594
-#: lib/api.php:751 lib/api.php:911
+#: lib/api.php:340 lib/api.php:447 lib/api.php:537 lib/api.php:596
+#: lib/api.php:753 lib/api.php:913
 msgid "Permission Denied"
 msgstr "Brak dostêpu"
 
@@ -706,7 +706,7 @@
 msgid "STARTTLS failed: (%s) %s"
 msgstr "Operacja STARTTLS nie powiod³a siê: (%s) %s"
 
-#: edit.php:57 add.php:37
+#: add.php:37 edit.php:57
 msgid "Save"
 msgstr "Zapisz"
 
@@ -715,15 +715,15 @@
 msgid "Search"
 msgstr "Szukaj"
 
-#: browse.php:241 minisearch.php:66
+#: minisearch.php:66 browse.php:241
 msgid "Search Results"
 msgstr "Wyniki wyszukiwania"
 
-#: lib/api.php:827
+#: lib/api.php:829
 msgid "Search failed"
 msgstr "Wyszukiwanie nie powiod³o siê"
 
-#: lib/api.php:920 lib/api.php:926 lib/api.php:935 lib/api.php:948
+#: lib/api.php:922 lib/api.php:928 lib/api.php:937 lib/api.php:950
 #, php-format
 msgid "Search failed: %s"
 msgstr "Wyszukiwanie nie powiod³o sie: %s"
@@ -786,8 +786,8 @@
 
 #: add.php:50
 #, php-format
-msgid "Selected address book '%s'."
-msgstr "Wybrana ksi±¿ka adresowa '%s'."
+msgid "Selected address book \"%s\"."
+msgstr "Wybrana ksi±¿ka adresowa \"%s\"."
 
 #: config/sources.php.dist:154
 msgid "Shared Directory"
@@ -852,7 +852,7 @@
 msgid "The address book could not be purged: %s"
 msgstr "Ksi±¿ka adresowa nie mog³a byæ wyczyszczona: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: vcard.php:22 edit.php:24 display.php:23
 msgid "The contact you requested does not exist."
 msgstr "Kontakt, którego szukasz nie istnieje."
 
@@ -930,7 +930,7 @@
 msgid "This file format is not supported."
 msgstr "Ten format pliku jest nieobs³ugiwany."
 
-#: lib/api.php:939 lib/api.php:952
+#: lib/api.php:941 lib/api.php:954
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Ta osoba ju¿ ma wpis %s w ksi±¿ce adresowej"
@@ -939,7 +939,7 @@
 msgid "Title"
 msgstr "Tytu³"
 
-#: lib/Driver.php:834
+#: lib/Driver.php:835
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Nie mogê wczytaæ definicji %s."
@@ -948,7 +948,7 @@
 msgid "Undo Changes"
 msgstr "Cofnij zmiany"
 
-#: lib/api.php:487
+#: lib/api.php:489
 msgid "Unsupported Content-Type."
 msgstr "Nieobs³ugiwany Content-Type."
 
@@ -958,8 +958,8 @@
 
 #: templates/browse/contactrow.inc:27
 #, php-format
-msgid "View '%s'"
-msgstr "Widok '%s'"
+msgid "View \"%s\""
+msgstr "Widok \"%s\""
 
 #: minisearch.php:82
 msgid "View Contact"


--- orig/index.php
+++ mod/index.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: turba/index.php,v 1.29.10.4 2005/07/18 10:21:07 jan Exp $
+ * $Horde: turba/index.php,v 1.29.10.7 2006/01/01 21:29:15 jan Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you did
  * not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -12,16 +12,17 @@
 $turba_configured = (@is_readable(TURBA_BASE . '/config/conf.php') &&
                      @is_readable(TURBA_BASE . '/config/attributes.php') &&
                      @is_readable(TURBA_BASE . '/config/prefs.php') &&
+                     @is_readable(TURBA_BASE . '/config/mime_drivers.php') &&
                      @is_readable(TURBA_BASE . '/config/sources.php'));
 
 if (!$turba_configured) {
     require TURBA_BASE . '/../lib/Test.php';
     Horde_Test::configFilesMissing('Turba', TURBA_BASE,
-        array('conf.php', 'prefs.php', 'sources.php'),
+        array('conf.php', 'prefs.php', 'mime_drivers.php', 'sources.php'),
         array('attributes.php' => 'This file defines the Turba global attribute names and types - names, email addresses, etc.'));
 }
 
 require_once TURBA_BASE . '/lib/base.php';
-require TURBA_BASE . '/' . ($source_count
-                            ? $prefs->getValue('initial_page')
+require TURBA_BASE . '/' . ($browse_source_count
+                            ? basename($prefs->getValue('initial_page'))
                             : 'search.php');


--- orig/lib/Driver/prefs.php
+++ mod/lib/Driver/prefs.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Turba directory driver implementation for Horde Preferences - very
- * simple, lightweight container.
+ * Turba directory driver implementation for Horde Preferences - very simple,
+ * lightweight container.
  *
- * $Horde: turba/lib/Driver/prefs.php,v 1.10.10.1 2005/01/15 20:27:02 chuck Exp $
+ * $Horde: turba/lib/Driver/prefs.php,v 1.10.10.5 2005/11/10 12:44:30 mdjukic Exp $
  *
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @since   Turba 1.2
@@ -20,13 +20,13 @@
     }
 
     /**
-     * Return all entries - searching isn't implemented here for
-     * now. The parameters are simply ignored.
+     * Returns all entries - searching isn't implemented here for now. The
+     * parameters are simply ignored.
      *
-     * @param $criteria      Array containing the search criteria.
-     * @param $fields        List of fields to return.
+     * @param array $criteria  Array containing the search criteria.
+     * @param array $fields    List of fields to return.
      *
-     * @return               Hash containing the search results.
+     * @return array  Hash containing the search results.
      */
     function _search($criteria, $fields)
     {
@@ -34,14 +34,14 @@
     }
 
     /**
-     * Read the given data from the SQL database and returns
-     * the result's fields.
+     * Reads the given data from the preferences and returns the result's
+     * fields.
      *
-     * @param $criteria      Search criteria.
-     * @param $ids            Data identifiers.
-     * @param $fields        List of fields to return.
+     * @param array $criteria  Search criteria.
+     * @param string $id       Data identifier.
+     * @param array $fields    List of fields to return.
      *
-     * @return               Hash containing the search results.
+     * @return  Hash containing the search results.
      */
     function _read($criteria, $ids, $fields)
     {
@@ -60,7 +60,7 @@
     }
 
     /**
-     * Adds the specified object to the SQL database.
+     * Adds the specified object to the preferences.
      */
     function _add($attributes)
     {
@@ -72,7 +72,7 @@
     }
 
     /**
-     * Deletes the specified object from the SQL database.
+     * Deletes the specified object from the preferences.
      */
     function _delete($object_key, $object_id)
     {
@@ -84,7 +84,7 @@
     }
 
     /**
-     * Saves the specified object in the SQL database.
+     * Saves the specified object in the preferences.
      */
     function _save($object_key, $object_id, $attributes)
     {
@@ -93,19 +93,6 @@
         $this->_setAddressBook($book);
     }
 
-    /**
-     * Create an object key for a new object.
-     *
-     * @param array $attributes  The attributes (in driver keys) of the
-     *                           object being added.
-     *
-     * @return string  A unique ID for the new object.
-     */
-    function _makeKey($attributes)
-    {
-        return md5(mt_rand());
-    }
-
     function _getAddressBook()
     {
         global $prefs;


--- orig/po/ru_RU.po
+++ mod/po/ru_RU.po
@@ -3,38 +3,74 @@
 # Ignat Ikryanov <iignat at newmail.ru>, 2001
 # Anton Nekhoroshih <anton at valuehost.ru>, 2001
 # Fedor A. Fetisov <faf at ssc.ru>, 2002
+# Alexey Zakharov <baber at mosga.net>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba v1.1\n"
+"Project-Id-Version: Turba H3 v2.0.4\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-14 19:51+0200\n"
-"PO-Revision-Date: 2002-11-10 18:09+0300\n"
-"Last-Translator: Fedor A. Fetisov <faf at ssc.ru>\n"
-"Language-Team: Fedor A. Fetisov <faf at ssc.ru>\n"
+"POT-Creation-Date: 2006-01-15 15:42+0200\n"
+"PO-Revision-Date: 2006-01-17 19:40+0200\n"
+"Last-Translator: Alexey Zakharov <baber at mosga.net>\n"
+"Language-Team: Russian <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/config/prefs.php:111
+#: templates/prefs/imsp_opt.inc:40
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Àäðåñíàÿ êíèãà"
+
+#: templates/prefs/imsp_opt.inc:29
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "Ýêñïîðò àäðåñíîé êíèãè"
+
+#: data.php:325
+#, fuzzy, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr "%s óæå ñóùåòâóåò. Âàøà %s ïàïêà íå áûëà ïåðåèìåíîâàíà."
+
+#: browse.php:140
+#, fuzzy, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïàïêà \"%s\" áûëà óñïåøíî ïåðåèìåíîâàíà â \"%s\".\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]"
+
+#: browse.php:138
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
-msgstr "\"Èìÿ Ôàìèëèÿ\" (Èâàí Ïåòðîâ)"
+msgstr "\"Èìÿ Ôàìèëèÿ\" (Âàñÿ Ïóïêèí)"
 
-#: lib/config/prefs.php:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
-msgstr "\"Ôàìèëèÿ, Èìÿ\" (Ïåòðîâ, Èâàí)"
+msgstr "\"Ôàìèëèÿ, Èìÿ\" (Ïóïêèí, Âàñÿ)"
 
-#: add.php:96
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr ""
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "Ôàéë %s óñïåøíî èìïîðòèðîâàí"
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, fuzzy, php-format
 msgid "%s to %s of %s"
 msgstr ""
@@ -42,732 +78,950 @@
 "[ñòðîêà %s èç %s]\n"
 "#-#-#-#-#  ru_RU.po (Turba v1.1)  #-#-#-#-#\n"
 
-#: browse.php:146
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr ""
-
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr ""
+# fuzzy, php-format
+#: lib/Turba.php:464
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Àäðåñíàÿ êíèãà"
 
-#: lib/Block/minisearch.php:45
+#: lib/Block/minisearch.php:42
+#, fuzzy
 msgid "A browser that supports iFrames is required"
-msgstr ""
+msgstr "Âàø áðîóçåð íå ïîääåðæèâàåò îïöèþ ïå÷àòè. Äëÿ ïå÷àòè íàæìèòå CTRL+P."
 
-#: lib/config/prefs.php:132
+#: config/prefs.php.dist:160
 msgid "Above search form"
 msgstr "Íàä ôîðìîé ïîèñêà"
 
-# fuzzy
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Ðàñøèðåííûé Ïîèñê"
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr "Äîñòóï çàïðåùåí äëÿ %s"
 
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:29
 msgid "Add"
 msgstr "Äîáàâèòü"
 
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Àäðåñíàÿ êíèãà"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Àäðåñíàÿ êíèãà"
+
 #: templates/prefs/columnselect.inc:237
 #, fuzzy
 msgid "Add column"
 msgstr "äîáàâèòü ñòîëáåö"
 
 # fuzzy
-#: templates/browse/actions.inc:33
+#: edit.php:135
+msgid "Add file"
+msgstr "çàãðóçèòü"
+
+# fuzzy
+#: templates/browse/actions.inc:29
 msgid "Add to"
 msgstr "Äîáàâèòü"
 
-#: browse.php:30 lib/config/prefs.php:99
+#: lib/Driver/null.php:57
+#, fuzzy
+msgid "Adding contacts is not available."
+msgstr "Íåò äîñòóïíûõ íàñòðîåê."
+
+#: templates/addressbooks.inc:86
+msgid "Address Book"
+msgstr "Àäðåñíàÿ êíèãà"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Ñîäåðæàíèå àäðåñíîé êíèãè"
 
-#: add.php:95
+# fuzzy
+#: config/prefs.php.dist:10
+msgid "Address Books"
+msgstr "Àäðåñíûå êíèãè"
+
+#: add.php:108
 #, fuzzy
 msgid "Address book entry"
 msgstr "Àäðåñíàÿ êíèãà äîñòóïíà òîëüêî äëÿ ÷òåíèÿ."
 
-#: lib/Driver.php:496
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "Ôàéë %s óñïåøíî èìïîðòèðîâàí"
+
+#: templates/addressbooks.inc:62
 #, fuzzy
-msgid "Address book is read-only."
+msgid "Address book to delete "
 msgstr "Àäðåñíàÿ êíèãà äîñòóïíà òîëüêî äëÿ ÷òåíèÿ."
 
-#: data.php:236
+#: templates/prefs/addressbookselect.inc:170
 #, fuzzy
-msgid "Address book successfully purged."
-msgstr "Ôàéë %s óñïåøíî èìïîðòèðîâàí"
+msgid "Address books that will not be displayed:"
+msgstr "Ïîäïèñü íå ìîæåò áûòü çàìåíåíà."
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: search.php:88 templates/browse/search.inc:38
 msgid "Advanced Search"
 msgstr "Ðàñøèðåííûé Ïîèñê"
 
-#: lib/config/attributes.php:64
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Ïñåâäîíèì"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:48
 msgid "All"
 msgstr "Âñå"
 
-#: lib/api.php:372
+#: lib/api.php:554
 msgid "Already Exists"
 msgstr ""
 
-#: templates/browse/javascript.inc:79
-#, php-format
+# fuzzy, php-format
+#: templates/browse/javascript.inc:93
 msgid "Are you sure that you want to delete %s?"
-msgstr ""
+msgstr "Âû óâåðåíû, ÷òî õîòèòå ñäåëàòü ýòî?"
 
-#: templates/browse/javascript.inc:53
+# fuzzy
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
-msgstr ""
+msgstr "Âû óâåðåíû, ÷òî õîòèòå ñäåëàòü ýòî?"
 
-#: lib/config/prefs.php:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Ïî âîçðàñòàíèþ"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Äîñòóïíûå ñòîëáöû:"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr ""
-
-# php-format
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "Âåðíóòüñÿ â %s"
-
-# fuzzy
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Ïîèñê"
-
 # fuzzy
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:37
 msgid "Basic Search"
 msgstr "Ïîèñê"
 
-#: lib/config/prefs.php:131
+#: config/prefs.php.dist:159
 msgid "Below search form"
 msgstr "Ïîä ôîðìîé ïîèñêà"
 
-#: lib/Driver/ldap.php:82 lib/Driver/ldap.php:85
-#, php-format
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, fuzzy, php-format
 msgid "Bind failed: (%s) %s"
-msgstr ""
+msgstr "Îøèáêà ïðè óäàëåíèè"
 
-#: lib/config/attributes.php:178
+#: config/attributes.php.dist:178
 msgid "Birthday"
 msgstr "Äåíü ðîæäåíèÿ"
 
-#: lib/config/attributes.php:173
+# fuzzy
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "Âûáðàòü"
+
+#: config/attributes.php.dist:173
+#, fuzzy
 msgid "Business Category"
-msgstr ""
+msgstr "Íîâàÿ êàòåãîðèÿ"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
-msgstr ""
+msgstr "CSV-ôàéë"
 
-#: templates/browse/actions.inc:59
-#, fuzzy
-msgid "C_lear Search"
-msgstr "Î÷èñòèòü"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
-msgstr ""
+msgstr "Âûäåëèòü âñå"
 
-#: lib/config/prefs.php:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr "Âûáîð àäðåñíîé êíèãè è îïöèé äëÿ ïîèñêà"
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr ""
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Äåéñòâèå:"
 
-#: add.php:53
+#: add.php:48
 #, fuzzy
 msgid "Choose an address book"
 msgstr "Íåò àäðåñíûõ êíèã, äîñòóïíûõ äëÿ âûáîðà."
 
-#: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Âûáåðèòå ïîðÿäîê îòîáðàæåíèÿ ñòîëáöîâ â ñïèñêå àäðåñîâ."
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Íåò àäðåñíûõ êíèã, äîñòóïíûõ äëÿ âûáîðà."
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "Î÷èñòèòü"
+# fuzzy
+#: templates/prefs/addressbookselect.inc:165
+#, fuzzy
+msgid "Choose which address books to display, and in what order:"
+msgstr "Âûáåðèòå àäðåñíóþ êíèãó äëÿ äîáàâëåíèÿ â íåå àäðåñîâ."
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "Íåò àäðåñíûõ êíèã, äîñòóïíûõ äëÿ âûáîðà."
+
+# fuzzy
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr "Âûáåðèòå ñâîéñòâà, êîòîðûé áóäóò îòîáðàæåíû"
 
 # fuzzy
-#: lib/config/prefs.php:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Ñòîëáöû"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr "Íåîòîáðàæàåìûå ñâîéñòâà:"
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
-msgstr ""
+msgstr "CSV-ôàéë (ðàçäåëåííûé çàïÿòûìè)"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
-msgstr ""
+msgstr "CSV-ôàéë (ôîðìàò Microsoft Outlook)"
 
-#: lib/config/attributes.php:76
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Êîìïàíèÿ"
 
-#: lib/config/attributes.php:144
+#: config/attributes.php.dist:144
 #, fuzzy
 msgid "Company Address"
 msgstr "Äîìàøíèé àäðåñ"
 
-#: lib/api.php:611 lib/api.php:800
+#: lib/api.php:320 lib/api.php:365 lib/api.php:409 lib/api.php:493
+#: lib/api.php:619 lib/api.php:706 lib/api.php:759 lib/api.php:837
+#: lib/api.php:1024 lib/api.php:1112
 #, fuzzy, php-format
 msgid "Connection failed: %s"
 msgstr "Îøèáêà ïðè óäàëåíèè"
 
-#: lib/Driver/ldap.php:63
+#: lib/Driver/ldap.php:58
 #, fuzzy
 msgid "Connection failure"
 msgstr "Îøèáêà ïðè óäàëåíèè"
 
-#: browse.php:85
-msgid "Contact removed from list."
-msgstr ""
+# fuzzy
+#: lib/Block/minisearch.php:3 lib/Block/minisearch.php:26
+msgid "Contact Search"
+msgstr "Íàéòè êîíòàêò"
 
-#: browse.php:279
-#, php-format
+# fuzzy, php-format
+#: browse.php:299
 msgid "Contacts in list: %s"
-msgstr ""
-
-#: browse.php:301
-#, php-format
-msgid "Contents of %s"
-msgstr "Ñîäåðæàíèå %s"
+msgstr "Êîíòàêòû â ãðóïïå: %s"
 
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:18
 #, fuzzy
 msgid "Copy"
 msgstr "Êîìïàíèÿ"
 
-#: lib/ObjectView.php:134
-msgid "Created"
-msgstr ""
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr "Ñîçäàòü"
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Ñîäåðæàíèå àäðåñíîé êíèãè"
 
 # fuzzy
-#: lib/config/prefs.php:16
-msgid "Default Display"
-msgstr "Ïðîôèëü ïî óìîë÷àíèþ"
+# fuzzy
+#: lib/ListView.php:348
+msgid "Create a new Contact List in:"
+msgstr "Ñîçäàòü íîâóþ ãðóïïó â:"
 
-#: lib/config/prefs.php:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "Àäðåñíàÿ êíèãà ïî óìîë÷àíèþ"
+#: lib/ObjectView.php:133
+#, fuzzy
+msgid "Created"
+msgstr "Ñîçäàòü"
 
 # fuzzy
-#: lib/config/prefs.php:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Ïîðÿäîê ñîðòèðîâêè"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:3
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Óäàëèòü"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Ýêñïîðò àäðåñíîé êíèãè"
+
 # fuzzy
-#: lib/config/prefs.php:35
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Óäàëåíèå"
 
-#: lib/config/prefs.php:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Ïîäòâåðæäåíèå îïåðàöèè óäàëåíèÿ"
 
-#: lib/Driver/ldap.php:274
+#: lib/Driver/ldap.php:270
 #, fuzzy, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Îøèáêà ïðè óäàëåíèè"
 
-#: delete.php:32
+#: lib/Driver/null.php:62
+#, fuzzy
+msgid "Deleting contacts is not available."
+msgstr "Íåò äîñòóïíûõ íàñòðîåê."
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Îøèáêà ïðè óäàëåíèè"
 
-#: lib/config/attributes.php:213
+#: config/attributes.php.dist:213
 #, fuzzy
 msgid "Department"
 msgstr "Ïðèêðåïëÿåìîå"
 
-#: lib/config/prefs.php:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Ïî óáûâàíèþ"
 
-#: templates/browse/search.inc:132
+# fuzzy
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr "Îïèñàíèå"
+
+#: templates/browse/search.inc:119
 msgid "Directory"
 msgstr "Êàòàëîã"
 
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr "Îáîëî÷êà"
+
 # fuzzy
-#: lib/config/prefs.php:9 lib/config/prefs.php:15 lib/config/prefs.php:21
-#: lib/config/prefs.php:27
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Îñíîâíûå íàñòðîéêè"
 
 # fuzzy
-#: lib/config/prefs.php:149
+#: config/prefs.php.dist:177
 msgid "Do you want to confirm deleting entries?"
 msgstr "Çàïðàøèâàòü ïîäòâåðæäåíèå ïðè óäàëåíèè çàïèñåé?"
 
-#: templates/browse/contactrow.inc:25
+# fuzzy
+#: lib/Object.php:297
+msgid "Download"
+msgstr "Çàãðóçèòü"
+
+# fuzzy
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+#, fuzzy
 msgid "Download vCard"
-msgstr ""
+msgstr "Çàãðóçèòü"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:6
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Ðåäàêòèðîâàíèå"
 
-#: templates/browse/contactrow.inc:33
-#, php-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "Ðåäàêòèðîâàíèå '%s'"
 
-#: edit.php:53 edit.php:80
-#, php-format
+# fuzzy
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Àäðåñíûå êíèãè"
+
+# fuzzy, php-format
+#: edit.php:85 edit.php:161
+#, fuzzy, php-format
 msgid "Edit entry for %s"
-msgstr ""
+msgstr "Íàñòðîéêè"
 
-#: lib/config/attributes.php:58
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "E-mail"
 
-#: edit.php:79
+#: edit.php:154
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:156 edit.php:159
 #, php-format
 msgid "Entry for %s updated."
+msgstr "Çàïèñü %s îáíîâëåíà."
+
+#: browse.php:216 browse.php:264
+#, php-format
+msgid "Error adding %d contact(s) to list."
+msgstr ""
+
+#: browse.php:218 browse.php:266
+#, php-format
+msgid "Error adding %d of %d requested contact(s) to list."
+msgstr ""
+
+#: browse.php:86
+#, fuzzy, php-format
+msgid "Error deleting %d contact(s)."
+msgstr "Îøèáêà ïðè èìïîðòå äàííûõ."
+
+#: browse.php:88
+#, php-format
+msgid "Error deleting %d of %d requested contacts(s)."
+msgstr ""
+
+#: browse.php:66
+#, php-format
+msgid "Error removing %d contact(s) from list."
+msgstr ""
+
+#: browse.php:68
+#, php-format
+msgid "Error removing %d of %d requested contact(s) from list."
 msgstr ""
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: lib/api.php:415
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Îøèáêà ïðè äîñòóïå ê óêàçàííîé àäðåñíîé êíèãå."
+
+#: templates/browse/actions.inc:10 templates/data/export.inc:41
 msgid "Export"
 msgstr "Ýêñïîðò"
 
-#: templates/data/export.inc:7
-#, fuzzy
+# fuzzy
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Ýêñïîðò àäðåñíîé êíèãè"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
+#, fuzzy
 msgid "Export only the selected contacts."
-msgstr ""
+msgstr "Horde íå ïðàâèëüíî íàñòðîåí"
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr ""
 
-#: data.php:110 data.php:228 browse.php:62 browse.php:120 browse.php:135
-#: add.php:72 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:103
+#: browse.php:130 add.php:67 search.php:37
 #, fuzzy, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Îøèáêà ïðè äîñòóïå ê óêàçàííîé àäðåñíîé êíèãå."
 
-#: browse.php:154
+#: browse.php:158
 #, fuzzy, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Îøèáêà ïðè âûáîðå %s."
 
-#: browse.php:284
+#: browse.php:305
 #, fuzzy
 msgid "Failed to browse list"
 msgstr "Îøèáêà ïðè âûáîðå %s."
 
-#: browse.php:315
+#: browse.php:343
 #, fuzzy
 msgid "Failed to browse the directory"
 msgstr "Îøèáêà ïðè ïîèñêå â êàòàëîãå: %s"
 
-#: lib/Driver/ldap.php:312
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 
-#: browse.php:140
+#: browse.php:134
 #, fuzzy, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Îøèáêà ïðè ïîèñêå â êàòàëîãå: %s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Îøèáêà ïðè äîñòóïå ê óêàçàííîé àäðåñíîé êíèãå."
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Îøèáêà ïðè ïîèñêå â êàòàëîãå: %s"
 
-#: lib/config/attributes.php:167
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Ôàêñ"
 
-#: templates/browse/search.inc:72
+# fuzzy
+# fuzzy
+#: edit.php:131 display.php:100
+msgid "Files"
+msgstr "Ôàéëû"
+
+#: templates/browse/search.inc:71
 msgid "Find"
 msgstr "Íàéòè"
 
-#: lib/config/attributes.php:48
+#: edit.php:104 edit.php:194
+#, fuzzy
+msgid "Finish"
+msgstr "Íàéòè"
+
+#: config/attributes.php.dist:48
 #, fuzzy
 msgid "First Name"
 msgstr "Ïåðâàÿ ñòðàíèöà"
 
-#: lib/config/attributes.php:202
+#: config/attributes.php.dist:202
 msgid "Freebusy URL"
 msgstr ""
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:84
 msgid "From"
 msgstr "Îò"
 
-#: templates/browse/contactrow.inc:44
+#: config/sources.php.dist:606
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Àäðåñíàÿ êíèãà"
+
+# fuzzy
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+#, fuzzy
 msgid "Group"
-msgstr ""
+msgstr "Ãðóïïû"
 
-#: lib/config/attributes.php:82
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Äîìàøíèé àäðåñ"
 
 # fuzzy
-#: lib/config/attributes.php:93
+#: config/attributes.php.dist:93
 #, fuzzy
 msgid "Home City"
 msgstr "Ïîðòàë"
 
-#: lib/config/attributes.php:108
+#: config/attributes.php.dist:108
 #, fuzzy
 msgid "Home Country"
 msgstr "Äîìàøíèé òåëåôîí"
 
-#: lib/config/attributes.php:150
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Äîìàøíèé òåëåôîí"
 
-#: lib/config/attributes.php:103
+#: config/attributes.php.dist:103
 #, fuzzy
 msgid "Home Postal Code"
 msgstr "Äîìàøíèé òåëåôîí"
 
-#: lib/config/attributes.php:98
+#: config/attributes.php.dist:98
 #, fuzzy
 msgid "Home State/Province"
 msgstr "Äîìàøíèé òåëåôîí"
 
-#: lib/config/attributes.php:88
+#: config/attributes.php.dist:88
 #, fuzzy
 msgid "Home Street Address"
 msgstr "Ðàáî÷èé àäðåñ"
 
-#: templates/data/import.inc:9
-#, fuzzy, php-format
-msgid "Import Address Book, Step %d"
-msgstr "Èìïîðò àäðåñíîé êíèãè"
+#: config/sources.php.dist:508
+msgid "IMSP"
+msgstr ""
 
-#: data.php:274
+#: config/prefs.php.dist:47
 #, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Ñîäåðæàíèå àäðåñíîé êíèãè"
+
+# fuzzy, php-format
+#: templates/data/import.inc:7
+#, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Èìïîðò àäðåñíîé êíèãè, Øàã %d"
+
+# fuzzy
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Èìïîðò/Ýêñïîðò àäðåñíîé êíèãè"
 
-#: lib/api.php:358 lib/api.php:577
-#, fuzzy
-msgid "Invalid Content-Type"
-msgstr "Íåêîððåêòíîå èìÿ."
-
-#: lib/api.php:419 lib/api.php:508
-#, fuzzy
+# fuzzy
+#: lib/api.php:614 lib/api.php:701
 msgid "Invalid ID"
 msgstr "Íåêîððåêòíîå èìÿ."
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:871
-#, fuzzy
+# fuzzy
+#: lib/api.php:232 lib/api.php:404 lib/api.php:488 lib/api.php:610
+#: lib/api.php:697 lib/api.php:749 lib/api.php:1095
 msgid "Invalid address book"
 msgstr "Íåêîððåêòíàÿ àäðåñíàÿ êíèãà."
 
-#: lib/api.php:875 lib/api.php:946 lib/api.php:999
-#, fuzzy
+# fuzzy
+#: lib/api.php:1099 lib/api.php:1172 lib/api.php:1225
 msgid "Invalid email"
 msgstr "Íåêîððåêòíûé e-mail."
 
-#: lib/api.php:883
-#, fuzzy
+# fuzzy
+#: lib/api.php:1107
 msgid "Invalid entry"
 msgstr "Íåêîððåêòíîå èìÿ."
 
-#: lib/Driver/ldap.php:270
+#: lib/Driver/ldap.php:266
 #, fuzzy
 msgid "Invalid key specified."
 msgstr "Áûëà óêàçàíà íåêîððåêòíàÿ âåëè÷èíà."
 
-#: lib/api.php:879
-#, fuzzy
+# fuzzy
+#: lib/api.php:1103
 msgid "Invalid name"
 msgstr "Íåêîððåêòíîå èìÿ."
 
-#: lib/api.php:560
+#: lib/api.php:753
 #, fuzzy
 msgid "Invalid objectId"
 msgstr "Íåêîððåêòíîå èìÿ."
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
+#, fuzzy
 msgid "Last Modified"
 msgstr ""
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Áûñòðûé ñòàðò"
 
-#: lib/config/attributes.php:53
+#: config/attributes.php.dist:53
 #, fuzzy
 msgid "Last Name"
 msgstr "Ïîñëåäíÿÿ ñòðàíèöà"
 
-#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Ñïèñîê"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:78
 msgid "Matching"
 msgstr "Ñîâïàäåíèå"
 
-#: lib/config/prefs.php:81
+#: lib/api.php:207
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "Ìàêñèìàëüíîå êîëè÷åñòâî ñòðàíèö"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Ìàêñèìàëüíîå êîëè÷åñòâî ñòðàíèö"
 
-# fuzzy
-#: lib/Block/minisearch.php:3
-msgid "Mini Search"
-msgstr "Ïîèñê"
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr ""
 
-#: lib/Driver/ldap.php:306
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr ""
 
-#: lib/config/attributes.php:162
-#, fuzzy
+# fuzzy
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
-msgstr "Äîìàøíèé òåëåôîí"
+msgstr "Ìîáèëüíûé òåëåôîí"
 
-#: lib/Driver/ldap.php:335 lib/Driver/ldap.php:352
-#, php-format
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, fuzzy, php-format
 msgid "Modify failed: (%s) %s"
-msgstr ""
+msgstr "Îøèáêà ïðè óäàëåíèè"
 
-#: lib/api.php:985
+#: lib/api.php:1211
 msgid "More than 1 entry found"
 msgstr ""
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:16
 msgid "Move"
 msgstr "Ïåðåìåñòèòü"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 #, fuzzy
 msgid "Move left"
 msgstr "ñìåñòèòü âëåâî"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 #, fuzzy
 msgid "Move right"
 msgstr "ñìåñòèòü âïðàâî"
 
-#: data.php:31 templates/data/import.inc:21
-#, fuzzy
+# fuzzy
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
-msgstr "Ýêñïîðò àäðåñíîé êíèãè"
+msgstr "Àäðåñíàÿ êíèãà Mulberry"
 
-#: lib/api.php:905
+#: lib/api.php:1131
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
 
 # fuzzy
-#: lib/config/sources.php:175
-msgid "My Addressbook"
+# fuzzy
+#: config/sources.php.dist:107 config/sources.php.dist:243
+msgid "My Address Book"
+msgstr "Àäðåñíàÿ êíèãà"
+
+# fuzzy
+# fuzzy
+#: addressbooks.php:119
+#, fuzzy
+msgid "My Address Books"
 msgstr "Àäðåñíàÿ êíèãà"
 
-#: lib/config/attributes.php:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Èìÿ"
 
 # fuzzy
-#: lib/config/prefs.php:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Èìåíà"
 
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
 # fuzzy
-#: add.php:45 add.php:112 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Äîáàâèòü íîâóþ çàïèñü"
 
-# fuzzy
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "Íîâàÿ ãðóïïà"
-
-#: templates/data/import.inc:42
+#: edit.php:95 edit.php:102 edit.php:209 templates/data/import.inc:45
 msgid "Next"
 msgstr "Äàëåå"
 
-#: lib/config/attributes.php:218
+#: config/attributes.php.dist:218
 #, fuzzy
 msgid "Nickname"
 msgstr "Èìÿ"
 
-#: lib/api.php:987 lib/api.php:1036
+#: lib/api.php:1213 lib/api.php:1262
 #, php-format
 msgid "No %s entry found for %s"
 msgstr ""
 
-#: lib/api.php:955
+#: lib/api.php:1181
 #, fuzzy
 msgid "No address books found."
 msgstr "Àäðåñíàÿ êíèãà äîñòóïíà òîëüêî äëÿ ÷òåíèÿ."
 
-#: minisearch.php:87
+#: minisearch.php:81
+#, fuzzy
 msgid "No contacts found"
-msgstr ""
+msgstr "Àäðåñàò óâåäîìëåíèÿ %s íå íàéäåí."
 
-#: lib/api.php:338
+#: lib/api.php:513 lib/api.php:784
+#, fuzzy
 msgid "No vCard data was found."
-msgstr ""
+msgstr "Àäðåñíàÿ êíèãà äîñòóïíà òîëüêî äëÿ ÷òåíèÿ."
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 #, fuzzy
 msgid "None"
 msgstr "Çàìåòêè"
 
-#: lib/config/attributes.php:184
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Çàìåòêè"
 
-#: lib/config/prefs.php:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Êîë-âî çàïèñåé íà ñòðàíèöå"
 
-#: lib/api.php:436
+#: lib/api.php:632 lib/api.php:765
+#, fuzzy
 msgid "Object not found"
-msgstr ""
+msgstr "Îòìåíèòü èçìåíåíèÿ"
 
-#: lib/config/attributes.php:223
+#: config/attributes.php.dist:223
 #, fuzzy
 msgid "Office"
 msgstr "Çàãîëîâîê"
 
-# fuzzy
-#: lib/config/prefs.php:34
-msgid "Other Options"
-msgstr "Äðóãèå íàñòðîéêè"
+#: templates/prefs/imsp_opt.inc:22
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
-#: lib/config/attributes.php:190
+#: lib/api.php:792
+#, fuzzy
+msgid "Only one vcard supported."
+msgstr ""
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå"
+
+# fuzzy
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+msgid "Other Options"
+msgstr "Äðóãèå íàñòðîéêè"
+
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr ""
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:728 lib/api.php:889
+#: lib/api.php:497 lib/api.php:623 lib/api.php:710 lib/api.php:952
+#: lib/api.php:1116
+#, fuzzy
 msgid "Permission Denied"
-msgstr ""
+msgstr "Íàñòðîéêè ïîëüçîâàòåëÿ"
 
-#: lib/Driver.php:454
+#: lib/Driver.php:550
+#, fuzzy
 msgid "Permission denied"
-msgstr ""
+msgstr "Íàñòðîéêè ïîëüçîâàòåëÿ"
 
-#: data.php:32 templates/data/import.inc:22
-#, fuzzy
+# fuzzy
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr "Ïðàâà äîñòóïà"
+
+# fuzzy
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
-msgstr "Ñîäåðæàíèå àäðåñíîé êíèãè"
+msgstr "Àäðåñíàÿ êíèãà Pine"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
-msgstr ""
+# fuzzy
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr "Ïîæàëóéñòà ââåäèòå íîâîå èìÿ:"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Ïîæàëóéñòà, âûáåðèòå êàòàëîã:"
+#: edit.php:98 edit.php:101 edit.php:201
+#, fuzzy
+msgid "Previous"
+msgstr "Ïðåäûäóùàÿ ñòðàíèöà"
 
-#: lib/Driver/ldap.php:146
-#, php-format
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Ñîäåðæàíèå àäðåñíîé êíèãè"
+
+#: lib/Driver/ldap.php:147
+#, fuzzy, php-format
 msgid "Query failed: (%s) %s"
-msgstr ""
+msgstr "Îøèáêà ïðè óäàëåíèè"
 
 # fuzzy
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "Áûñòðûé ïîèñê"
 
-#: lib/Driver/ldap.php:190 lib/Driver/ldap.php:198 lib/Driver/ldap.php:432
-#, php-format
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, fuzzy, php-format
 msgid "Read failed: (%s) %s"
-msgstr ""
+msgstr "Îøèáêà ïðè óäàëåíèè"
 
-#: templates/browse/footer.inc:6
+#: lib/Driver/null.php:52
+#, fuzzy
+msgid "Reading contacts is not available."
+msgstr "Íåò äîñòóïíûõ íàñòðîåê."
+
+# fuzzy
+# fuzzy
+#: lib/Renderer.php:49
+#, fuzzy
+msgid "Really delete this contact?"
+msgstr "Óäàëèòü çòó çàäà÷ó"
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr ""
 
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Àäðåñíàÿ êíèãà"
+
 #: templates/prefs/columnselect.inc:239
 #, fuzzy
 msgid "Remove column"
 msgstr "óáðàòü ñòîëáåö"
 
-#: templates/browse/actions.inc:5
+# fuzzy
+#: templates/browse/actions.inc:3
 msgid "Remove from this list"
-msgstr ""
+msgstr "Óäàëèòü èç ãðóïïû"
 
-#: templates/data/import.inc:26
+# fuzzy
+#: templates/data/import.inc:21
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
+"Ïîëíîñòüþ çàìåíèòü ñóùåñòâóþùóþ àäðåñíóþ êíèãó. <b>Ïðè ýòîì áóäóò óäàëåíû "
+"ÂÑÅ çàïèñè èç òåêóùåé àäðåñíîé êíèãè</b>"
 
-#: lib/Driver.php:344
+#: lib/Driver.php:438
+#, fuzzy
 msgid "Requested object not found."
-msgstr ""
+msgstr "Àäðåñàò óâåäîìëåíèÿ %s íå íàéäåí."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:114
 msgid "Reset to Defaults"
 msgstr "Ñáðîñèòü"
 
-#: lib/config/attributes.php:196
+#: config/attributes.php.dist:196
+#, fuzzy
 msgid "S/MIME Public Certificate"
-msgstr ""
+msgstr "Âàøå ïîëíîå èìÿ:"
 
-#: lib/Driver/ldap.php:74
-#, php-format
+#: lib/Driver/ldap.php:69
+#, fuzzy, php-format
 msgid "STARTTLS failed: (%s) %s"
-msgstr ""
+msgstr "Îøèáêà ïðè óäàëåíèè"
 
-#: edit.php:57 add.php:46
+#: edit.php:106 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Ñîõðàíèòü"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 lib/config/prefs.php:100
+#: lib/Driver/null.php:67
+#, fuzzy
+msgid "Saving contacts is not available."
+msgstr "Íåò äîñòóïíûõ íàñòðîåê."
+
+#: templates/browse/search.inc:97 templates/browse/search.inc:113
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Ïîèñê"
 
-#: browse.php:264 minisearch.php:66
-msgid "Search Results"
-msgstr "Ðåçóëüòàòû ïîèñêà"
-
-#: lib/api.php:805
+#: lib/api.php:1029
 #, fuzzy
 msgid "Search failed"
 msgstr "Ïîèñê"
 
-#: lib/api.php:895 lib/api.php:901 lib/api.php:910 lib/api.php:923
-#, php-format
+#: lib/api.php:1121 lib/api.php:1127 lib/api.php:1136 lib/api.php:1149
+#, fuzzy, php-format
 msgid "Search failed: %s"
-msgstr ""
-
-# fuzzy
-#: lib/config/prefs.php:28
-msgid "Searching Options"
 msgstr "Ïîèñê"
 
-#: templates/block/minisearch.inc:49
+#: lib/Driver/null.php:47
+#, fuzzy
+msgid "Searching is not available."
+msgstr "Íåò äîñòóïíûõ íàñòðîåê."
+
+#: templates/block/minisearch.inc:22
 #, fuzzy
 msgid "Searching..."
 msgstr "Ïîèñê"
@@ -777,131 +1031,196 @@
 msgid "Select Address Book"
 msgstr "Ýêñïîðò àäðåñíîé êíèãè"
 
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "Âûáåðèòå ãðóïïó"
+# fuzzy
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Âûáåðèòå àäðåñíóþ êíèãó äëÿ ýêñïîðòà:"
 
-#: templates/data/export.inc:37
+# fuzzy
+#: templates/addressbooks.inc:90
 #, fuzzy
+msgid "Select an address book to edit"
+msgstr "Êóäà Âû õîòèòå èìïîðòèðîâàòü:"
+
+# fuzzy
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
-msgstr "Âûáåðèòå èñòî÷íèê äëÿ ýêñïîðòà:"
+msgstr "Âûáåðèòå àäðåñíóþ êíèãó äëÿ ýêñïîðòà:"
 
-#: templates/data/import.inc:31
-#, fuzzy
+# fuzzy
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Êóäà Âû õîòèòå èìïîðòèðîâàòü:"
 
-#: templates/data/export.inc:14
-#, fuzzy
+# fuzzy
+# fuzzy
+#: templates/data/import.inc:35
+msgid "Select the charset of the source file:"
+msgstr "Óêàæèòå êîäèðîâêó èìïîðòèðóåìîãî ôàéëà:"
+
+# fuzzy
+#: templates/data/export.inc:10
 msgid "Select the export format:"
-msgstr "Âûáåðèòå èñòî÷íèê äëÿ ýêñïîðòà:"
+msgstr "Âûáåðèòå ôîðìàò ýêñïîðòèðóåìîãî ôàéëà:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
-msgstr "Êàêîé ôàéë Âû õîòèòå èìïîðòèðîâàòü:"
+msgstr "Èìïîðòèðóåìûé ôàéë:"
 
-#: templates/data/import.inc:16
-#, fuzzy
+# fuzzy
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
-msgstr "Âûáåðèòå ôîðìàò ýêñïîðòà:"
+msgstr "Âûáåðèòå ôîðìàò èìïîðòèðóåìîãî ôàéëà:"
 
 # fuzzy
-#: lib/config/prefs.php:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Âûáåðèòå ôîðìàò îòîáðàæåíèÿ èìåí:"
 
-#: lib/config/prefs.php:17
-msgid "Select view to display by default."
+# fuzzy
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Íàñòðîéêà ðåæèìà îòîáðàæåíèÿ ïî óìîë÷àíèþ"
 
 # fuzzy
-#: lib/config/prefs.php:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Âûáîð ïîðÿäêà îòîáðàæåíèÿ ñòîëáöîâ â ñïèñêå àäðåñîâ."
 
-#: lib/config/prefs.php:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Âûáîð ôîðìàòà îòîáðàæåíèÿ èìåí"
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Âûáðàííûå ñòîëáöû:"
-
-#: add.php:59
+#: add.php:54
 #, fuzzy, php-format
-msgid "Selected address book '%s'."
+msgid "Selected address book \"%s\"."
 msgstr "Íåêîððåêòíàÿ àäðåñíàÿ êíèãà."
 
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "Âñå"
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Êàòàëîã"
 
 #: templates/browse/select.inc:11
+#, fuzzy
 msgid "Show"
-msgstr ""
+msgstr "Èìïîðò"
+
+#: templates/browse/actions.inc:46
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "Èìïîðò"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:48
 msgid "Show All"
 msgstr "Ïîêàçàòü âñå"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:47
 msgid "Show Contacts"
 msgstr "Ïîêàçàòü Êîíòàêòû"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:46
 msgid "Show Lists"
 msgstr "Ïîêàçàòü Ãðóïïû"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "Êîíòàêòû"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "Ãðóïïû"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:36
 #, fuzzy
 msgid "Sort Direction"
 msgstr "Êàòàëîã"
 
-#: lib/api.php:154
+#: lib/api.php:200
 #, fuzzy
 msgid "Sources"
 msgstr "Óñïåøíî"
 
-#: lib/config/prefs.php:130
+#: config/prefs.php.dist:158
 msgid "Specify where you want advanced search results to appear."
 msgstr "Ãäå îòîáðàæàòü ðåçóëüòàòû ðàñøèðåííîãî ïîèñêà"
 
-#: browse.php:156
-#, php-format
+# fuzzy, php-format
+#: browse.php:214 browse.php:262
+msgid "Successfully added %d contact(s) to list."
+msgstr "%d áûë óñïåøíî äîáàâëåí"
+
+# fuzzy, php-format
+#: browse.php:160
 msgid "Successfully added %s to %s"
-msgstr ""
+msgstr "Äîáàâëåíî \"%s\" â \"%s\"."
+
+# fuzzy, php-format
+#: browse.php:248
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Ñîçäàíà ãðóïïà '%s'"
+
+# fuzzy, php-format
+# fuzzy, php-format
+# fuzzy, php-format
+#: browse.php:84
+msgid "Successfully deleted %d contact(s)."
+msgstr "Óäàëåíî %d êîíòàêòîâ"
+
+# fuzzy, php-format
+#: browse.php:64
+msgid "Successfully removed %d contact(s) from list."
+msgstr "Óäàëåíî %d êîíòàêòîâ èç ãðóïïû"
 
-#: data.php:29
+#: data.php:50
 msgid "TSV"
 msgstr ""
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
+msgstr "TSV-ôàéë (ðàçäåëåííûé òàáóëÿöèåé)"
+
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
 msgstr ""
 
-#: data.php:234
-#, php-format
+#: lib/Driver.php:1076
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Àäðåñàò óâåäîìëåíèÿ %s íå íàéäåí."
+
+#: addressbooks.php:48
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
+
+#: addressbooks.php:71
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
+
+#: data.php:303
+#, fuzzy, php-format
 msgid "The address book could not be purged: %s"
-msgstr ""
+msgstr "Ïîäïèñü íå ìîæåò áûòü çàìåíåíà."
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:51 vcard.php:22 display.php:23 view.php:26
+#, fuzzy
 msgid "The contact you requested does not exist."
+msgstr "Àäðåñàò óâåäîìëåíèÿ %s íå íàéäåí."
+
+#: edit.php:123
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
 msgstr ""
 
-#: browse.php:58
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Íåò àäðåñíûõ êíèã, äîñòóïíûõ äëÿ âûáîðà."
 
-#: add.php:38
+#: add.php:29
 #, fuzzy
 msgid ""
 "There are no writeable address books. None of the available address books "
@@ -912,150 +1231,246 @@
 "èìåëè âîçìîæíîñòü äîáàâëÿòü â íåå íîâûå çàïèñè. Åñëè Âû ñ÷èòàåòå, ÷òî ýòî "
 "îøèáêà, òî ñâÿæèòåñü ñ ñèñàäìèíîì."
 
-#: add.php:108
+#: add.php:121
 #, fuzzy
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr "Îøèáêà ïðè äîáàâëåíèè îáúåêòà. Ñâÿæèòåñü ñ ñèñàäìèíîì."
 
-#: browse.php:212
+#: browse.php:271
 #, fuzzy
 msgid "There was an error creating a new list."
 msgstr "Îøèáêà ïðè èìïîðòå äàííûõ."
 
-#: browse.php:163
+#: addressbooks.php:38
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr ""
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà."
+
+#: browse.php:166
 #, fuzzy, php-format
-msgid "There was an error deleting %s from the source address book."
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "Îøèáêà ïðè èìïîðòå çàãðóæåííîãî ôàéëà"
 
-#: delete.php:31
+#: delete.php:37
 #, fuzzy, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Îøèáêà ïðè èìïîðòå äàííûõ."
 
-#: browse.php:93
+#: browse.php:311
 #, fuzzy
-msgid "There was an error deleting this object."
-msgstr "Îøèáêà ïðè èìïîðòå äàííûõ."
-
-#: browse.php:294
-#, fuzzy
-msgid "There was an error displaying the select List"
+msgid "There was an error displaying the list"
 msgstr "Îøèáêà ïðè èìïîðòå çàãðóæåííîãî ôàéëà"
 
-#: data.php:249
+#: data.php:335
 #, fuzzy, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Îøèáêà ïðè èìïîðòå äàííûõ."
 
-#: lib/api.php:334
+#: lib/api.php:509 lib/api.php:779
 #, fuzzy
 msgid "There was an error importing the iCalendar data."
 msgstr "Îøèáêà ïðè èìïîðòå äàííûõ."
 
-#: browse.php:83
-#, fuzzy
-msgid "There was an error removing this object."
+#: addressbooks.php:58 addressbooks.php:63 addressbooks.php:69
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr ""
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà.\n"
+"#-#-#-#-#  ru_RU.po (IMP v4.0.2)  #-#-#-#-#\n"
+"Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà."
+
+#: addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
 msgstr "Îøèáêà ïðè èìïîðòå äàííûõ."
 
-#: edit.php:84
+#: edit.php:165
 #, fuzzy, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Îøèáêà ïðè èìïîðòå äàííûõ."
 
-#: data.php:151
+#: data.php:179
 #, fuzzy
 msgid "There were no addresses to export."
 msgstr "Íåò àäðåñíûõ êíèã, äîñòóïíûõ äëÿ çàïèñè."
 
-#: lib/Driver.php:404 lib/Driver.php:445
+# fuzzy
+#: templates/prefs/addressbookselect.inc:180
 #, fuzzy
-msgid "This address book is read-only"
-msgstr "Àäðåñíàÿ êíèãà äîñòóïíà òîëüêî äëÿ ÷òåíèÿ."
+msgid "These address books will display in this order:"
+msgstr "Â ýòîé ïàïêå íåò ôàéëîâ."
+
+# fuzzy
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr "Ýòè ñâîéñòâà áóäóò îòîáðàæåíû"
 
-#: data.php:211
+#: data.php:269
+#, fuzzy
 msgid "This file format is not supported."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå"
 
-#: lib/api.php:914 lib/api.php:927
+#: lib/api.php:1140 lib/api.php:1153
 #, fuzzy, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Ýòîò ÷åëîâåê óæå çàïèñàí â Âàøåé àäðåñíîé êíèãå."
 
-#: lib/config/attributes.php:70
+#: config/prefs.php.dist:148
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Çàãîëîâîê"
 
-#: lib/Driver.php:825
+#: lib/Turba.php:449
+#, fuzzy, php-format
+msgid "Unable to create new share. Missing source type."
+msgstr "Íåâîçìîæíî ñîåäèíèòüñÿ ñ SQL ñåðâåðîì."
+
+#: lib/Driver.php:1000
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s."
 
 # fuzzy
-#: edit.php:57
+#: edit.php:95 edit.php:98 edit.php:101 edit.php:106 edit.php:203
 msgid "Undo Changes"
 msgstr "Îòìåíèòü èçìåíåíèÿ"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
-msgstr ""
-
-#: templates/browse/contactrow.inc:27
+#: lib/api.php:542 lib/api.php:661 lib/api.php:797
 #, fuzzy, php-format
-msgid "View '%s'"
-msgstr "Ðåäàêòèðîâàíèå '%s'"
+msgid "Unsupported Content-Type: %s"
+msgstr "Íåêîððåêòíîå èìÿ."
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Êàòàëîã"
+
+# fuzzy, php-format
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+msgid "View \"%s\""
+msgstr "Ïðîñìîòð %s"
 
-#: minisearch.php:82
+#: minisearch.php:76
 #, fuzzy
 msgid "View Contact"
 msgstr "Äîáàâèòü íîâóþ çàïèñü"
 
-#: lib/config/prefs.php:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Ðåæèì ïî óìîë÷àíèþ:"
 
-#: lib/config/attributes.php:208
+#: config/attributes.php.dist:208
 msgid "Website URL"
 msgstr ""
 
-#: lib/config/attributes.php:113
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Ðàáî÷èé àäðåñ"
 
-#: lib/config/attributes.php:124
+#: config/attributes.php.dist:124
+#, fuzzy
 msgid "Work City"
-msgstr ""
+msgstr "Ðàáî÷èé òåëåôîí"
 
-#: lib/config/attributes.php:139
+#: config/attributes.php.dist:139
 #, fuzzy
 msgid "Work Country"
 msgstr "Ðàáî÷èé òåëåôîí"
 
-#: lib/config/attributes.php:156
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Ðàáî÷èé òåëåôîí"
 
-#: lib/config/attributes.php:134
+#: config/attributes.php.dist:134
 #, fuzzy
 msgid "Work Postal Code"
 msgstr "Ðàáî÷èé òåëåôîí"
 
-#: lib/config/attributes.php:129
+#: config/attributes.php.dist:129
 #, fuzzy
 msgid "Work State/Province"
 msgstr "Ðàáî÷èé òåëåôîí"
 
-#: lib/config/attributes.php:119
+#: config/attributes.php.dist:119
 #, fuzzy
 msgid "Work Street Address"
 msgstr "Ðàáî÷èé àäðåñ"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr ""
+#: data.php:237 browse.php:106 browse.php:227 add.php:73
+#, fuzzy, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr "Âû ñîçäàåòå ïàïêó âåðõíåãî óðîâíÿ."
 
-#: edit.php:44 display.php:48
+#: edit.php:73 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr ""
 
@@ -1063,52 +1478,90 @@
 msgid "You do not have permission to view this object."
 msgstr ""
 
-#: templates/browse/javascript.inc:41
+#: lib/Turba.php:537
+#, fuzzy
+msgid "You do not have permissions to delete this source."
+msgstr "Ðåäàêòèðîâàòü ïðàâà äëÿ ýòîé òåìû"
+
+#: templates/browse/javascript.inc:55
+#, fuzzy
 msgid "You must select a target address book."
-msgstr ""
+msgstr "Âû äîëæíû ñíà÷àëà âûáðàòü àäðåñ."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
+#, fuzzy
 msgid "You must select a target list."
-msgstr ""
+msgstr "Âû äîëæíû óêàçàòü ñíà÷àëà â êàêóþ ïàïêó."
+
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "Âû äîëæíû ñíà÷àëà âûáðàòü ïî êðàéíåé ìåðå îäíî ñîîáùåíèå."
 
-#: templates/browse/javascript.inc:58
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+#, fuzzy
 msgid "You must select at least one entry first."
-msgstr ""
+msgstr "Âû äîëæíû ñíà÷àëà âûáðàòü ïî êðàéíåé ìåðå îäíî ñîîáùåíèå."
 
-#: edit.php:48
+#: edit.php:77
 msgid "You only have permission to view this contact."
 msgstr ""
 
-#: templates/browse/contactrow.inc:12
-msgid "[no value]"
+#: browse.php:318
+msgid "Your default address book is not browseable."
 msgstr ""
 
-# fuzzy
-#: lib/Turba.php:275
-msgid "_Add"
-msgstr "Äîáàâèòü"
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+#, fuzzy
+msgid "[no value]"
+msgstr "Çàìåòêè"
 
 # fuzzy
-#: lib/Turba.php:274
+#: lib/Turba.php:560
 msgid "_Browse"
 msgstr "Âûáðàòü"
 
+#: templates/browse/actions.inc:47
+#, fuzzy
+msgid "_Contacts"
+msgstr "Ïîêàçàòü Êîíòàêòû"
+
 # fuzzy
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:3
 msgid "_Delete"
 msgstr "Óäàëèòü"
 
 # fuzzy
-#: lib/Turba.php:280
+#: lib/Turba.php:569
 msgid "_Import/Export"
 msgstr "Èìïîðò/Ýêñïîðò"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:46
+#, fuzzy
+msgid "_Lists"
+msgstr "Ñïèñîê"
+
+# fuzzy
+# fuzzy
+#: lib/Turba.php:557
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Àäðåñíàÿ êíèãà"
+
+# fuzzy
+# fuzzy
+#: lib/Turba.php:563
+msgid "_New Contact"
+msgstr "Äîáàâèòü"
+
+#: templates/browse/actions.inc:3
+#, fuzzy
 msgid "_Remove from this list"
-msgstr ""
+msgstr "Óäàëèòü ïàðó"
 
 # fuzzy
-#: lib/Turba.php:276
+#: lib/Turba.php:565
 msgid "_Search"
 msgstr "Ïîèñê"
 
@@ -1116,20 +1569,96 @@
 msgid "contact.vcf"
 msgstr ""
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr ""
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr ""
 
-#: templates/browse/actions.inc:22
+#: data.php:219
 #, fuzzy
-msgid "to Selected Address Book"
+msgid "contacts.vcf"
+msgstr "Ïîêàçàòü Êîíòàêòû"
+
+#: config/prefs.php.dist:138
+#, fuzzy
+msgid "no formatting"
+msgstr "Óäàëèòü ïàðó"
+
+#: templates/prefs/imsp_opt.inc:32
+msgid "none"
+msgstr "íåò"
+
+# fuzzy
+#: templates/browse/actions.inc:31
+msgid "to a Contact List"
+msgstr "â ãðóïïó"
+
+#: templates/browse/actions.inc:21
+#, fuzzy
+msgid "to a different Address Book"
 msgstr "Ýêñïîðò àäðåñíîé êíèãè"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"
+
+msgid ""
+"Choose a default directory for your personal addressbook, contact lists, and "
+"searches."
+msgstr "Âûáîð àäðåñíîé êíèãè è îïöèé äëÿ ïîèñêà"
+
+msgid "Choose the order of the columns to display in the address list."
+msgstr "Âûáåðèòå ïîðÿäîê îòîáðàæåíèÿ ñòîëáöîâ â ñïèñêå àäðåñîâ."
+
+msgid "Clear Search"
+msgstr "Î÷èñòèòü"
+
+msgid "Contents of %s"
+msgstr "Ñîäåðæàíèå %s"
+
+# fuzzy
+msgid "Default Display"
+msgstr "Ïðîôèëü ïî óìîë÷àíèþ"
+
+msgid ""
+"Default directory for your personal addressbook, contact lists, and searches."
+msgstr "Àäðåñíàÿ êíèãà ïî óìîë÷àíèþ"
+
+msgid "Please select a directory:"
+msgstr "Ïîæàëóéñòà, âûáåðèòå êàòàëîã:"
+
+msgid ""
+"Replace existing address book with the imported one? <b>Warning: This "
+"deletes all entries in your current address book.</b>"
+msgstr ""
+"Ïîëíîñòüþ çàìåíèòü ñóùåñòâóþùóþ àäðåñíóþ êíèãó. <b>Ïðè ýòîì áóäóò óäàëåíû "
+"ÂÑÅ çàïèñè èç òåêóùåé àäðåñíîé êíèãè</b>"
+
+msgid "Search Results"
+msgstr "Ðåçóëüòàòû ïîèñêà"
+
+# fuzzy
+msgid "Searching Options"
+msgstr "Ïîèñê"
+
+msgid "Select List"
+msgstr "Âûáåðèòå ãðóïïó"
+
+msgid "Select view to display by default."
+msgstr "Íàñòðîéêà ðåæèìà îòîáðàæåíèÿ ïî óìîë÷àíèþ"
+
+msgid "Selected Columns:"
+msgstr "Âûáðàííûå ñòîëáöû:"
+
+msgid "Sho_w All"
+msgstr "Âñå"
+
+msgid "Show _Contacts"
+msgstr "Êîíòàêòû"
+
+msgid "Show _Lists"
+msgstr "Ãðóïïû"


--- orig/po/sl_SI.po
+++ mod/po/sl_SI.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version:  Turba H3 (2.0)\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-02-12 21:11+0100\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2005-02-21 15:25+0100\n"
 "Last-Translator: Matic Dolar <smesni at medium.si>\n"
 "Language-Team: Sloven¹èina\n"
@@ -15,77 +15,132 @@
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Pine Adresar"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "v Izbran Adresar"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, fuzzy, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "'%s' ni bil kopiran, ker je na seznamu."
+
+#: browse.php:124
+#, fuzzy, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "'%s' ni bil premaknjen, ker je na seznamu."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Ime Priimek\"  (npr. Janez Kranjski)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Priimek, Ime\" (npr. Kranjski, Janez)"
 
-#: add.php:95
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s dodan."
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "Datoteka %s uspe¹no uvo¾ena"
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "%s k %s od %s"
 
-#: browse.php:146
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s' ni bil kopiran, ker je na seznamu."
-
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s' ni bil premaknjen, ker je na seznamu."
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Pine Adresar"
 
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
 msgstr "Zahtevan je brskalnik ki podpira iFrames"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
 msgstr "Nad obrazcem za iskanje"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Na_predno Iskanje"
+#: view.php:52
+#, fuzzy, php-format
+msgid "Access denied to %s"
+msgstr "Uspe¹no dodal %s v %s"
+
+#: add.php:56 templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add"
+msgstr "_Dodaj"
+
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Neveljaven adresar"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Izbran adresar '%s'."
 
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Dodaj stolpec"
 
-#: templates/browse/actions.inc:33
+#: edit.php:128
+msgid "Add file"
+msgstr ""
+
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "Dodaj v"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Pine Adresar"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Seznam Adresarjev"
 
-#: add.php:94
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Pine Adresar"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Vnos v adresar"
 
-#: lib/Driver.php:494
-msgid "Address book is read-only."
-msgstr "Adresar je samo za pisanje."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Adresar uspe¹no poèi¹èen."
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Vnos v adresar"
+
+#: templates/prefs/addressbookselect.inc:170
+#, fuzzy
+msgid "Address books that will not be displayed:"
+msgstr "Adresarja ni bilo mogoèe poèistiti: %s"
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Napredno Iskanje"
 
@@ -93,107 +148,107 @@
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "Vse"
 
-#: lib/api.php:372
+#: lib/api.php:552
 msgid "Already Exists"
 msgstr "®e obstaja"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "Ste preprièani, da ¾elite izbrisati %s?"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Ste preprièani, da ¾elite izbrisati izbrane vnose?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Nara¹èajoè"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Stolpci ki so na voljo:"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Na_zaj na %s"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "Nazaj na %s"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "Osno_vno Iskanje"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
 msgstr "Osnovno Iskanje"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
 msgstr "Pod obrazcem za iskanje"
 
-#: lib/Driver/ldap.php:75 lib/Driver/ldap.php:78
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Vezava spodletela: (%s) %s"
 
-#: config/attributes.php.dist:168
+#: config/attributes.php.dist:178
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: config/attributes.php.dist:163
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "_Brskaj"
+
+#: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Kategorija Posla"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "Poè_isti Iskanje"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Preveri _Vse/Nobenega"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Izberite privzeto mapo za va¹ osebni adresar, sezname stikov in iskanja."
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "Izberite adresar"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Izberite adresar"
 
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Izberite adresar"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "Izberite adresar"
+
 #: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
 msgstr "Izberite vrstni red za prikaz stolpcev seznama naslovov."
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "Poèisti Iskanje"
-
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Mo¾nosti stolpcev"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Vrednosti loèene z znaki"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Vrednosti loèene z znaki (Microsoft Outlook)"
 
@@ -201,111 +256,144 @@
 msgid "Company"
 msgstr "Podjetje"
 
-#: config/attributes.php.dist:134
+#: config/attributes.php.dist:144
 msgid "Company Address"
 msgstr "Naslov Podjetja"
 
-#: lib/api.php:611 lib/api.php:797
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Povezava spodletela: %s"
 
-#: lib/Driver/ldap.php:64
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Povezava spodletela"
 
-#: browse.php:85
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "Stik odstranjen s seznama."
+
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "Stik odstranjen s seznama."
 
-#: browse.php:275
+#: browse.php:266
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Stiki na seznamu: %s"
 
-#: browse.php:297
-#, php-format
-msgid "Contents of %s"
-msgstr "Vsebina %s"
-
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:12
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: lib/ObjectView.php:134
-msgid "Created"
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
 msgstr "Ustvarjeno"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Privzet pogled"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Zasebni Adresar"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "Privzeta mapa za osebne adresarje, sezname stikov in iskanja."
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
 
-#: config/prefs.php.dist:72
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "Ustvarjeno"
+
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Privzeta smer razvrstitve:"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Izbri¹i"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Izberi Adresar"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Potrditev izbrisa"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Obna¹anje gumba za brisanje"
 
-#: lib/Driver/ldap.php:267
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Brisanje spodletelo: (%s) %s"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Brisanje spodletelo"
 
-#: config/attributes.php.dist:203
+#: config/attributes.php.dist:213
 msgid "Department"
 msgstr "Oddelek"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Padajoè"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Mapa"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Mo¾nosti prikaza"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Mo¾nosti prikaza"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
 msgstr "®elite potrjevati izbris vnosov?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
+msgstr "Presnemi vCard"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "Presnemi vCard"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/browse/contactrow.inc:33
-#, php-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "Uredi '%s'"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Izvozi Adresar"
+
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
 msgstr "Uredi vpis za %s"
@@ -314,86 +402,116 @@
 msgid "Email"
 msgstr "E-po¹ta"
 
-#: edit.php:79
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
 msgstr "Vpis za %s posodobljen."
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "Datoteka %s uspe¹no uvo¾ena"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Dostop do adresarja ni uspel: %s"
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Izvozi"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Izvozi Adresar"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Izvozi samo izbrane stike."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Izvozi izbran adresar v celoti."
 
-#: data.php:110 data.php:228 browse.php:62 browse.php:120 browse.php:135
-#: add.php:71 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Dostop do adresarja ni uspel: %s"
 
-#: browse.php:154
+#: browse.php:139
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "Dodajanje %s v %s ni uspelo: %s"
 
-#: browse.php:280
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "Brskanje po seznamu ni uspelo"
 
-#: browse.php:311
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "Brskanje po mapi ni uspelo"
 
-#: lib/Driver/ldap.php:305
-#, php-format
-msgid "Failed to change name: (%s) %s, %s"
+#: lib/Driver/ldap.php:309
+#, fuzzy, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr "Spreminjanje imena ni uspelo: (%s) %s, %s"
 
-#: browse.php:140
+#: browse.php:120
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Iskanje objektov za dodajanje ni uspelo: %s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Dostop do adresarja ni uspel: %s"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Iskanje po mapi ni uspelo: %s"
 
-#: config/attributes.php.dist:157
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Faks"
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Naslov"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "I¹èi"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "I¹èi"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Ime"
 
-#: config/attributes.php.dist:192
+#: config/attributes.php.dist:202
 msgid "Freebusy URL"
 msgstr "Freebusy URL"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Od"
 
-#: config/sources.php.dist:521
+#: config/sources.php.dist:604
 msgid "Global Address Book"
 msgstr "Globalni Adresar"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Skupina"
 
@@ -401,79 +519,85 @@
 msgid "Home Address"
 msgstr "Domaèi naslov"
 
-#: config/attributes.php.dist:88
+#: config/attributes.php.dist:93
 msgid "Home City"
 msgstr "Domale mesto"
 
-#: config/attributes.php.dist:103
+#: config/attributes.php.dist:108
 msgid "Home Country"
 msgstr "Domaèa dr¾ava"
 
-#: config/attributes.php.dist:140
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Domaè telefon"
 
-#: config/attributes.php.dist:98
+#: config/attributes.php.dist:103
 msgid "Home Postal Code"
 msgstr "Domaèa po¹tna ¹tevilka"
 
-#: config/attributes.php.dist:93
+#: config/attributes.php.dist:98
 msgid "Home State/Province"
 msgstr "Domaèa dr¾ava/okraj"
 
-#: config/sources.php.dist:457
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Domaèi naslov"
+
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Seznam Adresarjev"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Uvozi Adredar, korak %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Uvoz/Izvoz Adresarjev"
 
-#: lib/api.php:358 lib/api.php:577
-msgid "Invalid Content-Type"
-msgstr "Neveljavna vrsta vsebine"
-
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:596 lib/api.php:683
 msgid "Invalid ID"
 msgstr "Neveljavna ID"
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:868
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
 msgstr "Neveljaven adresar"
 
-#: lib/api.php:872 lib/api.php:943 lib/api.php:995
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
 msgstr "Neveljavna e-po¹ta"
 
-#: lib/api.php:880
+#: lib/api.php:1089
 msgid "Invalid entry"
 msgstr "Neveljaven vpis"
 
-#: lib/Driver/ldap.php:263
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Podan neveljaven kljuè."
 
-#: lib/api.php:876
+#: lib/api.php:1085
 msgid "Invalid name"
 msgstr "Neveljavno ime"
 
-#: lib/api.php:560
+#: lib/api.php:735
 msgid "Invalid objectId"
 msgstr "Neveljaven objectId"
 
-#: lib/Driver/ldap.php:39
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "Potrebna je podpora LDAP, vendar LDAP modul ni na voljo ali ni nalo¾en."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Zadnja sprememba"
 
@@ -481,364 +605,440 @@
 msgid "Last Name"
 msgstr "Priimek"
 
-#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Seznam"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Ujemanje"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "Najveèje ¹tevilo strani"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Najveèje ¹tevilo strani"
 
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Nov Seznam"
+
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
 msgstr "Mini iskanje"
 
-#: lib/Driver/ldap.php:299
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "V konfiguraciji LDAP izvora manjka DN."
 
-#: config/attributes.php.dist:152
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: lib/Driver/ldap.php:327 lib/Driver/ldap.php:344
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Spreminjanje ni uspelo: (%s) %s"
 
-#: lib/api.php:981
+#: lib/api.php:1193
 msgid "More than 1 entry found"
 msgstr "Veè kot 1 vpis najden"
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:11
 msgid "Move"
 msgstr "Premakni"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Premakni levo"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Premakni desno"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry Adresar"
 
-#: lib/api.php:902
+#: lib/api.php:1113
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr "Obstaja veè oseb z naslovom [%s], vendar nobena z imenom [%s]"
 
-#: config/sources.php.dist:165 config/sources.php.dist:294
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Moj Adresar"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
 msgstr "Moj Adresar"
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Ime"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Oblika imena"
 
-#: config/sources.php.dist:72
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Imenik èlanov storitve Netcenter"
 
-#: add.php:45 add.php:111 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Nov Stik"
 
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "Nov Seznam"
-
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
 msgstr "Naprej"
 
-#: config/attributes.php.dist:208
+#: config/attributes.php.dist:218
 msgid "Nickname"
 msgstr "Nadimek"
 
-#: lib/api.php:983 lib/api.php:1032
+#: lib/api.php:1195 lib/api.php:1244
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "Noben vpis %s ni bil najden za %s"
 
-#: lib/api.php:952
+#: lib/api.php:1163
 msgid "No address books found."
 msgstr "Noben adresar ni bil najden."
 
-#: minisearch.php:85
+#: minisearch.php:83
 msgid "No contacts found"
 msgstr "Noben stik ni bil najden"
 
-#: lib/api.php:338
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
 msgstr "Podatki vCard niso bili najdeni."
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "Noben"
 
-#: config/attributes.php.dist:174
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Bele¾ke"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "©tevilo objektov na stran"
 
-#: lib/api.php:436
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
 msgstr "Objekt ni bil najden"
 
-#: config/attributes.php.dist:213
+#: config/attributes.php.dist:223
 msgid "Office"
 msgstr "Pisarna"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Ostale mo¾nosti"
 
-#: config/attributes.php.dist:180
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr "Javni PGP kljuè"
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:725 lib/api.php:886
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
 msgstr "Dostop zavrnjen"
 
-#: lib/Driver.php:452
+#: lib/Driver.php:543
 msgid "Permission denied"
 msgstr "Dostop zavrnjen"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "Dostop zavrnjen"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine Adresar"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
 msgstr "Prosim vpi¹ite ime za nov seznam:"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Prosim izberite mapo:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-#: config/sources.php.dist:373
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Zasebni Adresar"
 
-#: lib/Driver/ldap.php:139
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Poizvedba je spodletela: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "Hitro Iskanje"
 
-#: lib/Driver/ldap.php:183 lib/Driver/ldap.php:191 lib/Driver/ldap.php:424
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Branje spodletelo: (%s) %s"
 
-#: templates/browse/footer.inc:6
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Prikazani zapisi:"
 
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Izberite adresar"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Odstrani stolpec"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "Odstrani s tega seznama"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
+#, fuzzy
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
 "Zamenjam obstojeè adresar z uvo¾enim? <b>Opozorilo: To dejanje bo izbrisalo "
 "vse zapise v va¹em trenutnem adresarju.</b>"
 
-#: lib/Driver.php:342
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Zahtevan objekt ni bil najden."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
 msgstr "Ponastavi na Privzeto"
 
-#: config/attributes.php.dist:186
+#: config/attributes.php.dist:196
 msgid "S/MIME Public Certificate"
 msgstr "Javno S/MIME Potrdilo"
 
-#: edit.php:57 add.php:46
+#: lib/Driver/ldap.php:69
+#, fuzzy, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr "Branje spodletelo: (%s) %s"
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "I¹èi"
 
-#: browse.php:260 minisearch.php:66
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Rezultati iskanja"
 
-#: lib/api.php:802
+#: lib/api.php:1011
 msgid "Search failed"
 msgstr "Iskanje spodletelo"
 
-#: lib/api.php:892 lib/api.php:898 lib/api.php:907 lib/api.php:920
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
 msgstr "Iskanje spodletelo: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Mo¾nosti iskanja"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "I¹èem..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Izberi Adresar"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Izberite adresar za izvoz:"
 
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "Izberi Seznam"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Izberite adresar za uvoz:"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Izberite adresar za izvoz:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Izberite adresar za uvoz:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Izberito obliko izvorne datoteke:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Izberite obliko izvoza:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Izberite datoteko za uvoz:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Izberito obliko izvorne datoteke:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Izberite obliko za prikaz imen:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Izberite privzeti naèin prikaza."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Izberite katera polja naj bodo prikazana v seznamih naslovov."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Izberite obliko za prikaz imen."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Izbrani stolpci:"
-
-#: add.php:59
-#, php-format
-msgid "Selected address book '%s'."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
 msgstr "Izbran adresar '%s'."
 
-#: config/sources.php.dist:230
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Mapa v Skupni rabi"
 
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "Prik_a¾i Vse"
-
-#: templates/browse/select.inc:11
-msgid "Show"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
 msgstr "Prika¾i"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "Prika¾i Vse"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "Prika¾i Stike"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "Prika¾i Sezname"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "Prika¾i _Stike"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "Prika¾i S_ezname"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "Smer razvrstitve"
 
-#: lib/api.php:154
+#: lib/api.php:198
 msgid "Sources"
 msgstr "Izvori"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
 msgstr "Doloèite, kje naj bodo prikazani  rezultati naprednega iskanja."
 
-#: browse.php:156
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "Uspe¹no dodal %s v %s"
 
-#: data.php:29
+#: browse.php:222
+#, fuzzy, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "Uspe¹no dodal %s v %s"
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Vrednosti loèene s Tab-i"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Adresarja ni bilo mogoèe poèistiti: %s"
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Adresar uspe¹no poèi¹èen."
+
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Adresar uspe¹no poèi¹èen."
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Adresar uspe¹no poèi¹èen."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Adresarja ni bilo mogoèe poèistiti: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "Zahtevan stik ne obstaja."
 
-#: browse.php:58
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "Datoteka %s uspe¹no uvo¾ena"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Ni adresarjev po katerih bi bilo mogoèe brskati."
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -848,7 +1048,7 @@
 "sona voljo ni nastavljen tako, da bi vam dovoljeval dodajanje vpisov. Èe "
 "smatrate da gre za napako, prosim kontaktirajte svojega skrbnika sistema."
 
-#: add.php:107
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -856,130 +1056,173 @@
 "Pri dodajanju stika je pri¹lo do napake. Za nadaljno pomoè kontaktirajte "
 "svojega skrbnika sistema."
 
-#: browse.php:212
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Pri brisanju objekta je pri¹lo do napake."
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "Pri ustvarjanju novega seznama je pri¹lo do napake."
 
-#: browse.php:163
-#, php-format
-msgid "There was an error deleting %s from the source address book."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Pri posodobljanju vpisa je pri¹lo do napake: %s"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "Pri brisanju %s iz adresarja je pri¹lo do napake."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Pri brisanju stika je pri¹lo do napake: %s"
 
-#: browse.php:93
+#: browse.php:72
 msgid "There was an error deleting this object."
 msgstr "Pri brisanju objekta je pri¹lo do napake."
 
-#: browse.php:290
-msgid "There was an error displaying the select List"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
 msgstr "Pri prikazu izbranega seznama je pri¹lo do napake"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Pri uva¾anju podatkov je pri¹lo do napake: %s"
 
-#: lib/api.php:334
+#: lib/api.php:507 lib/api.php:761
 msgid "There was an error importing the iCalendar data."
 msgstr "Pri uva¾anju iCalendar podatkov je pri¹lo do napake."
 
-#: browse.php:83
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Pri ustvarjanju novega seznama je pri¹lo do napake."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Pri odstranjevanju objekta je pri¹lo do napake."
 
-#: edit.php:84
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Pri posodobljanju vpisa je pri¹lo do napake: %s"
+
+#: edit.php:158
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Pri posodobljanju vpisa je pri¹lo do napake: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Ni naslovov za izvoz."
 
-#: lib/Driver.php:402 lib/Driver.php:443
-msgid "This address book is read-only"
-msgstr "Ta adresar je samo za branje"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Oblika datoteke ni podprta."
 
-#: lib/api.php:911 lib/api.php:924
+#: lib/api.php:1122 lib/api.php:1135
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Oseba ¾e ima %s vpis v adresarju"
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Naslov"
 
-#: lib/Driver.php:821
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Definicije %s ni bilo mogoèe nalo¾iti."
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
 msgstr "Preklièi spremembe"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, fuzzy, php-format
+msgid "Unsupported Content-Type: %s"
 msgstr "Nepodprt tip vsebine"
 
-#: config/sources.php.dist:131
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign Imenik"
 
-#: templates/browse/contactrow.inc:27
-#, php-format
-msgid "View '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
 msgstr "Poglej '%s'"
 
-#: minisearch.php:80
+#: minisearch.php:78
 msgid "View Contact"
 msgstr "Poglej Stik"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Privzeti naèin prikaza:"
 
-#: config/attributes.php.dist:198
+#: config/attributes.php.dist:208
 msgid "Website URL"
 msgstr "Spletna stran"
 
-#: config/attributes.php.dist:108
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Slu¾beni naslov"
 
-#: config/attributes.php.dist:114
+#: config/attributes.php.dist:124
 msgid "Work City"
 msgstr "Mesto slu¾be"
 
-#: config/attributes.php.dist:129
+#: config/attributes.php.dist:139
 msgid "Work Country"
 msgstr "Dr¾ava slu¾be"
 
-#: config/attributes.php.dist:146
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Slu¾beni telefon"
 
-#: config/attributes.php.dist:124
+#: config/attributes.php.dist:134
 msgid "Work Postal Code"
 msgstr "Po¹tna ¹tevilka slu¾be"
 
-#: config/attributes.php.dist:119
+#: config/attributes.php.dist:129
 msgid "Work State/Province"
 msgstr "Dr¾ava/Okraj slu¾be"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "Ustvarjate seznam razdelitve."
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Slu¾beni naslov"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-#: edit.php:44 display.php:48
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Za ogled stika nimate dovoljenja."
 
@@ -987,47 +1230,73 @@
 msgid "You do not have permission to view this object."
 msgstr "Za ogled objekta nimate dovoljenja."
 
-#: templates/browse/javascript.inc:41
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Izbrati morate ciljni adresar."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
 msgstr "Izbrati morate ciljni seznam."
 
-#: templates/browse/javascript.inc:58
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "Najprej morate izbrati vsaj en vpis."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Najprej morate izbrati vsaj en vpis."
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
 msgstr "Za ogled stika potrebujete pravice."
 
-#: templates/browse/contactrow.inc:12
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[brez vrednosti]"
 
-#: lib/Turba.php:240
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: lib/Turba.php:239
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "_Brskaj"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "Prika¾i _Stike"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
 msgstr "_Izbri¹i"
 
-#: lib/Turba.php:245
+#: lib/Turba.php:493
 msgid "_Import/Export"
 msgstr "_Uvozi/Izvozi"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Seznam"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Moj Adresar"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Nov Stik"
+
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
 msgstr "_Odstrani s seznama"
 
-#: lib/Turba.php:241
+#: lib/Turba.php:489
 msgid "_Search"
 msgstr "_I¹èi"
 
@@ -1035,19 +1304,35 @@
 msgid "contact.vcf"
 msgstr "contact.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contacts.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contacts.tsv"
 
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
+#: data.php:219
+#, fuzzy
+msgid "contacts.vcf"
+msgstr "contact.vcf"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "Noben"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "Prika¾i Stike"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
 msgstr "v Izbran Adresar"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"


--- orig/lib/Block/minisearch.php
+++ mod/lib/Block/minisearch.php
@@ -1,12 +1,12 @@
 <?php
 
-$block_name = _("Mini Search");
+$block_name = _("Contact Search");
 
 /**
  * Turba_Minisearch_Block:: Implementation of the Horde_Block API to
  * allows searching of addressbooks from the portal.
  *
- * $Horde: turba/lib/Block/minisearch.php,v 1.17.2.1 2005/05/10 04:04:28 chuck Exp $
+ * $Horde: turba/lib/Block/minisearch.php,v 1.17.2.3 2006/01/03 20:50:18 chuck Exp $
  *
  * @package Horde_Block
  */
@@ -23,10 +23,7 @@
     {
         global $registry;
 
-        $html  = Horde::link(Horde::url($registry->getInitialPage(), true), $registry->get('name')) . $registry->get('name') . '</a> :: ';
-        $html .= Horde::link(Horde::applicationUrl('add.php', true), _("New Contact")) . Horde::img('new.png', _("New Contact"), '', Horde::url($registry->getImageDir(), true, -1)) . ' ' . _("New Contact") . '</a>';
-
-        return $html;
+        return Horde::link(Horde::url($registry->getInitialPage(), true)) . _("Contact Search") . '</a>';
     }
 
     /**


--- orig/templates/browse/column_footers.inc
+++ mod/templates/browse/column_footers.inc
@@ -1,10 +1,11 @@
+</tbody>
 </table>
 <input type="hidden" name="actionID" value="" />
-<input type="hidden" name="show" value="<?php echo Util::getFormData('show','all') ?>" />
-<input type="hidden" name="source" value="<?php echo $source ?>" />
-<input type="hidden" name="sortby" value="<?php echo $prefs->getValue('sortby') ?>" />
-<input type="hidden" name="sortdir" value="<?php echo $prefs->getValue('sortdir') ?>" />
-<input type="hidden" name="key" value="<?php echo Util::getFormData('key', '') ?>" />
+<input type="hidden" name="show" value="<?php echo htmlspecialchars(Util::getFormData('show', 'all')) ?>" />
+<input type="hidden" name="source" value="<?php echo htmlspecialchars($source) ?>" />
+<input type="hidden" name="sortby" value="<?php echo htmlspecialchars($sortby) ?>" />
+<input type="hidden" name="sortdir" value="<?php echo htmlspecialchars($sortdir) ?>" />
+<input type="hidden" name="key" value="<?php echo htmlspecialchars(Util::getFormData('key')) ?>" />
 <input type="hidden" name="targetAddressbook" value="" />
 <input type="hidden" name="targetList" value="" />
 <input type="hidden" name="targetNew" value="" />


--- orig/po/uk_UA.po
+++ mod/po/uk_UA.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba v1.0.1\n"
-"POT-Creation-Date: 2002-01-05 14:25+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-01-05 15:35+0200\n"
 "Last-Translator: Andriy Kopystyansky <anri at polynet.lviv.ua>\n"
 "Language-Team: Ukrainian <webmaster at polynet.lviv.ua>\n"
@@ -13,316 +14,1357 @@
 "Content-Type: text/plain; charset=KOI8-U\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr " %s ÆÁÊÌ ÕÓЦÛÎÏ ¦ÍÐÏÒÔÏ×ÁÎÉÊ"
 
-msgid "Add Contact ..."
-msgstr "äÏÄÁÔÉ úÁÐÉÓ ..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "äÏÄÁÔÉ ÎÏ×ÉÊ ÚÁÐÉÓ"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
 
-msgid "Add failed"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÄÏÄÁÔÉ"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
 
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "äÏÄÁÔÉ"
 
-msgid "Addressbook is read-only."
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "îÅËÏÒÅËÔÎÁ áÄÒÅÓÎÁ ËÎÉÇÁ."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "îÅÍÁ ÖÏÄÎϧ ÁÄÒÅÓÎϧ ËÎÉÇÉ, ÄÏÓÔÕÐÎϧ ÄÌÑ ÚÁÐÉÓÕ×ÁÎÎÑ."
+
+#: templates/prefs/columnselect.inc:237
+msgid "Add column"
+msgstr ""
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÄÏÄÁÔÉ"
+
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "äÏÄÁÔÉ"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: browse.php:28 config/prefs.php.dist:125
+#, fuzzy
+msgid "Address Book Listing"
 msgstr "áÄÒÅÓÎÁ ËÎÉÇÁ ÄÏÓÔÕÐÎÁ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
 
-msgid "Advanced Directory Search"
-msgstr "òÏÚÛÉÒÅÎÉÊ ÐÏÛÕË ÐÏ äÉÒÅËÔÏÒ¦§"
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "áÄÒÅÓÎÁ ËÎÉÇÁ ÄÏÓÔÕÐÎÁ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
+
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr " %s ÆÁÊÌ ÕÓЦÛÎÏ ¦ÍÐÏÒÔÏ×ÁÎÉÊ"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "áÄÒÅÓÎÁ ËÎÉÇÁ ÄÏÓÔÕÐÎÁ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
 
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "òÏÚÛÉÒÅÎÉÊ ðÏÛÕË"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "ðÓÅ×ÄÏΦÍ"
 
-msgid "Bcc"
-msgstr "Bcc"
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
 
-msgid "Cancel"
-msgstr "÷¦ÄͦÎÉÔÉ"
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
 
-msgid "Cc"
-msgstr "Cc"
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "óÔ¦ÌØÎÉËÏ×ÉÊ ÔÅÌÅÆÏÎ"
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "ðÏÛÕË"
 
-msgid "Clear Search"
-msgstr "ïÞÉÓÔÉÔÉ ðÏÛÕË"
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
+msgid "Browse"
+msgstr ""
 
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
+
+#: data.php:49
+msgid "CSV"
+msgstr ""
+
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "îÅËÏÒÅËÔÎÁ áÄÒÅÓÎÁ ËÎÉÇÁ."
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "îÅËÏÒÅËÔÎÁ áÄÒÅÓÎÁ ËÎÉÇÁ."
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+msgid "Choose which columns to display and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:17
+msgid "Column Options"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "ïÒÇÁΦÚÁæÑ"
 
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "äÏÍÁÛÎÑ ÁÄÒÅÓÁ"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÷ÉÔÅÒÔÉ"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÷ÉÔÅÒÔÉ"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "ïÒÇÁΦÚÁæÑ"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
+
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "÷ÉÔÅÒÔÉ"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÷ÉÔÅÒÔÉ"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÷ÉÔÅÒÔÉ"
 
-msgid "Directory Search"
-msgstr "ðÏÛÕË × äÉÒÅËÔÏÒ¦§"
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
 
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "äÉÒÅËÔÏÒ¦Ñ"
 
+#: config/prefs.php.dist:24
+msgid "Display"
+msgstr ""
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
+msgid "Display Options"
+msgstr ""
+
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
+
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "òÅÄÁÇÕ×ÁÔÉ"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "òÅÄÁÇÕ×ÁÔÉ"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "å-ÐÏÛÔÁ"
 
-msgid "Error"
-msgstr "ðÏÍÉÌËÁ"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Export Addressbook"
-msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr " %s ÆÁÊÌ ÕÓЦÛÎÏ ¦ÍÐÏÒÔÏ×ÁÎÉÊ"
 
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "îÅÍÁ ÖÏÄÎϧ ÁÄÒÅÓÎϧ ËÎÉÇÉ, ÄÏÓÔÕÐÎϧ ÄÌÑ ÚÁÐÉÓÕ×ÁÎÎÑ."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "åËÓÐÏÒÔ"
 
-msgid "Failed to connect to the specified directory."
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓËÏÎÔÁËÔÕ×ÁÔÉÓØ Ú ×ËÁÚÁÎÏÀ ÄÉÒÅËÔÏÒ¦¤À."
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
+msgstr "îÅ×ÄÁÞÁ ÐÏÛÕËÕ × ÄÉÒÅËÔÏÒ¦§: %s"
+
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "îÅ×ÄÁÞÁ ÐÏÛÕËÕ × ÄÉÒÅËÔÏÒ¦§: %s"
+
+#: browse.php:272
+msgid "Failed to browse list"
+msgstr ""
+
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
+msgstr "îÅ×ÄÁÞÁ ÐÏÛÕËÕ × ÄÉÒÅËÔÏÒ¦§: %s"
+
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "îÅ×ÄÁÞÁ ÐÏÛÕËÕ × ÄÉÒÅËÔÏÒ¦§: %s"
 
-#, c-format
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "îÅ×ÄÁÞÁ ÐÏÛÕËÕ × ÄÉÒÅËÔÏÒ¦§: %s"
+
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "îÅ×ÄÁÞÁ ÐÏÛÕËÕ × ÄÉÒÅËÔÏÒ¦§: %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "æÁËÓ"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "ôÉÔÕÌ"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "úÎÁÊÔÉ"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "úÎÁÊÔÉ"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "×"
 
-msgid "Help"
-msgstr "äÏÐÏÍÏÇÁ"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
 
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
+
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "äÏÍÁÛÎÑ ÁÄÒÅÓÁ"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "äÏÍÁÛÎ¦Ê ÔÅÌÅÆÏÎ"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "äÏÍÁÛÎ¦Ê ÔÅÌÅÆÏÎ"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr "¶ÍÐÏÒÔÕÀÞÉ ÄÁΦ CVS: ÞÉ ÐÅÒÛÉÊ ÒÑÄÏË Í¦ÓÔÉÔØ ÎÁÚ×É ÐÏ̦×?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "äÏÍÁÛÎ¦Ê ÔÅÌÅÆÏÎ"
 
-msgid "Illegal or malformed form data."
-msgstr "îÅËÏÒÅËÔΦ ÁÂÏ ÎÅÓÆÏÒÍÏ×ÁΦ ÄÁΦ ÆÏÒÍÉ."
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "äÏÍÁÛÎ¦Ê ÔÅÌÅÆÏÎ"
 
-msgid "Import Addressbook"
-msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "äÏÍÁÛÎÑ ÁÄÒÅÓÁ"
 
-msgid "Import"
-msgstr "¶ÍÐÏÒÔ"
+#: config/sources.php.dist:506
+msgid "IMSP"
+msgstr ""
 
-msgid "Import/Export Addressbooks"
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr ""
+
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "¶ÍÐÏÒÔ/åËÓÐÏÒÔ áÄÒÅÓÎÉÈ ËÎÉÇ"
 
-msgid "Import/Export"
-msgstr "¶ÍÐÏÒÔ/åËÓÐÏÒÔ"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "îÅËÏÒÅËÔÎÁ ÎÁÚ×Á."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "îÅËÏÒÅËÔÎÁ áÄÒÅÓÎÁ ËÎÉÇÁ."
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "îÅËÏÒÅËÔÎÁ ÁÄÒÅÓÁ Å-ÐÏÛÔÉ."
 
-msgid "Invalid name."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
+msgstr "îÅËÏÒÅËÔÎÁ ÎÁÚ×Á."
+
+#: lib/Driver/ldap.php:266
+msgid "Invalid key specified."
+msgstr ""
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "îÅËÏÒÅËÔÎÁ ÎÁÚ×Á."
+
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
 msgstr "îÅËÏÒÅËÔÎÁ ÎÁÚ×Á."
 
-msgid "Language"
-msgstr "íÏ×Á"
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
 
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "IÍ`Ñ"
+
+#: templates/browse/column_headers.inc:16
+msgid "List"
+msgstr ""
+
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "ÝÏ ×¦ÄÐÏצÄÁ¤"
 
-msgid "Message"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+msgid "Menu List"
+msgstr ""
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "ðÏÛÕË"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "äÏÍÁÛÎ¦Ê ÔÅÌÅÆÏÎ"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+msgid "Move left"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+msgid "Move right"
+msgstr ""
+
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
 
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "IÍ`Ñ"
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
-msgstr "öÏÄÎÁ Ú ÄÏÓÔÕÐÎÉÈ ÁÄÒÅÓÎÉÈ ËÎÉÇ ÎÅ ÓËÏÎƦÇÕÒÏ×ÁÎÁ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ ÷ÁÍÉ "
-"ÎÏ×ÉÈ ÚÁÐÉÓ¦× ÄÏ ÎÉÈ. ñËÝÏ ÷É ××ÁÖÁ¤ÔÅ, ÝÏ ÃÅ ÐÏÍÉÌËÁ, Ú×ÅÒΦÔØÓÑ ÄÏ ÷ÁÛÏÇÏ "
-"ÓÉÓÔÅÍÎÏÇÏ ÁÄͦΦÓÔÒÁÔÏÒÁ."
+#: config/prefs.php.dist:31
+msgid "Name Format"
+msgstr ""
 
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "äÏÄÁÔÉ ÎÏ×ÉÊ ÚÁÐÉÓ"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "IÍ`Ñ"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
+
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "áÄÒÅÓÎÁ ËÎÉÇÁ ÄÏÓÔÕÐÎÁ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
+
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "îÏÔÁÔËÉ"
+
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "îÏÔÁÔËÉ"
 
-msgid "Please choose an address book to add a contact to."
-msgstr "÷ËÁÖ¦ÔØ ÁÄÅÓÎÕ ËÎÉÇÕ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ ÚÁÐÉÓÕ."
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
 
-msgid "Problem?"
-msgstr "ðÒÏÂÌÅÍÁ?"
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
 
-msgid "Reset"
-msgstr "ïÞÉÓÔÉÔÉ"
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
 
-msgid "Save Changes"
-msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ"
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+msgid "Other Options"
+msgstr ""
+
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
+
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
+
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
+
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "ðÏÛÕË"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: templates/prefs/columnselect.inc:239
+msgid "Remove column"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
 
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "úÂÅÒÅÇÔÉ"
 
-msgid "Search Results"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "ðÏÛÕË"
+
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "òÅÚÕÌØÔÁÔÉ ðÏÛÕËÕ"
 
-msgid "Search"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "ðÏÛÕË"
+
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
 msgstr "ðÏÛÕË"
 
-msgid "Search&nbsp;Results"
-msgstr "òÅÚÕÌØÔÁÔ&nbsp;ðÏÛÕËÕ"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "÷ËÁÖ¦ÔØ ÁÄÅÓÎÕ ËÎÉÇÕ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ ÚÁÐÉÓÕ."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "÷ËÁÖ¦ÔØ ÁÄÅÓÎÕ ËÎÉÇÕ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ ÚÁÐÉÓÕ."
 
-msgid "Select the destination to import to:"
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "÷ÉÂÅÒ¦ÔØ ÄÖÅÒÅÌÏ, ÚצÄËÉ ÅËÓÐÏÒÔÕ×ÁÔÉ:"
+
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "÷ËÁÖ¦ÔØ ÐÒÉÚÎÁÞÅÎÎÑ ¦ÍÐÏÒÔÕ:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "÷ÉÂÅÒ¦ÔØ ÄÖÅÒÅÌÏ, ÚצÄËÉ ÅËÓÐÏÒÔÕ×ÁÔÉ:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "÷ÉÂÅÒ¦ÔØ ÄÖÅÒÅÌÏ, ÚצÄËÉ ÅËÓÐÏÒÔÕ×ÁÔÉ:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "÷ÉÂÅÒ¦ÔØ ÆÁÊÌ ÄÌÑ ¦ÍÐÏÒÔÕ:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "÷ËÁÖ¦ÔØ ÆÏÒÍÁÔ ÄÌÑ ÅËÓÐÏÒÔÕ:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "÷ËÁÖ¦ÔØ ÆÏÒÍÁÔ ÄÌÑ ¦ÍÐÏÒÔÕ:"
 
-msgid "Select the source to export from:"
-msgstr "÷ÉÂÅÒ¦ÔØ ÄÖÅÒÅÌÏ, ÚצÄËÉ ÅËÓÐÏÒÔÕ×ÁÔÉ:"
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
+
+#: config/prefs.php.dist:18
+msgid "Select which fields to display in the address lists."
+msgstr ""
 
-msgid "Select your preferred language:"
-msgstr "÷ÉÂÅÒ¦ÔØ ÂÁÖÁÎÕ ÍÏ×Õ:"
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "÷ËÁÖ¦ÔØ ÆÏÒÍÁÔ ÄÌÑ ¦ÍÐÏÒÔÕ:"
 
-msgid "Send Message"
-msgstr "÷¦Ä¦ÓÌÁÔÉ ÌÉÓÔÁ"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "îÅËÏÒÅËÔÎÁ áÄÒÅÓÎÁ ËÎÉÇÁ."
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "÷¦Ä¦ÓÌÁÔÉ ÌÉÓÔÁ ÄÏ %s"
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "äÉÒÅËÔÏÒ¦Ñ"
 
-msgid "Set the your preferred display language."
-msgstr "÷ÓÔÁÎÏצÔØ ÂÁÖÁÎÕ ÍÏ×Õ ×¦ÄÏÂÒÁÖÅÎÎÑ."
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "÷¦ÄÓÕÔΦ ÄÅÑ˦ ËÏÎƦÇÕÒÁæÊΦ ÆÁÊÌÉ ÄÌÑ Turba:"
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr ""
 
-msgid "Success"
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr ""
+
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "äÉÒÅËÔÏÒ¦Ñ"
+
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
 msgstr "õÓЦÛÎÏ"
 
-msgid "The data got lost"
-msgstr "¶ÎÆÏÒÍÁæÀ ×ÔÒÁÞÅÎÏ"
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
+
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
 
-msgid "The data got lost."
-msgstr "¶ÎÆÏÒÍÁæÀ ×ÔÒÁÞÅÎÏ."
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
 
-msgid "The file contained no data."
-msgstr "æÁÊÌ ÎŠͦÓÔÉÔØ ¦ÎÆÏÒÍÁæ§."
+#: data.php:50
+msgid "TSV"
+msgstr ""
 
-msgid "There are no writeable address books."
-msgstr "îÅÍÁ ÖÏÄÎϧ ÁÄÒÅÓÎϧ ËÎÉÇÉ, ÄÏÓÔÕÐÎϧ ÄÌÑ ÚÁÐÉÓÕ×ÁÎÎÑ."
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
+
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÒÏÂÌÅÍÁ ÐÒÉ ÚÁ×ÁÎÔÁÖÅÎΦ ÆÁÊÌÕ. êÏÇÏ ÒÏÚÍ¦Ò ÍÁÂÕÔØ ÐÅÒÅ×ÉÝÕ¤ "
-"ÍÁËÓÉÍÁÌØÎÉÊ ÄÏÚ×ÏÌÅÎÉÊ."
 
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr " %s ÆÁÊÌ ÕÓЦÛÎÏ ¦ÍÐÏÒÔÏ×ÁÎÉÊ"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
+#, fuzzy
+msgid "There are no browseable address books."
+msgstr "îÅÍÁ ÖÏÄÎϧ ÁÄÒÅÓÎϧ ËÎÉÇÉ, ÄÏÓÔÕÐÎϧ ÄÌÑ ÚÁÐÉÓÕ×ÁÎÎÑ."
+
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÄÏÄÁ×ÁÎΦ ÎÏ×ÏÇÏ ÚÁÐÉÓÕ. ú×ÅÒΦÔØÓÑ ÄÏ ÓÉÓÔÅÍÎÏÇÏ "
-"ÁÄͦΦÓÔÒÁÔÏÒÁ."
+"öÏÄÎÁ Ú ÄÏÓÔÕÐÎÉÈ ÁÄÒÅÓÎÉÈ ËÎÉÇ ÎÅ ÓËÏÎƦÇÕÒÏ×ÁÎÁ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ ÷ÁÍÉ ÎÏ×ÉÈ "
+"ÚÁÐÉÓ¦× ÄÏ ÎÉÈ. ñËÝÏ ÷É ××ÁÖÁ¤ÔÅ, ÝÏ ÃÅ ÐÏÍÉÌËÁ, Ú×ÅÒΦÔØÓÑ ÄÏ ÷ÁÛÏÇÏ "
+"ÓÉÓÔÅÍÎÏÇÏ ÁÄͦΦÓÔÒÁÔÏÒÁ."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error deleting this object. Contact your system administrator "
+"There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÚÎÉÝÅÎΦ ÃØÏÇÏ ÚÁÐÉÓÕ. ú×ÅÒΦÔØÓÑ ÄÏ ÓÉÓÔÅÍÎÏÇÏ "
+"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÄÏÄÁ×ÁÎΦ ÎÏ×ÏÇÏ ÚÁÐÉÓÕ. ú×ÅÒΦÔØÓÑ ÄÏ ÓÉÓÔÅÍÎÏÇÏ "
 "ÁÄͦΦÓÔÒÁÔÏÒÁ."
 
-msgid "There was an error importing the data."
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
+
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
 msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
 
-msgid "There was an error importing the uploaded file"
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
 msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ¦ÍÐÏÒÔÕ ÚÁ×ÁÎÔÁÖÅÎÏÇÏ ÆÁÊÌÕ"
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ¦ÍÐÏÒÔÕ ÚÁ×ÁÎÔÁÖÅÎÏÇÏ ÆÁÊÌÕ"
+
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
+
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
+
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
+
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
+
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ¦ÍÐÏÒÔÕ ÚÁ×ÁÎÔÁÖÅÎÏÇÏ ÆÁÊÌÕ"
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ¦ÍÐÏÒÔÕ ÚÁ×ÁÎÔÁÖÅÎÏÇÏ ÆÁÊÌÕ"
+
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ¦ÍÐÏÒÔÕ×ÁÎΦ ÄÁÎÉÈ."
+
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "îÅÍÁ ÖÏÄÎϧ ÁÄÒÅÓÎϧ ËÎÉÇÉ, ÄÏÓÔÕÐÎϧ ÄÌÑ ÚÁÐÉÓÕ×ÁÎÎÑ."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
 msgstr ""
-"ãÅÊ ÆÁÊÌ ×ÉÚÎÁÞÁ¤ ÏÐæ§ ÚÁ ÚÁÍÏ×ÞÕ×ÁÎÎÑÍ ÄÌÑ Turba, Á ÔÁËÏÖ ×ÉÚÎÁÞÁ¤, "
-"Ñ˦ ÏÐæ§ ËÏÒÉÓÔÕ×ÁÞ ÍÏÖÅ ÚͦÎÀ×ÁÔÉ."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
 msgstr ""
-"ãÅÊ ÆÁÊÌ ÏÐÉÓÕ¤ ÓÔÉ̦, Ñ˦ ×ÉÚÎÁÞÁÀÔØ ËÏÌØÏÒÉ ¦ ÛÒÉÆÔÉ ÎÁ ÄÏÄÁÔÏË "
-"(ÁÂÏ ÚÁͦÓÔØ) ×ËÁÚÁÎÉÈ ÄÌÑ Horde ÚÁ ÚÁÍÏ×ÞÕ×ÁÎÎÑÍ."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
+#: data.php:269
+msgid "This file format is not supported."
 msgstr ""
-"ãÅÊ ÆÁÊÌ ×ÉÚÎÁÞÁ¤ ÎÁÚ×É ¦ ÔÉÐÉ ÇÌÏÂÁÌØÎÉÈ ÁÔÒÉÂÕÔ¦× ÄÌÑ Turba - ¦ÍÅÎÁ, "
-"Å-ÐÏÛÔÕ ¦ÔÄ."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "ãÅÊ ÆÁÊÌ ×ÉÚÎÁÞÁ¤ ÐÅÒÅÌ¦Ë ÄÏÓÔÕÐÎÉÈ ÄÖÅÒÅÌ ÄÌÑ Turba."
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
+msgstr "ãÑ ÏÓÏÂÁ ×ÖÅ ÚÁÎÅÓÅÎÁ ÄÏ ÷ÁÛϧ áÄÒÅÓÎϧ ËÎÉÇÉ."
 
+#: config/prefs.php.dist:147
 msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+"This will be the default address book when adding or importing contacts."
 msgstr ""
-"ãÅ ÏÓÎÏ×ÎÉÊ ËÏÎƦÇÕÒÁæÊÎÉÊ ÆÁÊÌ ÄÌÑ Turba. ÷¦Î ͦÓÔÉÔØ ÛÌÑÈÉ ¦ ÐÁÒÁÍÅÔÒÉ "
-"ÄÌÑ ÓÃÅÎÁÒ¦§× Turba."
-
-msgid "This person is already in your addressbook."
-msgstr "ãÑ ÏÓÏÂÁ ×ÖÅ ÚÁÎÅÓÅÎÁ ÄÏ ÷ÁÛϧ áÄÒÅÓÎϧ ËÎÉÇÉ."
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "ôÉÔÕÌ"
 
-msgid "To"
-msgstr "äÏ"
-
-msgid "Turba is not properly configured"
-msgstr "Turba ÎÅ ÓËÏÎƦÇÕÒÏ×ÁÎÁ ÐÒÁ×ÉÌØÎÏ"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "îÅÍÏÖÌÉ×Ï ÚÁ×ÁÎÔÁÖÉÔÉ ×ÉÚÎÁÞÅÎÎÑ ÄÌÑ %s."
 
-msgid "Warning"
-msgstr "õ×ÁÇÁ"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ"
+
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "äÉÒÅËÔÏÒ¦Ñ"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
 
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "äÏÄÁÔÉ ÎÏ×ÉÊ ÚÁÐÉÓ"
+
+#: config/prefs.php.dist:124
+msgid "View to display by default:"
+msgstr ""
+
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
+
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "òÏÂÏÞÁ ÁÄÒÅÓÁ"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "òÏÂÏÞÉÊ ÔÅÌÅÆÏÎ"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "òÏÂÏÞÉÊ ÔÅÌÅÆÏÎ"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "òÏÂÏÞÉÊ ÔÅÌÅÆÏÎ"
+
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "òÏÂÏÞÉÊ ÔÅÌÅÆÏÎ"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "òÏÂÏÞÁ ÁÄÒÅÓÁ"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
+
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
+
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
+
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
+
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
+
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
+
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+msgid "_Browse"
 msgstr ""
-"÷É ÎÅ ÐÒÉËÒ¦ÐÉÌÉ ÖÏÄÅÎ ÁÔÒÉÂÕÔ Ú ¦ÍÐÏÒÔÏ×ÁÎÏÇÏ ÆÁÊÌÕ ÄÏ ×¦ÄÐÏצÄÎÉÈ ÐÏÌ¦× "
-"× Turba."
 
-msgid "Your Information"
-msgstr "÷ÁÛÁ ¶ÎÆÏÒÍÁæÑ"
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "÷ÉÔÅÒÔÉ"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "¶ÍÐÏÒÔ/åËÓÐÏÒÔ"
+
+#: templates/browse/actions.inc:39
+msgid "_Lists"
+msgstr ""
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "¶ÍÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "äÏÄÁÔÉ ÎÏ×ÉÊ ÚÁÐÉÓ"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "ðÏÛÕË"
 
-msgid "[Edit]"
-msgstr "[òÅÄÁÇÕ×ÁÔÉ]"
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "åËÓÐÏÒÔ áÄÒÅÓÎϧ ËÎÉÇÉ"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/lib/base.php
+++ mod/lib/base.php
@@ -2,7 +2,7 @@
 /**
  * Turba base inclusion file.
  *
- * $Horde: turba/lib/base.php,v 1.62.10.8 2005/10/14 16:26:24 chuck Exp $
+ * $Horde: turba/lib/base.php,v 1.62.10.12 2006/03/01 19:31:46 chuck Exp $
  *
  * This file brings in all of the dependencies that every Turba script
  * will need, and sets up objects that all scripts use.
@@ -28,6 +28,10 @@
 $conf = $GLOBALS['conf'];
 @define('TURBA_TEMPLATES', $registry->get('templates'));
 
+// Horde framework libraries.
+require_once 'Horde/Help.php';
+require_once 'Horde/History.php';
+
 // Notification system.
 $notification = &Notification::singleton();
 $notification->attach('status');
@@ -42,41 +46,57 @@
 // Turba source and attribute configuration.
 require TURBA_BASE . '/config/attributes.php';
 require TURBA_BASE . '/config/sources.php';
-$GLOBALS['cfgSources'] = Turba::permissionsFilter($cfgSources, 'source');
+
+// Turba's Horde_Share object.
+require_once 'Horde/Share.php';
+$GLOBALS['turba_shares'] = &Horde_Share::singleton($registry->getApp());
+
+// See if any of our sources are configured to use Horde_Share.
+$haveShare = false;
+foreach ($cfgSources as $key => $cfg) {
+    if (!empty($cfg['use_shares'])) {
+        $haveShare = true;
+    }
+}
+if ($haveShare) {
+    $GLOBALS['cfgSources'] = Turba::getConfigFromShares($cfgSources);
+} else {
+    $GLOBALS['cfgSources'] = $cfgSources;
+}
+$GLOBALS['cfgSources'] = Turba::permissionsFilter($GLOBALS['cfgSources'], 'source');
 $GLOBALS['attributes'] = $attributes;
 
-/* Build the directory sources select widget. */
+// Build the directory sources select widget.
 if (!isset($source)) {
-    $source = Util::getFormData('source', $GLOBALS['prefs']->getValue('default_dir'));
+    $source = Util::getFormData('source', Turba::getDefaultAddressBook());
 }
-$add_source_options = $source_options = '';
-$source_count = 0;
-$addSources = array();
-foreach ($cfgSources as $key => $curSource) {
-    if (!empty($curSource['export'])) {
+$browse_source_options = '';
+$browse_source_count = 0;
+foreach (Turba::getAddressBooks() as $key => $curSource) {
+    if (!empty($curSource['browse'])) {
         $selected = ($key == $source) ? ' selected="selected"' : '';
-        $source_options .= '<option value="' . $key . '" ' . $selected . '>' .
+        $browse_source_options .= '<option value="' . htmlspecialchars($key) . '" ' . $selected . '>' .
             htmlspecialchars($curSource['title']) . '</option>';
-        $source_count++;
+
+        $browse_source_count++;
+
         if (empty($source)) {
             $source = $key;
         }
     }
-    if ($GLOBALS['perms']->hasPermission('turba:sources:' . $key, Auth::getAuth(), PERMS_EDIT) ||
-        (!$GLOBALS['perms']->exists('turba:sources:' . $key) &&
-         (empty($curSource['readonly']) ||
-          (isset($curSource['admin']) &&
-           in_array(Auth::getAuth(), $curSource['admin']))))) {
-        $addSources[$key] = $curSource['title'];
+}
+
+// Hide the list of addressbooks if there is only one available.
+$add_source_options = '';
+$addSources = Turba::getAddressBooks(PERMS_EDIT);
+if (count($addSources) > 1) {
+    foreach ($addSources as $key => $curSource) {
         if ($key != $source) {
-            $add_source_options .= '<option value="' . $key . '">' .
+            $add_source_options .= '<option value="' . htmlspecialchars($key) . '">' .
                 htmlspecialchars($curSource['title']) . '</option>';
         }
     }
 }
 
-// Help.
-require_once 'Horde/Help.php';
-
-/* Start compression, if requested. */
+// Start compression, if requested.
 Horde::compressOutput();


--- orig/browse.php
+++ mod/browse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: turba/browse.php,v 1.76.2.13.2.2 2005/12/10 22:08:34 chuck Exp $
+ * $Horde: turba/browse.php,v 1.76.2.21 2006/03/02 17:18:56 chuck Exp $
  *
  * Turba: Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
  *
@@ -10,16 +10,14 @@
 
 @define('TURBA_BASE', dirname(__FILE__));
 require_once TURBA_BASE . '/lib/base.php';
+require_once TURBA_BASE . '/lib/Object.php';
 require_once TURBA_BASE . '/lib/List.php';
+require_once TURBA_BASE . '/lib/ListView.php';
 
-/* Sort out the sorting values. */
+// Sort out the sorting values.
 if (($sortby = Util::getFormData('sortby')) !== null) {
-    if ($sortby == 'name') {
-        if ($prefs->getValue('name_format') == 'first_last') {
-            $sortby = 'name';
-        } else {
-            $sortby = 'lastname';
-        }
+    if ($sortby == 'name' && $prefs->getValue('name_format') == 'last_first') {
+        $sortby = 'lastname';
     }
     $prefs->setValue('sortby', $sortby);
 }
@@ -29,10 +27,10 @@
 
 $title = _("Address Book Listing");
 
-if (($source_count == 0) && (Util::getFormData('key') != '**search')) {
+if (!$browse_source_count && Util::getFormData('key') != '**search') {
     $notification->push(_("There are no browseable address books."), 'horde.warning');
 } else {
-    $driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+    $driver = &Turba_Driver::singleton($source);
     if (is_a($driver, 'PEAR_Error')) {
         $notification->push(sprintf(_("Failed to access the address book: %s"), $driver->getMessage()), 'horde.error');
         unset($driver);
@@ -42,43 +40,53 @@
 if (isset($driver)) {
     $actionID = Util::getFormData('actionID');
 
-    /* Run through the action handlers. */
+    // Run through the action handlers.
     switch ($actionID) {
     case 'delete':
-        /* Remove a contact from a list. */
         $keys = Util::getFormData('objectkeys');
         if (is_array($keys)) {
             $key = Util::getFormData('key', false);
             if ($key && $key != '**search') {
-                /* We are removing a contact from a list. */
-                $list = $driver->getObject($key);
+                // We are removing a contact from a list.
+                $errorCount = 0;
+                $list = &$driver->getObject($key);
                 foreach ($keys as $sourceKey) {
-                    list($source, $objectKey) = explode(':', $sourceKey, 2);
-                    if (!$list->removeMember($objectKey)) {
-                        $notification->push(_("There was an error removing this object."), 'horde.error');
-                    } else {
-                        $notification->push(_("Contact removed from list."), 'horde.success');
+                    list($objectSource, $objectKey) = explode(':', $sourceKey, 2);
+                    if (strpos($objectKey, ':')) {
+                        list($objectOwner, $objectKey) = explode(':', $objectKey, 2);
+                        $objectSource .= ':' . $objectOwner;
+                    }
+                    if (!$list->removeMember($objectKey, $objectSource)) {
+                        $errorCount++;
                     }
                 }
+                if (!$errorCount) {
+                    $notification->push(sprintf(_("Successfully removed %d contact(s) from list."), count($keys)), 'horde.success');
+                } elseif (count($keys) == $errorCount) {
+                    $notification->push(sprintf(_("Error removing %d contact(s) from list."), count($keys)), 'horde.error');
+                } else {
+                    $notification->push(sprintf(_("Error removing %d of %d requested contact(s) from list."), $errorCount, count($keys)), 'horde.error');
+                }
+                $list->store();
             } else {
-                /* We are deleting an object. */
+                // We are deleting an object.
+                $errorCount = 0;
                 foreach ($keys as $sourceKey) {
-                    list($source, $objectKey) = explode(':', $sourceKey, 2);
-                    if (!$driver->delete($objectKey)) {
-                        $notification->push(_("There was an error deleting this object."), 'horde.error');
+                    list($objectSource, $objectKey) = explode(':', $sourceKey, 2);
+                    if (strpos($objectKey, ':')) {
+                        list($objectOwner, $objectKey) = explode(':', $objectKey, 2);
+                    }
+                    if (is_a($driver->delete($objectKey), 'PEAR_Error')) {
+                        $errorCount++;
                     }
                 }
-            }
-
-            /* Remove the objects from search results too. */
-            if (!empty($_SESSION['turba_search_results'])) {
-                require_once TURBA_BASE . '/lib/Object.php';
-                $list = Turba_List::unserialize($_SESSION['turba_search_results']);
-                foreach ($keys as $sourceKey) {
-                    list($source, $objectKey) = explode(':', $sourceKey, 2);
-                    $list->remove($objectKey);
+                if (!$errorCount) {
+                    $notification->push(sprintf(_("Successfully deleted %d contact(s)."), count($keys)), 'horde.success');
+                } elseif (count($keys) == $errorCount) {
+                    $notification->push(sprintf(_("Error deleting %d contact(s)."), count($keys)), 'horde.error');
+                } else {
+                    $notification->push(sprintf(_("Error deleting %d of %d requested contacts(s)."), $errorCount, count($keys)), 'horde.error');
                 }
-                $_SESSION['turba_search_results'] = $list->serialize();
             }
         }
         break;
@@ -86,30 +94,42 @@
     case 'move':
     case 'copy':
         $keys = Util::getFormData('objectkeys');
-        if (is_array($keys) && count($keys)) {
+        if (is_array($keys) && $keys) {
             // If we have data, try loading the target address book driver.
             $targetSource = Util::getFormData('targetAddressbook');
-            $targetDriver = &Turba_Driver::singleton($targetSource, $cfgSources[$targetSource]);
+            $targetDriver = &Turba_Driver::singleton($targetSource);
+            $max_contacts = Turba::hasPermission($targetSource . ':max_contacts', 'source');
             if (is_a($targetDriver, 'PEAR_Error')) {
                 $notification->push(sprintf(_("Failed to access the address book: %s"), $targetDriver->getMessage()), 'horde.error');
+            } elseif ($max_contacts !== true &&
+                      $max_contacts <= $targetDriver->countContacts()) {
+                $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d contacts in \"%s\"."), $max_contacts, $cfgSources[$targetSource]['title']), ENT_COMPAT, NLS::getCharset());
+                if (!empty($conf['hooks']['permsdenied'])) {
+                    $message = Horde::callHook('_perms_hook_denied', array('turba:max_contacts'), 'horde', $message);
+                }
+                $notification->push($message, 'horde.error', array('content.raw'));
             } else {
                 foreach ($keys as $sourceKey) {
                     // Split up the key into source and object ids.
-                    list($source, $objectKey) = explode(':', $sourceKey, 2);
+                    list($objectSource, $objectKey) = explode(':', $sourceKey, 2);
+                    if (strpos($objectKey, ':')) {
+                        list($objectOwner, $objectKey) = explode(':', $objectKey, 2);
+                        $objectSource .= ':' . $objectOwner;
+                    }
 
                     // Ignore this entry if the target is the same as the
                     // source.
-                    if ($source == $targetDriver->name) {
+                    if ($objectSource == $targetDriver->name &&
+                        !$targetDriver->usingShares) {
                         continue;
                     }
 
                     // Try and load the driver for the source.
-                    $sourceDriver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+                    $sourceDriver = &Turba_Driver::singleton($objectSource);
                     if (is_a($sourceDriver, 'PEAR_Error')) {
                         $notification->push(sprintf(_("Failed to access the address book: %s"), $sourceDriver->getMessage()), 'horde.error');
                     } else {
-                        // Get the object.
-                        $object = $sourceDriver->getObject($objectKey);
+                        $object = &$sourceDriver->getObject($objectKey);
                         if (is_a($object, 'PEAR_Error')) {
                             $notification->push(sprintf(_("Failed to find object to be added: %s"), $object->getMessage()), 'horde.error');
                             continue;
@@ -129,7 +149,11 @@
                             $objAttributes[$info_key] = $object->getValue($info_key);
                         }
 
+                        if ($targetDriver->usingShares) {
+                            $objAttributes['__owner'] = $targetDriver->share->get('uid');
+                        }
                         $result = $targetDriver->add($objAttributes);
+
                         if (is_a($result, 'PEAR_Error')) {
                             $notification->push(sprintf(_("Failed to add %s to %s: %s"), $object->getValue('name'), $targetDriver->title, $result->getMessage()), 'horde.error');
                         } else {
@@ -138,8 +162,8 @@
                             // If we're moving objects, and we succeeded,
                             // delete them from the original source now.
                             if ($actionID == 'move') {
-                                if (!$sourceDriver->delete($objectKey)) {
-                                    $notification->push(sprintf(_("There was an error deleting %s from the source address book."), $object->getValue('name')), 'horde.error');
+                                if (is_a($sourceDriver->delete($objectKey), 'PEAR_Error')) {
+                                    $notification->push(sprintf(_("There was an error deleting \"%s\" from the source address book."), $object->getValue('name')), 'horde.error');
                                 }
                             }
                         }
@@ -150,40 +174,96 @@
         break;
 
     case 'add':
-        /* Add a contact to a list. */
+        // Add a contact to a list.
         $keys = Util::getFormData('objectkeys');
         $targetKey = Util::getFormData('targetList');
         if (empty($targetKey)) {
             break;
         }
-
         if (!Util::getFormData('targetNew')) {
-            $target = $driver->getObject($targetKey);
+            list($targetSource, $targetKey) = explode(':', $targetKey, 2);
+            if (strpos($targetKey, ':')) {
+                list($objectOwner, $targetKey) = explode(':', $targetKey);
+                $targetSource = $targetSource . ':' . $objectOwner;
+            }
+            if (!isset($cfgSources[$targetSource])) {
+                break;
+            }
+            $targetDriver = &Turba_Driver::singleton($targetSource);
+            $target = &$targetDriver->getObject($targetKey);
+            if (is_a($target, 'PEAR_Error')) {
+                $notification->push($target, 'horde.error');
+                break;
+            }
         }
-
-        if (!empty($target) && is_object($target) && $target->isGroup()) {
-            /* Adding contact to an existing list */
+        if (!empty($target) && $target->isGroup()) {
+            // Adding contact to an existing list.
             if (is_array($keys)) {
+                $errorCount = 0;
                 foreach ($keys as $sourceKey) {
-                    list($source, $objectKey) = explode(':', $sourceKey, 2);
-                    $target->addMember($objectKey);
+                    list($objectSource, $objectKey) = explode(':', $sourceKey, 2);
+                    if (strpos($objectKey, ':')) {
+                        list($objectOwner, $objectKey) = explode(':', $objectKey, 2);
+                        $objectSource .= ':' . $objectOwner;
+                    }
+                    if (!$target->addMember($objectKey, $objectSource)) {
+                        $errorCount++;
+                    }
+                }
+                if (!$errorCount) {
+                    $notification->push(sprintf(_("Successfully added %d contact(s) to list."), count($keys)), 'horde.success');
+                } elseif($errorCount == count($keys)) {
+                    $notification->push(sprintf(_("Error adding %d contact(s) to list."), count($keys)), 'horde.error');
+                } else {
+                    $notification->push(sprintf(_("Error adding %d of %d requested contact(s) to list."), $errorCount, count($keys)), 'horde.error');
                 }
                 $target->store();
             }
         } else {
-            /* Adding contact to a new list. */
+            // Check permissions.
+            $max_contacts = Turba::hasPermission($source . ':max_contacts', 'source');
+            if ($max_contacts !== true &&
+                $max_contacts <= $driver->countContacts()) {
+                $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d contacts in \"%s\"."), $max_contacts, $cfgSources[$source]['title']), ENT_COMPAT, NLS::getCharset());
+                if (!empty($conf['hooks']['permsdenied'])) {
+                    $message = Horde::callHook('_perms_hook_denied', array('turba:max_contacts'), 'horde', $message);
+                }
+
+                $notification->push($message, 'horde.error', array('content.raw'));
+                break;
+            }
+            // Adding contact to a new list.
             $newList = array();
-            $newList['__owner'] = Auth::getAuth();
+            if ($driver->usingShares) {
+                $newList['__owner'] = $driver->share->get('uid');
+            } else {
+                $newList['__owner'] = Auth::getAuth();
+            }
             $newList['__type'] = 'Group';
             $newList['name'] = $targetKey;
 
             $targetKey = $driver->add($newList);
-            $target = $driver->getObject($targetKey);
-            if (!empty($target) && is_object($target) && $target->isGroup()) {
+            $target = &$driver->getObject($targetKey);
+            if (!is_a($target, 'PEAR_Error') && $target->isGroup()) {
+                $notification->push(sprintf(_("Successfully created the contact list \"%s\"."), $newList['name']), 'horde.success');
                 if (is_array($keys)) {
+                    $errorCount = 0;
                     foreach ($keys as $sourceKey) {
-                        list($source, $objectKey) = explode(':', $sourceKey, 2);
-                        $target->addMember($objectKey);
+                        list($objectSource, $objectKey) = explode(':', $sourceKey, 2);
+                        if (strpos($objectKey, ':')) {
+                            list($objectOwner, $objectKey) = explode(':', $objectKey, 2);
+                            $objectSource .= ':' . $objectOwner;
+                        }
+                        if (!$target->addMember($objectKey, $objectSource)) {
+                            $errorCount++;
+                        }
+                    }
+                    if (!$errorCount) {
+                        $notification->push(sprintf(_("Successfully added %d contact(s) to list."), count($keys)), 'horde.success');
+                    } elseif ($errorCount == count($keys)) {
+                        $notification->push(sprintf(_("Error adding %d contact(s) to list."), count($keys)), 'horde.error');
+                    } else {
+                        $notification->push(sprintf(_("Error adding %d of %d requested contact(s) to list."), $errorCount, count($keys)), 'horde.error');
                     }
                     $target->store();
                 }
@@ -199,117 +279,73 @@
 if (isset($driver)) {
     $templates[] = '/browse/javascript.inc';
 
-    /* Read the columns to display from the preferences. */
-    $sources = Turba::string2Columns($prefs->getValue('columns'));
+    // Read the columns to display from the preferences.
+    $sources = Turba::getColumns();
     $columns = isset($sources[$source]) ? $sources[$source] : array();
-    $width = floor(90 / (count($columns) + 1));
 
-    /* Determine the name of the column to sort by. */
+    // Determine the name of the column to sort by.
     $sortcolumn = ($prefs->getValue('sortby') == 0 ||
-                   !isset($columns[$prefs->getValue('sortby') - 1])) ?
-        (($prefs->getValue('name_format') == 'first_last') ? 'name' : 'lastname') : $columns[$prefs->getValue('sortby') - 1];
-
-    /* Create list of lists for Add to. */
-    $addToList = array();
-    if (!empty($cfgSources[$source]['map']['__type'])) {
-        $listList = $driver->search(array('__type' => 'Group'));
-        if (is_a($listList, 'PEAR_Error')) {
-            $notification->push($listList, 'horde.error');
-        } else {
-            $listList->reset();
-            $currentList = Util::getFormData('key');
-            while ($listObject = $listList->next()) {
-                if ($listObject->getValue('__key') != $currentList) {
-                    $addToList[] = array('name' => htmlspecialchars($listObject->getValue('name')),
-                                         'key' => htmlspecialchars($listObject->getValue('__key')));
-                }
-            }
-        }
-    }
-
-    if (isset($_SESSION['turba_search_results']) &&
-        (Util::getFormData('key') == '**search')) {
-        /* We are displaying some search results. */
-        $results = Turba_List::unserialize($_SESSION['turba_search_results']);
-        $results->sort($sortcolumn, $prefs->getValue('sortdir'));
-
-        $templates[] = '/browse/search.inc';
-
-        if ($_SESSION['turba_search_mode'] == 'advanced') {
-            $map = $driver->getCriteria();
-            $templates[] = '/browse/search_criteria.inc';
-        }
-
-        $templates[] = '/browse/header.inc';
-        $templates[] = '/browse/actions.inc';
-        $templates[] = '/browse/column_headers.inc';
-
-        $title = _("Search Results");
-        $listType = 'search';
-
-        if ($_SESSION['turba_search_mode'] == 'basic') {
-            $notification->push('document.directory_search.val.focus();', 'javascript');
-        } else {
-            $notification->push('document.directory_search.name.focus();', 'javascript');
-        }
-
-        require_once TURBA_BASE . '/lib/ListView.php';
-        $display = &new Turba_ListView($results, TURBA_TEMPLATES . '/browse/contactrow.inc');
-    } elseif (Util::getFormData('key')) {
-        /* We are displaying the contents of a list. */
-        $list = $driver->getObject(Util::getFormData('key'));
+                   !isset($columns[$prefs->getValue('sortby') - 1]))
+        ? (($prefs->getValue('name_format') == 'first_last')
+           ? 'name'
+           : 'lastname')
+        : $columns[$prefs->getValue('sortby') - 1];
+
+    if (Util::getFormData('key')) {
+        // We are displaying a list.
+        $list = &$driver->getObject(Util::getFormData('key'));
         if (isset($list) && is_object($list) &&
             !is_a($list, 'PEAR_Error') && $list->isGroup()) {
             $title = sprintf(_("Contacts in list: %s"),
                              $list->getValue('name'));
             $templates[] = '/browse/header.inc';
 
-            /* Show List Members. */
+            // Show List Members.
             if (!is_object($results = $list->listMembers($sortcolumn, $prefs->getValue('sortdir')))) {
                 $notification->push(_("Failed to browse list"), 'horde.error');
             } else {
-                $listType = 'list';
-                $templates[] = '/browse/actions.inc';
-                $templates[] = '/browse/column_headers.inc';
-
-                require_once TURBA_BASE . '/lib/ListView.php';
-                $display = &new Turba_ListView($results, TURBA_TEMPLATES . '/browse/contactrow.inc');
+                $view = &new Turba_ListView($results);
+                $view->setType('list');
             }
         } else {
-            $notification->push(_("There was an error displaying the select List"), 'horde.error');
+            $notification->push(_("There was an error displaying the list"), 'horde.error');
         }
     } else {
-        /* We are displaying the contents of the address book. */
-        if (($source_count > 1) ||
-            ($source_count > 0 && empty($cfgSources[$source]['export']))) {
-            $templates[] = '/browse/select.inc';
-        }
-        $title = sprintf(_("Contents of %s"), $cfgSources[$source]['title']);
+        // We are displaying an address book.
+        $title = $cfgSources[$source]['title'];
         $templates[] = '/browse/header.inc';
-        if (empty($cfgSources[$source]['export'])) {
-            $notification->push(_("Your default addressbook is not browseable."), 'horde.warning');
+        if (empty($cfgSources[$source]['browse'])) {
+            $notification->push(_("Your default address book is not browseable."), 'horde.warning');
         } else {
             if (Util::getFormData('show', 'all') == 'contacts') {
-                /* Show Contacts. */
-                $results = $driver->search(array('__type' => 'Object'), $sortcolumn, 'AND', $prefs->getValue('sortdir'));
+                // Show Contacts.
+                $results = $driver->search(array('__type' => 'Object'),
+                                           $sortcolumn,
+                                           'AND',
+                                           $prefs->getValue('sortdir'),
+                                           $columns);
             } elseif (Util::getFormData('show', 'all') == 'lists') {
-                /* Show Lists. */
-                $results = $driver->search(array('__type' => 'Group'), $sortcolumn, 'AND', $prefs->getValue('sortdir'));
+                // Show Lists.
+                $results = $driver->search(array('__type' => 'Group'),
+                                           $sortcolumn,
+                                           'AND',
+                                           $prefs->getValue('sortdir'),
+                                           $columns);
             } else {
-                /* Show All. */
-                $results = $driver->search(array(), $sortcolumn, 'AND', $prefs->getValue('sortdir'));
+                // Show All.
+                $results = $driver->search(array(),
+                                           $sortcolumn,
+                                           'AND',
+                                           $prefs->getValue('sortdir'),
+                                           $columns);
             }
             if (!is_object($results)) {
                 $notification->push(_("Failed to browse the directory"), 'horde.error');
             } elseif (is_a($results, 'PEAR_Error')) {
                 $notification->push($results, 'horde.error');
             } else {
-                $listType = 'directory';
-                $templates[] = '/browse/actions.inc';
-                $templates[] = '/browse/column_headers.inc';
-
-                require_once TURBA_BASE . '/lib/ListView.php';
-                $display = &new Turba_ListView($results, TURBA_TEMPLATES . '/browse/contactrow.inc');
+                $view = &new Turba_ListView($results);
+                $view->setType('directory');
             }
         }
     }
@@ -319,66 +355,12 @@
 
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
-
 foreach ($templates as $template) {
     require TURBA_TEMPLATES . $template;
 }
 
-$footer = 'footer.inc';
-
-if (isset($display) && is_object($display)) {
-    require_once 'Horde/UI/Pager.php';
-    require_once 'Horde/Variables.php';
-    if (!Util::getFormData('source') == '') {
-        $urlSource = Util::getFormData('source');
-    } else {
-        $urlSource = $source;
-    }
-    $viewurl = Util::addParameter('browse.php', array(
-        'sortby' => $sortby,
-        'sortdir' => $sortdir,
-        'key' => Util::getFormData('key'),
-        'source' => $urlSource
-    ));
-
-    if (Util::getFormData('key') == '**search') {
-        $page = Util::getFormData('page', 0);
-        $numitem = $results->count();
-        $maxpage = $prefs->getValue('maxpage');
-        $perpage = $prefs->getValue('perpage');
-
-        $min = $page * $perpage;
-        while ($min > $numitem) {
-            $page--;
-            $min = $page * $perpage;
-        }
-        $max = $min + $perpage;
-
-        $start = ($page * $perpage) + 1;
-        $end = min($numitem, $start + $perpage - 1);
-
-        $numDisplayed = $display->display($min, $max);
-
-        $vars = &Variables::getDefaultVariables();
-        $pager = &new Horde_UI_Pager('page', $vars,
-                                     array('num' => $numDisplayed,
-                                           'url' => $viewurl,
-                                           'page_count' => $maxpage,
-                                           'perpage' => $perpage));
-    } else {
-        $page = Util::getFormData('page', '*');
-        if (empty($page) || !preg_match('/^[A-Za-z*]$/', $page)) {
-            $page = '*';
-        }
-
-        $display->displayAlpha($page);
-        $numDisplayed = $results->count();
-        $footer = 'footerAlpha.inc';
-    }
-
-    require TURBA_TEMPLATES . '/browse/column_footers.inc';
-    require TURBA_TEMPLATES . '/browse/actions.inc';
+if (isset($view) && is_object($view)) {
+    $view->display();
 }
 
-require TURBA_TEMPLATES . '/browse/' . $footer;
 require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/templates/menu.inc
+++ mod/templates/menu.inc
@@ -1,5 +1,15 @@
+<form name="directory_list" action="browse.php" method="get">
+<?php echo Util::formInput() ?>
 <div id="menu">
+<?php if ($browse_source_count > 1): ?>
+ <span class="rightFloat">
+  <select name="source" onchange="document.directory_list.submit();"><?php echo $browse_source_options ?></select>
+  <noscript><input class="button" type="submit" value="<?php echo _("Browse") ?>" /></noscript>
+ </span>
+<?php endif; ?>
+<span class="leftFloat">
  <?php echo Turba::getMenu('string') ?>
+</span>
 </div>
-<br id="menuSpacer" />
+</form>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>


--- orig/lib/Object.php
+++ mod/lib/Object.php
@@ -1,30 +1,359 @@
 <?php
-
-require_once TURBA_BASE . '/lib/AbstractObject.php';
-
 /**
- * The Turba_Object:: class provides a set of methods for dealing with
- * individual Turba objects - whether those are people, restaurants, etc.
+ * The Turba_Object:: class provides a base implementation for Turba
+ * objects - people, groups, restaurants, etc.
  *
- * $Horde: turba/lib/Object.php,v 1.17.10.1 2005/04/21 11:27:04 selsky Exp $
+ * $Horde: turba/lib/Object.php,v 1.17.10.2 2005/10/18 12:50:05 jan Exp $
  *
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @author  Jon Parise <jon at csh.rit.edu>
- * @since   Turba 0.0.1
  * @package Turba
  */
-class Turba_Object extends Turba_AbstractObject {
+class Turba_Object {
+
+    /**
+     * Underlying driver.
+     *
+     * @var Turba_Driver
+     */
+    var $driver;
+
+    /**
+     * Hash of attributes for this contact.
+     *
+     * @var array
+     */
+    var $attributes;
+
+    /**
+     * Reference to this object's VFS instance.
+     *
+     * @var VFS
+     */
+    var $_vfs;
 
     /**
-     * Constructs a new Turba_Object() object.
+     * Constructs a new Turba_Object object.
      *
-     * @param Turba_Driver $driver  Hash describing the object Driver.
+     * @param Turba_Driver $driver  The source that this object came from.
      * @param array $attributes     Hash of attributes for this object.
      */
     function Turba_Object(&$driver, $attributes = array())
     {
-        parent::Turba_AbstractObject($driver, $attributes);
+        $this->driver = &$driver;
+        $this->attributes = $attributes;
         $this->attributes['__type'] = 'Object';
     }
 
+    /**
+     * Returns a key-value hash containing all properties of this object.
+     *
+     * @return array  All properties of this object.
+     */
+    function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * Returns the name of the address book that this object is from.
+     */
+    function getSource()
+    {
+        return $this->driver->name;
+    }
+
+    /**
+     * Returns the value of the specified attribute.
+     *
+     * @param string $attribute  The attribute to retrieve.
+     *
+     * @return string  The value of $attribute, or the empty string.
+     */
+    function getValue($attribute)
+    {
+        /* Cache hooks to avoid multiple file_exists() calls. */
+        static $hooks;
+        if (!isset($hooks)) {
+            $hooks = array();
+            if (file_exists(HORDE_BASE . '/config/hooks.php')) {
+                require HORDE_BASE . '/config/hooks.php';
+            }
+        }
+        if (!isset($hooks[$attribute])) {
+            $function = '_turba_hook_decode_' . $attribute;
+            if (function_exists($function)) {
+                $hooks[$attribute] = $function;
+            } else {
+                $hooks[$attribute] = false;
+            }
+        }
+
+        if (isset($this->attributes[$attribute]) && !empty($hooks[$attribute])) {
+            return call_user_func($hooks[$attribute], $this->attributes[$attribute], $this);
+        }
+
+        if (isset($this->driver->map[$attribute]) &&
+            is_array($this->driver->map[$attribute])) {
+            $args = array($this->driver->map[$attribute]['format']);
+            foreach ($this->driver->map[$attribute]['fields'] as $field) {
+                $args[] = $this->getValue($field);
+            }
+            return call_user_func_array('sprintf', $args);
+        } else {
+            return isset($this->attributes[$attribute]) ? $this->attributes[$attribute] : null;
+        }
+    }
+
+    /**
+     * Sets the value of the specified attribute.
+     *
+     * @param string $attribute  The attribute to set.
+     * @param string $value      The value of $attribute.
+     */
+    function setValue($attribute, $value)
+    {
+        /* Cache hooks to avoid multiple file_exists() calls. */
+        static $hooks;
+        if (!isset($hooks)) {
+            $hooks = array();
+            if (file_exists(HORDE_BASE . '/config/hooks.php')) {
+                require HORDE_BASE . '/config/hooks.php';
+            }
+        }
+        if (!isset($hooks[$attribute])) {
+            $function = '_turba_hook_encode_' . $attribute;
+            if (function_exists($function)) {
+                $hooks[$attribute] = $function;
+            } else {
+                $hooks[$attribute] = false;
+            }
+        }
+        if ($hooks[$attribute]) {
+            $value = call_user_func($hooks[$attribute], $value, $this->attributes[$attribute], $this);
+        }
+
+        if (isset($this->driver->map[$attribute]) &&
+            is_array($this->driver->map[$attribute])) {
+            return false;
+        }
+
+        $this->attributes[$attribute] = $value;
+        return true;
+    }
+
+    /**
+     * Determines whether or not the object has a value for the specified
+     * attribute.
+     *
+     * @param string $attribute  The attribute to check.
+     *
+     * @return boolean  Whether or not there is a value for $attribute.
+     */
+    function hasValue($attribute)
+    {
+        if (isset($this->driver->map[$attribute]) &&
+            is_array($this->driver->map[$attribute])) {
+            foreach ($this->driver->map[$attribute]['fields'] as $field) {
+                if ($this->hasValue($field)) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return !is_null($this->getValue($attribute));
+        }
+    }
+
+    /**
+     * Returns true if this object is a group of multiple contacts.
+     *
+     * @return boolean  True if this object is a group of multiple contacts.
+     */
+    function isGroup()
+    {
+        return false;
+    }
+
+    /**
+     * Returns true if this object is editable by the current user.
+     *
+     * @return boolean  Whether or not the current user can edit this object
+     */
+    function isEditable()
+    {
+       return $this->driver->hasPermission(PERMS_EDIT);
+    }
+
+    /**
+     * Returns whether or not the current user has the requested permission.
+     *
+     * @param integer $perm  The permission to check.
+     *
+     * @return boolean True if user has the permission.
+     */
+    function hasPermission($perm)
+    {
+        return $this->driver->hasPermission($perm);
+    }
+
+    /**
+     * Saves a file into the VFS backend associated with this object.
+     *
+     * @param array $info  A hash with the file information as returned from a
+     *                     Horde_Form_Type_file.
+     */
+    function addFile($info)
+    {
+        $this->_vfsInit();
+
+        $dir = TURBA_VFS_PATH . '/' . $this->getValue('__uid');
+        $file = $info['name'];
+        while ($this->_vfs->exists($dir, $file)) {
+            if (preg_match('/(.*)\[(\d+)\](\.[^.]*)?$/', $file, $match)) {
+                $file = $match[1] . '[' . ++$match[2] . ']' . $match[3];
+            } else {
+                $dot = strrpos($file, '.');
+                if ($dot === false) {
+                    $file .= '[1]';
+                } else {
+                    $file = substr($file, 0, $dot) . '[1]' . substr($file, $dot);
+                }
+            }
+        }
+
+        return $this->_vfs->write($dir, $file, $info['tmp_name'], true);
+    }
+
+    /**
+     * Deletes a file from the VFS backend associated with this object.
+     *
+     * @param string $file  The file name.
+     */
+    function deleteFile($file)
+    {
+        $this->_vfsInit();
+
+        return $this->_vfs->deleteFile(TURBA_VFS_PATH . '/' . $this->getValue('__uid'), $file);
+    }
+
+    /**
+     * Deletes all files from the VFS backend associated with this object.
+     */
+    function deleteFiles()
+    {
+        $this->_vfsInit();
+
+        if ($this->_vfs->exists(TURBA_VFS_PATH, $this->getValue('__uid'))) {
+            return $this->_vfs->deleteFolder(TURBA_VFS_PATH, $this->getValue('__uid'), true);
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns all files from the VFS backend associated with this object.
+     *
+     * @return array  A list of hashes with file informations.
+     */
+    function listFiles()
+    {
+        $this->_vfsInit();
+
+        if ($this->_vfs->exists(TURBA_VFS_PATH, $this->getValue('__uid'))) {
+            return $this->_vfs->listFolder(TURBA_VFS_PATH . '/' . $this->getValue('__uid'));
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Returns a link to display and download a file from the VFS backend
+     * associated with this object.
+     *
+     * @param string $file  The file name.
+     *
+     * @return string  The HTML code of the generated link.
+     */
+    function vfsDisplayUrl($file)
+    {
+        global $registry, $mime_drivers_map, $mime_drivers;
+
+        require_once 'Horde/MIME/Magic.php';
+        require_once 'Horde/MIME/Part.php';
+        require_once 'Horde/MIME/Viewer.php';
+        require_once HORDE_BASE . '/config/mime_drivers.php';
+        require_once TURBA_BASE . '/config/mime_drivers.php';
+
+        $mime_part = &new MIME_Part(MIME_Magic::extToMIME($file['type']), '');
+        $viewer = &MIME_Viewer::factory($mime_part);
+
+        // We can always download files.
+        $url_params = array('actionID' => 'download_file',
+                            'file' => $file['name'],
+                            'type' => $file['type'],
+                            'source' => $this->driver->name,
+                            'key' => $this->getValue('__key'));
+        $dl = Horde::link(Horde::downloadUrl($file['name'], $url_params), $file['name']) . Horde::img('download.png', _("Download"), array('align' => 'middle'), $registry->getImageDir('horde')) . '</a>';
+
+        // Let's see if we can view this one, too.
+        if ($viewer && !is_a($viewer, 'MIME_Viewer_default')) {
+            $url = Horde::applicationUrl('view.php');
+            $url_params['actionID'] = 'view_file';
+            $url = Util::addParameter($url, $url_params);
+            $link = Horde::link($url, $file['name'], null, '_blank') . $file['name'] . '</a>';
+        } else {
+            $link = $file['name'];
+        }
+
+        return $link . ' ' . $dl;
+    }
+
+
+    /**
+     * Returns a link to display, download, and delete a file from the VFS
+     * backend associated with this object.
+     *
+     * @param string $file  The file name.
+     *
+     * @return string  The HTML code of the generated link.
+     */
+    function vfsEditUrl($file)
+    {
+        $url_params = array('actionID' => 'delete_vfs',
+                            'file' => $file['name'],
+                            'source' => $this->driver->name,
+                            'key' => $this->getValue('__key'));
+        $url = Util::addParameter(Horde::applicationUrl('edit.php'), $url_params);
+        $link = $this->vfsDisplayUrl($file) . ' ' . Horde::link($url) . Horde::img('delete.png', _("Delete"), array('align' => 'middle'), $GLOBALS['registry']->getImageDir('horde')) . '</a>';
+        return $link;
+    }
+
+    /**
+     * Saves the current state of the object to the storage backend.
+     */
+    function store()
+    {
+        $object_id = $this->driver->save($this);
+        if (is_a($object_id, 'PEAR_Error')) {
+            return $object_id;
+        }
+
+        return $this->setValue('__key', $object_id);
+    }
+
+    /**
+     * Loads the VFS configuration and initializes the VFS backend.
+     */
+    function _vfsInit()
+    {
+        if (!isset($this->_vfs)) {
+            $v_params = Horde::getVFSConfig('documents');
+            if (is_a($v_params, 'PEAR_Error')) {
+                Horde::fatal($v_params, __FILE__, __LINE__);
+            }
+            require_once 'VFS.php';
+            $this->_vfs = &VFS::singleton($v_params['type'], $v_params['params']);
+        }
+    }
 }


--- orig/lib/Renderer.php
+++ mod/lib/Renderer.php
@@ -5,7 +5,7 @@
 /**
  * Turba Form Renderer
  *
- * $Horde: turba/lib/Renderer.php,v 1.19 2004/11/24 17:30:14 jan Exp $
+ * $Horde: turba/lib/Renderer.php,v 1.19.6.1 2005/10/18 12:50:05 jan Exp $
  *
  * @package Turba
  */
@@ -33,24 +33,29 @@
 
     function _sectionHeader($title)
     {
-?><div class="header">
-<?php
-if (!$this->_active && is_a($this->_object, 'Turba_AbstractObject')) {
-    $edit = Turba::hasPermission($this->_object, 'object', PERMS_EDIT);
-    $delete = Turba::hasPermission($this->_object, 'object', PERMS_DELETE);
-    if ($edit || $delete) {
-        $url = Util::addParameter('', 'source', $this->_object->driver->name);
-        $url = Util::addParameter($url, 'key', $this->_object->getValue('__key'));
-?>
- <span class="smallheader" style="float:right">
-  <?php if ($edit) echo Horde::link(Horde::applicationUrl('edit.php' . $url), _("Edit")) . _("Edit") ?></a>
-  <?php if ($edit && $delete) echo ' | ' ?>
-  <?php if ($delete) echo Horde::link(Horde::applicationUrl('delete.php' . $url), _("Delete")) . _("Delete") ?></a>
- </span>
-<?php   }
-    } ?>
- <?php echo htmlspecialchars($title) ?>
-</div><?php
+        $actions = array();
+        if (!$this->_active && is_a($this->_object, 'Turba_Object')) {
+            $params = array('source' => $this->_object->driver->name,
+                            'key'    => $this->_object->getValue('__key'));
+            if ($this->_object->hasPermission(PERMS_EDIT)) {
+                $url = Util::addParameter(Horde::applicationUrl('edit.php'), $params);
+                $actions[] = '<li>' . Horde::link($url, _("Edit")) . _("Edit") . '</a>';
+            }
+            if ($this->_object->hasPermission(PERMS_DELETE)) {
+                $url = Util::addParameter(Horde::applicationUrl('delete.php'), $params);
+                $actions[] = '<li>' .
+                    Horde::link($url, _("Delete"), '', '',
+                                $GLOBALS['prefs']->getValue('delete_opt') ?
+                                'return window.confirm(\'' . addslashes(_("Really delete this contact?")) . '\');' : '') .
+                    _("Delete") . '</a>';
+            }
+        }
+        echo '<div class="header">';
+        if (!empty($actions)) {
+            echo '<ul>' . implode(' | </li>', $actions) . '</li></ul>';
+        }
+        echo htmlspecialchars($title);
+        echo '</div>';
     }
 
 }


--- orig/test.php
+++ mod/test.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * $Horde: turba/test.php,v 1.9.10.2 2005/03/05 23:15:55 chuck Exp $
+ * $Horde: turba/test.php,v 1.9.10.4 2006/01/01 21:29:15 jan Exp $
  *
- * Copyright 2000-2005 Brent J. Nordquist <bjn at horde.org>
+ * Copyright 2000-2006 Brent J. Nordquist <bjn at horde.org>
  *
- * See the enclosed file LICENSE for license information (ASL).  If you                      
+ * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
  */
 


--- orig/templates/browse/javascript.inc
+++ mod/templates/browse/javascript.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function AnySelected()
@@ -24,16 +24,20 @@
         return false;
     }
 
-    document.contacts.targetList.value = key;
-
-    if (key == "*new*") {
-        var newList = window.prompt('<?php echo addslashes(_("You are creating a distribution list.")) . '\n' . addslashes(_("Please enter the name of the new list:")) ?>\n', '');
+    if (key.indexOf(':') == -1 || key.lastIndexOf(':') == key.length - 1) {
+        var newList = window.prompt('<?php echo addslashes(_("Please name the new contact list:")) ?>\n', '');
         if (newList != null && newList != '') {
+            if (key.lastIndexOf(':') == key.length - 1) {
+                key = key.substr(0, key.length - 1);
+            }
+            document.contacts.source.value = key;
             document.contacts.targetNew.value = 1;
             document.contacts.targetList.value = newList;
         } else {
             return false;
         }
+    } else {
+        document.contacts.targetList.value = key;
     }
 
     Submit('add');


--- orig/po/et_EE.po
+++ mod/po/et_EE.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 2.0-cvs\n"
-"POT-Creation-Date: 2002-03-30 21:34+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2004-06-02 10:49+0200\n"
 "Last-Translator: Toomas Aas <toomas.aas at mail.ee>\n"
 "Language-Team: Estonian <dev at lists.horde.org>\n"
@@ -12,355 +13,1367 @@
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#, c-format
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
+
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "%s faili import õnnestus"
 
-msgid "Add Contact ..."
-msgstr "Lisa aadress ..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "Lisa uus aadress"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Aadressiraamatu import"
 
-msgid "Add failed"
-msgstr "Lisamine ebaõnnestus"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
 
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Lisa"
 
-msgid "Addressbook is read-only."
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Vigane aadressiraamat."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Ükski aadressiraamat ei luba salvestamist"
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "lisa veerg"
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "Lisamine ebaõnnestus"
+
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "Lisa"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Aadressiraamatu import"
+
+#: browse.php:28 config/prefs.php.dist:125
+#, fuzzy
+msgid "Address Book Listing"
 msgstr "Aadressiraamatul on kirjutuskaitse"
 
-msgid "Advanced Directory Search"
-msgstr "Põhjalik kataloogiotsing"
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Aadressiraamatu import"
 
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "Aadressiraamatul on kirjutuskaitse"
+
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "%s faili import õnnestus"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Aadressiraamatul on kirjutuskaitse"
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Põhjalik otsing"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr ""
 
-msgid "Available Columns:"
-msgstr "Kasutatavad veerud:"
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
+
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
+
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "Otsing"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
+
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
 
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Sirvi"
 
-msgid "Cancel"
-msgstr "Loobu"
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "Mobiiltelefon"
+#: data.php:49
+msgid "CSV"
+msgstr ""
 
-msgid "Choose the order of the columns to display in the address list."
-msgstr "Vali veergude järjestus aadresside nimekirjas."
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
+
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "Vigane aadressiraamat."
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Vigane aadressiraamat."
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
 
-msgid "Clear Search"
-msgstr "Tühjenda otsing"
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr "Vali veergude järjestus aadresside nimekirjas."
 
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Veeru seaded"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Firma"
 
-#, c-format
-msgid "Contents of %s"
-msgstr "Aadressiraamat: %s"
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Kodune aadress"
+
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Kustutamine ebaõnnestus"
 
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "Kustutamine ebaõnnestus"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "Firma"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Aadressiraamatu eksport"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
+
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Kustuta"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Aadressiraamatu eksport"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Kustutamine ebaõnnestus"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Kustutamine ebaõnnestus"
 
-msgid "Directory Listing"
-msgstr "Kataloog"
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
 
-msgid "Directory Search"
-msgstr "Kataloogiotsing"
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "Kasutaja seaded"
 
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Kataloog"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Näita"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Näita"
 
-#, c-format
-msgid "Edit '%s'"
-msgstr "Paranda '%s'"
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
 
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Paranda"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Paranda '%s'"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Aadressiraamatu eksport"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "E-mail"
 
-msgid "Export Addressbook"
-msgstr "Aadressiraamatu eksport"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
 
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s faili import õnnestus"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Ükski aadressiraamat ei luba salvestamist"
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Eksport"
 
-#, c-format
-msgid "Failed to browse the directory: %s"
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "Aadressiraamatu eksport"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
+msgstr "Otsing kataloogist %s ebaõnnestus"
+
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Otsing kataloogist %s ebaõnnestus"
+
+#: browse.php:272
+#, fuzzy
+msgid "Failed to browse list"
 msgstr "Kataloogi %s sirvimine ebaõnnestus"
 
-msgid "Failed to connect to the specified directory."
-msgstr "Ei saanud valitud kataloogiga ühendust"
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
+msgstr "Kataloogi %s sirvimine ebaõnnestus"
 
-#, c-format
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "Otsing kataloogist %s ebaõnnestus"
+
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Otsing kataloogist %s ebaõnnestus"
+
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Otsing kataloogist %s ebaõnnestus"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Faks"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Amet"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Leia"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Leia"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Kellelt"
 
-msgid "Help"
-msgstr "Abi"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Aadressiraamatu eksport"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
 
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Kodune aadress"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "Kodune telefon"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Kodune telefon"
 
-msgid "If importing CSV data: does the first row contain the field names?"
-msgstr ""
-"Kui impordid CSV formaadis andmeid: kas esimene rida sisaldab väljade "
-"nimesid?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Kodune telefon"
 
-msgid "Illegal or malformed form data."
-msgstr "Lubamatud andmed või valesti täidetud vorm."
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "Kodune telefon"
 
-msgid "Import Addressbook"
-msgstr "Aadressiraamatu import"
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Kodune aadress"
 
-msgid "Import"
+#: config/sources.php.dist:506
+msgid "IMSP"
 msgstr ""
 
-msgid "Import/Export Addressbooks"
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr ""
+
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
+msgstr "Aadressiraamatu import"
+
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "Aadressiraamatute import/eksport"
 
-msgid "Import/Export"
-msgstr "Import/Eksport"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Vigane nimi."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "Vigane aadressiraamat."
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "Vigane e-maili aadress."
 
-msgid "Invalid name."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
+msgstr "Vigane nimi."
+
+#: lib/Driver/ldap.php:266
+msgid "Invalid key specified."
+msgstr ""
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "Vigane nimi."
+
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
 msgstr "Vigane nimi."
 
-msgid "Language"
-msgstr "Keel"
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Nimi"
 
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Nimekiri"
 
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr " mis sisaldab "
 
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Nimekiri"
+
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "Otsing"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Kodune telefon"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "tõsta vasakule"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "tõsta paremale"
+
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "Aadressiraamatu eksport"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Aadressiraamatu import"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Aadressiraamatu eksport"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nimi"
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+#: config/prefs.php.dist:31
+msgid "Name Format"
 msgstr ""
-"Ükski kasutatav aadressiraamat ei võimalda sul aadresse lisada. Kui see on "
-"sinu arvates viga, võta ühendust süsteemi administraatoriga."
 
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "Lisa uus aadress"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Nimi"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
+
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "Aadressiraamatul on kirjutuskaitse"
+
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "Märkmed"
+
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Märkmed"
 
-msgid "Options"
-msgstr "Häälestus"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
 
-msgid "Please choose an address book to add a contact to."
-msgstr "Palun vali aadressiraamat kuhu aadress lisada."
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
 
-msgid "Please select a directory:"
-msgstr "Palun vali kataloog:"
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
 
-msgid "Problem?"
-msgstr "Probleem?"
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
-msgid "Reset"
+#: lib/api.php:774
+msgid "Only one vcard supported."
 msgstr ""
 
-msgid "Save Changes"
-msgstr "Salvesta muutused"
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "Kasutaja seaded"
+
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
+
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "Aadressiraamatu import"
+
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
+
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
+
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Aadressiraamatu eksport"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Otsing"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Aadressiraamatu import"
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "eemalda veerg"
+
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
+
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
 
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Salvesta"
 
-msgid "Search Results"
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
+msgid "Search"
+msgstr "Otsing"
+
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Otsingu tulemus"
 
-msgid "Search"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "Otsing"
+
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
 msgstr "Otsing"
 
-msgid "Search&nbsp;Results"
-msgstr "Otsingu&nbsp;tulemus"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Palun vali aadressiraamat kuhu aadress lisada."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Palun vali aadressiraamat kuhu aadress lisada."
+
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Kust eksportida:"
 
-msgid "Select the destination to import to:"
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "Kuhu importida:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Kust eksportida:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "Kust eksportida:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Vali imporditav fail:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "Vali ekspordi formaat:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "Vali imporditav formaat:"
 
-msgid "Select the source to export from:"
-msgstr "Kust eksportida:"
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
 
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Vali milliseid välju näidata aadresside nimekirjades."
 
-msgid "Select your preferred language:"
-msgstr "Vali oma lemmikkeel:"
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "Vali milliseid välju näidata aadresside nimekirjades."
 
-msgid "Selected Columns:"
-msgstr "Valitud veerud:"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "Vigane aadressiraamat."
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "Saada kiri %s'le"
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Kataloog"
 
-msgid "Set the your preferred display language."
-msgstr "Vali oma lemmikkeel."
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
 
-msgid "Set your preferred display language."
-msgstr "Vali oma lemmikkeel."
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Mõned Turba konfiguratsioonifailid on puudu:"
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr ""
 
-msgid "The data got lost."
-msgstr "Andmed läksid kaotsi."
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr ""
 
-msgid "The data was lost"
-msgstr "Andmed läksid kaotsi"
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "Kataloog"
 
-msgid "The file contained no data."
-msgstr "See fail ei sisaldanud andmeid."
+#: lib/api.php:198
+msgid "Sources"
+msgstr ""
 
-msgid "There are no writeable address books."
-msgstr "Ükski aadressiraamat ei luba salvestamist"
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
 msgstr ""
-"Faili serverisse laadimisel tekkis probleem. Võib-olla on fail suurem kui "
-"maksimaalne lubatud suurus."
 
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
+
+#: data.php:50
+msgid "TSV"
+msgstr ""
+
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
+msgstr ""
+
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr ""
+
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s faili import õnnestus"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
+#, fuzzy
+msgid "There are no browseable address books."
+msgstr "Ükski aadressiraamat ei luba salvestamist"
+
+#: add.php:29
+#, fuzzy
 msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"Selle objekti lisamisel tekkis viga. Abi saamiseks võta ühendust süsteemi "
-"administraatoriga."
+"Ükski kasutatav aadressiraamat ei võimalda sul aadresse lisada. Kui see on "
+"sinu arvates viga, võta ühendust süsteemi administraatoriga."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"There was an error deleting this object. Contact your system administrator "
+"There was an error adding the new contact. Contact your system administrator "
 "for further help."
 msgstr ""
-"Selle objekti kustutamisel tekkis viga. Abi saamiseks võta ühendust süsteemi "
+"Selle objekti lisamisel tekkis viga. Abi saamiseks võta ühendust süsteemi "
 "administraatoriga."
 
-msgid "There was an error importing the data."
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Andmete impordil tekkis viga."
+
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
 msgstr "Andmete impordil tekkis viga."
 
-msgid "There was an error importing the uploaded file"
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
 msgstr "Laetud faili importimisel tekkis viga"
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "Laetud faili importimisel tekkis viga"
+
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "Andmete impordil tekkis viga."
+
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "Andmete impordil tekkis viga."
+
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "Andmete impordil tekkis viga."
+
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "Andmete impordil tekkis viga."
+
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "Andmete impordil tekkis viga."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Andmete impordil tekkis viga."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "Laetud faili importimisel tekkis viga"
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Laetud faili importimisel tekkis viga"
+
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "Andmete impordil tekkis viga."
+
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "Ükski aadressiraamat ei luba salvestamist"
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
 msgstr ""
-"See fail määrab Turba vaikeparameetrid ning määrab ka selle, milliseid "
-"parameetreid kasutajad saavad muuta."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
 msgstr ""
-"See fail kontrollib värve ja kirjastiile, asendades vajaduse korral Horde "
-"vastavad parameetrid."
 
-msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
+#: data.php:269
+msgid "This file format is not supported."
 msgstr ""
-"See fail defineerib Turba globaalsed atribuudinimed ja -tüübid: nimed, e-"
-"maili aadressid jne."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "See fail määrab, milliseid andmeallikaid Turba saab kasutada."
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
+msgstr "See isik on juba sinu aadressiraamatus."
 
+#: config/prefs.php.dist:147
 msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+"This will be the default address book when adding or importing contacts."
 msgstr ""
-"See on peamine Turba konfiguratsioonifail. Ta sisaldab kataloogiteid ja "
-"seadeid Turba skriptide jaoks."
-
-msgid "This person is already in your addressbook."
-msgstr "See isik on juba sinu aadressiraamatus."
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Amet"
 
-msgid "Turba is not properly configured"
-msgstr "Turba ei ole korralikult häälestatud"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Ei suuda laadida %s definitsiooni."
 
-msgid "User Options"
-msgstr "Kasutaja seaded"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "Salvesta muutused"
+
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
 
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Kataloog"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "Lisa uus aadress"
+
+#: config/prefs.php.dist:124
+msgid "View to display by default:"
+msgstr ""
+
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
+
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Tööaadress"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "Töötelefon"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Töötelefon"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
-msgstr "Sa ei seadnud imporditava faili väljadele vastavaid Turba välju."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Töötelefon"
 
-msgid "Your Information"
-msgstr "Sinu info"
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "Töötelefon"
 
-msgid "[Edit]"
-msgstr "[Paranda]"
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Tööaadress"
 
-msgid "add column"
-msgstr "lisa veerg"
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-msgid "move left"
-msgstr "tõsta vasakule"
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
 
-msgid "move right"
-msgstr "tõsta paremale"
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
 
-msgid "remove column"
-msgstr "eemalda veerg"
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
+
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
+
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
+
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "Sirvi"
+
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "Kustuta"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "Import/Eksport"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Nimekiri"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Aadressiraamatu import"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Lisa uus aadress"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "Otsing"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "Aadressiraamatu eksport"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/po/ca_ES.po
+++ mod/po/ca_ES.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Turba 1.1\n"
-"POT-Creation-Date: 2003-02-18 09:39+0100\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-02-18 09:39+0100\n"
 "Last-Translator: Angels Guimerà <Angels.Guimera at uab.es>\n"
 "Language-Team: Catalan <dev at lists.horde.org>\n"
@@ -13,382 +14,1375 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: templates/prefs/imsp_opt.inc:42
+msgid " Add an IMSP Address Book"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:31
+msgid " Delete IMSP Address Book"
+msgstr ""
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
+msgid "\"Firstname Lastname\"  (ie. John Doe)"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "\"Lastname, Firstname\" (ie. Doe, John)"
+msgstr ""
+
+#: add.php:109
+#, php-format
+msgid "%s added."
+msgstr ""
 
-#, c-format
+#: data.php:343
+#, php-format
 msgid "%s file successfully imported"
 msgstr "L'arxiu %s ha estat importat satisfactòriament"
 
-msgid "Add Contact ..."
-msgstr "Afegir Contacte ..."
+#: templates/browse/footer.inc:5
+#, php-format
+msgid "%s to %s of %s"
+msgstr ""
 
-msgid "Add a new contact"
-msgstr "Afegir nou contacte"
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Importar Llibreta d'adreces"
 
-msgid "Add failed"
-msgstr "Ha fallat al afegir"
+#: lib/Block/minisearch.php:45
+msgid "A browser that supports iFrames is required"
+msgstr ""
+
+#: config/prefs.php.dist:159
+msgid "Above search form"
+msgstr ""
 
+#: view.php:52
+#, php-format
+msgid "Access denied to %s"
+msgstr ""
+
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Afegir"
 
-msgid "Addressbook is read-only."
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "La llibreta d'adreces no és vàlida."
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "No hi ha llibretes d'adreces on es pugui escriure."
+
+#: templates/prefs/columnselect.inc:237
+#, fuzzy
+msgid "Add column"
+msgstr "afegir columna"
+
+#: edit.php:128
+#, fuzzy
+msgid "Add file"
+msgstr "Ha fallat al afegir"
+
+#: templates/browse/actions.inc:22
+#, fuzzy
+msgid "Add to"
+msgstr "Afegir"
+
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Importar Llibreta d'adreces"
+
+#: browse.php:28 config/prefs.php.dist:125
+#, fuzzy
+msgid "Address Book Listing"
 msgstr "La Llibreta d'adreces només és de lectura."
 
-msgid "Advanced Directory Search"
-msgstr "Cerca Avançada en el Directori"
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Importar Llibreta d'adreces"
 
+#: add.php:108
+#, fuzzy
+msgid "Address book entry"
+msgstr "La Llibreta d'adreces només és de lectura."
+
+#: data.php:305
+#, fuzzy
+msgid "Address book successfully purged."
+msgstr "L'arxiu %s ha estat importat satisfactòriament"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "La Llibreta d'adreces només és de lectura."
+
+#: templates/prefs/addressbookselect.inc:170
+msgid "Address books that will not be displayed:"
+msgstr ""
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Cerca Avançada"
 
+#: config/attributes.php.dist:64
 msgid "Alias"
 msgstr "Àlies"
 
-msgid "An illegal value was specified."
-msgstr "Se especificó un valor ilegal."
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
+msgid "All"
+msgstr ""
+
+#: lib/api.php:552
+msgid "Already Exists"
+msgstr ""
+
+#: templates/browse/javascript.inc:93
+#, php-format
+msgid "Are you sure that you want to delete %s?"
+msgstr ""
 
-msgid "Available Columns:"
-msgstr "Columnes Disponibles:"
+#: templates/browse/javascript.inc:67
+msgid "Are you sure that you want to delete the selected entries?"
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Ascending"
+msgstr ""
+
+#: search.php:85 templates/browse/search.inc:36
+#, fuzzy
+msgid "Basic Search"
+msgstr "Cercar"
+
+#: config/prefs.php.dist:158
+msgid "Below search form"
+msgstr ""
 
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr ""
+
+#: config/attributes.php.dist:178
+msgid "Birthday"
+msgstr ""
+
+#: templates/menu.inc:7
 msgid "Browse"
 msgstr "Examinar"
 
-msgid "Cancel"
-msgstr "Cancel·lar"
+#: config/attributes.php.dist:173
+msgid "Business Category"
+msgstr ""
+
+#: data.php:49
+msgid "CSV"
+msgstr ""
 
-msgid "Cell Phone"
-msgstr "Telèfon Cel·lular"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
-msgid "Choose the order of the columns to display in the address list."
+#: templates/browse/column_headers.inc:7
+msgid "Check _All/None"
 msgstr ""
-"Escolliu l'ordre de les columnes que voleu visusalitzar a la llista d'adreces."
 
-msgid "Clear Search"
-msgstr "Esborrar la Cerca"
+#: templates/addressbooks.inc:44
+msgid "Choose a name"
+msgstr ""
+
+#: add.php:48
+#, fuzzy
+msgid "Choose an address book"
+msgstr "La llibreta d'adreces no és vàlida."
+
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "La llibreta d'adreces no és vàlida."
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
 
+#: config/prefs.php.dist:11
+msgid "Choose which address books to use."
+msgstr ""
+
+#: templates/prefs/columnselect.inc:228
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
+msgstr ""
+"Escolliu l'ordre de les columnes que voleu visusalitzar a la llista "
+"d'adreces."
+
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Opcions de la Columna"
 
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
+msgid "Comma separated values"
+msgstr ""
+
+#: templates/data/export.inc:13
+msgid "Comma separated values (Microsoft Outlook)"
+msgstr ""
+
+#: config/attributes.php.dist:76
 msgid "Company"
 msgstr "Companyia"
 
-#, c-format
-msgid "Contents of %s"
-msgstr "Contingut de %s"
+#: config/attributes.php.dist:144
+#, fuzzy
+msgid "Company Address"
+msgstr "Adreça Personal"
 
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
+#, fuzzy, php-format
+msgid "Connection failed: %s"
+msgstr "Ha fallat al eliminar"
+
+#: lib/Driver/ldap.php:58
+#, fuzzy
+msgid "Connection failure"
+msgstr "Ha fallat al eliminar"
+
+#: browse.php:191 browse.php:232
+msgid "Contact added to list."
+msgstr ""
+
+#: browse.php:60
+msgid "Contact removed from list."
+msgstr ""
+
+#: browse.php:266
+#, php-format
+msgid "Contacts in list: %s"
+msgstr ""
+
+#: templates/browse/actions.inc:12
+#, fuzzy
+msgid "Copy"
+msgstr "Companyia"
+
+#: templates/addressbooks.inc:53
+msgid "Create"
+msgstr ""
+
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Exportar Llibreta d'adreces"
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
+
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Default sorting direction:"
+msgstr ""
+
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Eliminar"
 
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Exportar Llibreta d'adreces"
+
+#: config/prefs.php.dist:38
+msgid "Delete Confirmation"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Delete button behaviour"
+msgstr ""
+
+#: lib/Driver/ldap.php:270
+#, fuzzy, php-format
+msgid "Delete failed: (%s) %s"
+msgstr "Ha fallat al eliminar"
+
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Ha fallat al eliminar"
 
-msgid "Directory Listing"
-msgstr "Llistat del Directori"
+#: config/attributes.php.dist:213
+msgid "Department"
+msgstr ""
 
-msgid "Directory Search"
-msgstr "Cerca en el Directori"
+#: config/prefs.php.dist:97
+msgid "Descending"
+msgstr ""
+
+#: templates/addressbooks.inc:115
+#, fuzzy
+msgid "Description"
+msgstr "Opcions de l'Usuari"
 
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Directori"
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Opcions de Visualització"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Opcions de Visualització"
 
-#, c-format
-msgid "Edit '%s'"
-msgstr "Editar '%s'"
+#: config/prefs.php.dist:176
+msgid "Do you want to confirm deleting entries?"
+msgstr ""
 
+#: lib/Object.php:297
+msgid "Download"
+msgstr ""
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
+msgid "Download vCard"
+msgstr ""
+
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Editar"
 
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
+msgstr "Editar '%s'"
+
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Exportar Llibreta d'adreces"
+
+#: edit.php:78 edit.php:154
+#, php-format
+msgid "Edit entry for %s"
+msgstr ""
+
+#: config/attributes.php.dist:58
 msgid "Email"
 msgstr "Email"
 
-msgid "Error"
-msgstr "Error"
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
 
-msgid "Export Addressbook"
-msgstr "Exportar Llibreta d'adreces"
+#: edit.php:149 edit.php:152
+#, php-format
+msgid "Entry for %s updated."
+msgstr ""
+
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "L'arxiu %s ha estat importat satisfactòriament"
 
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "No hi ha llibretes d'adreces on es pugui escriure."
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Exportar"
 
-#, c-format
-msgid "Failed to browse the directory: %s"
+#: templates/data/export.inc:6
+#, fuzzy
+msgid "Export Address Book"
+msgstr "Exportar Llibreta d'adreces"
+
+#: templates/data/export.inc:21
+msgid "Export only the selected contacts."
+msgstr ""
+
+#: templates/data/export.inc:27
+msgid "Export the following address book completely."
+msgstr ""
+
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
+#, fuzzy, php-format
+msgid "Failed to access the address book: %s"
+msgstr "Ha fallat al cercar en el directori: %s"
+
+#: browse.php:139
+#, fuzzy, php-format
+msgid "Failed to add %s to %s: %s"
+msgstr "Ha fallat al cercar en el directori: %s"
+
+#: browse.php:272
+#, fuzzy
+msgid "Failed to browse list"
+msgstr "Ha fallat el llistat del directori: %s"
+
+#: browse.php:310
+#, fuzzy
+msgid "Failed to browse the directory"
 msgstr "Ha fallat el llistat del directori: %s"
 
-msgid "Failed to connect to the specified directory."
-msgstr "Ha fallat al connectar amb el directori especificat."
+#: lib/Driver/ldap.php:309
+#, php-format
+msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
+msgstr ""
+
+#: browse.php:120
+#, fuzzy, php-format
+msgid "Failed to find object to be added: %s"
+msgstr "Ha fallat al cercar en el directori: %s"
 
-#, c-format
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Ha fallat al cercar en el directori: %s"
+
+#: data.php:149
+#, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Ha fallat al cercar en el directori: %s"
 
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr "Fax"
 
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Títol"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Trobar"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Trobar"
+
+#: config/attributes.php.dist:48
+msgid "First Name"
+msgstr ""
+
+#: config/attributes.php.dist:202
+msgid "Freebusy URL"
+msgstr ""
+
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "De"
 
-msgid "Help"
-msgstr "Ajuda"
+#: config/sources.php.dist:604
+#, fuzzy
+msgid "Global Address Book"
+msgstr "Exportar Llibreta d'adreces"
+
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
+msgid "Group"
+msgstr ""
 
+#: config/attributes.php.dist:82
 msgid "Home Address"
 msgstr "Adreça Personal"
 
+#: config/attributes.php.dist:93
+msgid "Home City"
+msgstr ""
+
+#: config/attributes.php.dist:108
+#, fuzzy
+msgid "Home Country"
+msgstr "Telèfon Personal"
+
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Telèfon Personal"
 
-msgid "If importing CSV data: does the first row contain the field names?"
+#: config/attributes.php.dist:103
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Telèfon Personal"
+
+#: config/attributes.php.dist:98
+#, fuzzy
+msgid "Home State/Province"
+msgstr "Telèfon Personal"
+
+#: config/attributes.php.dist:88
+#, fuzzy
+msgid "Home Street Address"
+msgstr "Adreça Personal"
+
+#: config/sources.php.dist:506
+msgid "IMSP"
 msgstr ""
-"Si importeu dades CSV: ¿Conté la primera fila els noms dels camps?"
 
-msgid "Illegal or malformed form data."
-msgstr "Formulari de dades il·legal o malformat."
+#: config/prefs.php.dist:47
+msgid "IMSP Address Book Administration"
+msgstr ""
 
-msgid "Import Addressbook"
+#: templates/data/import.inc:7
+#, fuzzy, php-format
+msgid "Import Address Book, Step %d"
 msgstr "Importar Llibreta d'adreces"
 
-msgid "Import"
-msgstr "Importar"
-
-msgid "Import/Export Addressbooks"
+#: data.php:361
+#, fuzzy
+msgid "Import/Export Address Books"
 msgstr "Importar/Exportar Llibreta d'adreces"
 
-msgid "Import/Export"
-msgstr "Importar/Exportar"
+#: lib/api.php:596 lib/api.php:683
+#, fuzzy
+msgid "Invalid ID"
+msgstr "El nom no és vàlid."
 
-msgid "Invalid addressbook."
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
+#, fuzzy
+msgid "Invalid address book"
 msgstr "La llibreta d'adreces no és vàlida."
 
-msgid "Invalid e-mail address."
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
+#, fuzzy
+msgid "Invalid email"
 msgstr "L'adreça d'e-mail no és vàlida."
 
-msgid "Invalid name."
+#: lib/api.php:1089
+#, fuzzy
+msgid "Invalid entry"
 msgstr "El nom no és vàlid."
 
-msgid "Language"
-msgstr "Idioma"
+#: lib/Driver/ldap.php:266
+#, fuzzy
+msgid "Invalid key specified."
+msgstr "Se especificó un valor ilegal."
+
+#: lib/api.php:1085
+#, fuzzy
+msgid "Invalid name"
+msgstr "El nom no és vàlid."
 
+#: lib/api.php:735
+#, fuzzy
+msgid "Invalid objectId"
+msgstr "El nom no és vàlid."
+
+#: lib/Driver/ldap.php:30
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+
+#: lib/ObjectView.php:138
+msgid "Last Modified"
+msgstr ""
+
+#: config/attributes.php.dist:53
+#, fuzzy
+msgid "Last Name"
+msgstr "Nom"
+
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Llistar"
 
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "que coincideixi amb"
 
-msgid "Message"
-msgstr "Missatge"
+#: lib/api.php:205
+msgid "Maximum Number of Contacts"
+msgstr ""
+
+#: config/prefs.php.dist:107
+msgid "Maximum number of pages"
+msgstr ""
+
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Llistar"
 
+#: lib/Block/minisearch.php:3
+#, fuzzy
+msgid "Mini Search"
+msgstr "Cercar"
+
+#: lib/Driver/ldap.php:302
+msgid "Missing DN in LDAP source configuration."
+msgstr ""
+
+#: config/attributes.php.dist:162
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Telèfon Personal"
+
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
+#, php-format
+msgid "Modify failed: (%s) %s"
+msgstr ""
+
+#: lib/api.php:1193
+msgid "More than 1 entry found"
+msgstr ""
+
+#: templates/browse/actions.inc:11
+msgid "Move"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
+#, fuzzy
+msgid "Move left"
+msgstr "moure a l'esquerra"
+
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
+#, fuzzy
+msgid "Move right"
+msgstr "moure a la dreta"
+
+#: data.php:52 templates/data/import.inc:16
+#, fuzzy
+msgid "Mulberry Address Book"
+msgstr "Exportar Llibreta d'adreces"
+
+#: lib/api.php:1113
+#, php-format
+msgid ""
+"Multiple persons with address [%s], but none with name [%s] already exist"
+msgstr ""
+
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Importar Llibreta d'adreces"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Exportar Llibreta d'adreces"
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Nom"
 
-msgid ""
-"None of the available address books are configured to allow you to add new "
-"entries to them. If you believe this is an error, please contact your system "
-"administrator."
+#: config/prefs.php.dist:31
+msgid "Name Format"
 msgstr ""
-"Cap de les llibrestes d'adreces disponibles està configurada per "
-"permetre-us afegir-hi noves entrades. Si considereu que això é sun error, si su plau "
-"contacteu l'administrador de sistemes."
 
+#: config/sources.php.dist:315
+msgid "Netcenter Member Directory"
+msgstr ""
+
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
+#, fuzzy
+msgid "New Contact"
+msgstr "Afegir nou contacte"
+
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
+msgid "Next"
+msgstr ""
+
+#: config/attributes.php.dist:218
+#, fuzzy
+msgid "Nickname"
+msgstr "Nom"
+
+#: lib/api.php:1195 lib/api.php:1244
+#, php-format
+msgid "No %s entry found for %s"
+msgstr ""
+
+#: lib/api.php:1163
+#, fuzzy
+msgid "No address books found."
+msgstr "La Llibreta d'adreces només és de lectura."
+
+#: minisearch.php:83
+msgid "No contacts found"
+msgstr ""
+
+#: lib/api.php:511 lib/api.php:766
+msgid "No vCard data was found."
+msgstr ""
+
+#: templates/browse/footer.inc:7
+#, fuzzy
+msgid "None"
+msgstr "Notes"
+
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "Notes"
 
-msgid "Options"
-msgstr "Opcions"
+#: config/prefs.php.dist:115
+msgid "Number of items per page"
+msgstr ""
 
-msgid "Please choose an address book to add a contact to."
-msgstr "Si us plau, escolliur una llibreta d'adreces per afegir-hi el contacte."
+#: lib/api.php:614 lib/api.php:747
+msgid "Object not found"
+msgstr ""
 
-msgid "Please select a directory:"
-msgstr "Si us plau, seleccioneu un directori:"
+#: config/attributes.php.dist:223
+msgid "Office"
+msgstr ""
 
-msgid "Problem?"
-msgstr "¿Problemes?"
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
 
-msgid "Reset"
-msgstr "Netejar"
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
 
-msgid "Save Changes"
-msgstr "Desar els Canvis"
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
+#, fuzzy
+msgid "Other Options"
+msgstr "Opcions de l'Usuari"
+
+#: config/attributes.php.dist:190
+msgid "PGP Public Key"
+msgstr ""
+
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
+msgid "Permission Denied"
+msgstr ""
+
+#: lib/Driver.php:543
+msgid "Permission denied"
+msgstr ""
+
+#: templates/addressbooks.inc:99
+msgid "Permissions"
+msgstr ""
+
+#: data.php:53 templates/data/import.inc:17
+#, fuzzy
+msgid "Pine Address Book"
+msgstr "Importar Llibreta d'adreces"
+
+#: templates/browse/javascript.inc:28
+msgid "Please name the new contact list:"
+msgstr ""
+
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
+
+#: config/sources.php.dist:416
+#, fuzzy
+msgid "Private Address Book"
+msgstr "Exportar Llibreta d'adreces"
+
+#: lib/Driver/ldap.php:147
+#, php-format
+msgid "Query failed: (%s) %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:18
+#, fuzzy
+msgid "Quick Search"
+msgstr "Cercar"
+
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
+#, php-format
+msgid "Read failed: (%s) %s"
+msgstr ""
+
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
+msgid "Records displayed:"
+msgstr ""
+
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Importar Llibreta d'adreces"
+
+#: templates/prefs/columnselect.inc:239
+#, fuzzy
+msgid "Remove column"
+msgstr "treure columna"
+
+#: templates/browse/actions.inc:2
+msgid "Remove from this list"
+msgstr ""
+
+#: templates/data/import.inc:21
+msgid ""
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
+msgstr ""
 
+#: lib/Driver.php:438
+msgid "Requested object not found."
+msgstr ""
+
+#: add.php:37 templates/browse/search.inc:113
+msgid "Reset to Defaults"
+msgstr ""
+
+#: config/attributes.php.dist:196
+msgid "S/MIME Public Certificate"
+msgstr ""
+
+#: lib/Driver/ldap.php:69
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr ""
+
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Desar"
 
-msgid "Search Results"
-msgstr "Resultats de la Cerca"
-
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Cercar"
 
-msgid "Search&nbsp;Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Resultats de la Cerca"
 
-msgid "Select the destination to import to:"
+#: lib/api.php:1011
+#, fuzzy
+msgid "Search failed"
+msgstr "Cercar"
+
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
+#, php-format
+msgid "Search failed: %s"
+msgstr ""
+
+#: templates/block/minisearch.inc:22
+#, fuzzy
+msgid "Searching..."
+msgstr "Cercar"
+
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr ""
+"Si us plau, escolliur una llibreta d'adreces per afegir-hi el contacte."
+
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr ""
+"Si us plau, escolliur una llibreta d'adreces per afegir-hi el contacte."
+
+#: templates/data/export.inc:32
+#, fuzzy
+msgid "Select the address book to export from:"
+msgstr "Seleccioneu la font des de la que voleu exportar:"
+
+#: templates/data/import.inc:26
+#, fuzzy
+msgid "Select the address book to import to:"
 msgstr "Seleccioneu el destí per importar a:"
 
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Seleccioneu la font des de la que voleu exportar:"
+
+#: templates/data/export.inc:10
+#, fuzzy
+msgid "Select the export format:"
+msgstr "Seleccioneu la font des de la que voleu exportar:"
+
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Seleccioneu l'arxiu que voleu importar:"
 
-msgid "Select the format to export to:"
+#: templates/data/import.inc:11
+#, fuzzy
+msgid "Select the format of the source file:"
 msgstr "Seleccioneu el format que voleu exportar:"
 
-msgid "Select the format to import from:"
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select the format used to display names:"
 msgstr "Seleccioneu el format que voleu importar:"
 
-msgid "Select the source to export from:"
-msgstr "Seleccioneu la font des de la que voleu exportar:"
+#: config/prefs.php.dist:25
+msgid "Select view to display by default, sort options, and paging options."
+msgstr ""
 
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Seleccioneu quins camps voleu visualitzar en les llistes d'adreces."
 
-msgid "Select your preferred language:"
-msgstr "Seleccioneu el vostre idioma preferit:"
+#: config/prefs.php.dist:32
+#, fuzzy
+msgid "Select which format to display names."
+msgstr "Seleccioneu quins camps voleu visualitzar en les llistes d'adreces."
 
-msgid "Selected Columns:"
-msgstr "Columnes Seleccionades:"
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
+msgstr "La llibreta d'adreces no és vàlida."
+
+#: config/sources.php.dist:173
+#, fuzzy
+msgid "Shared Directory"
+msgstr "Directori"
+
+#: templates/browse/actions.inc:39
+#, php-format
+msgid "Show %s"
+msgstr ""
+
+#: templates/browse/actions.inc:41
+msgid "Show All"
+msgstr ""
 
-#, c-format
-msgid "Send mail to %s"
-msgstr "Enviar correu a %s"
+#: templates/browse/actions.inc:40
+msgid "Show Contacts"
+msgstr ""
 
-msgid "Set your preferred display language."
-msgstr "Establiu el vostre idioma de visualització preferit."
+#: templates/browse/actions.inc:39
+msgid "Show Lists"
+msgstr ""
 
-msgid "Some of Turba's configuration files are missing:"
-msgstr "Alguns dels arxius de configuració de Turba no s'han trobat:"
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
+#, fuzzy
+msgid "Sort Direction"
+msgstr "Directori"
 
-msgid "Success"
+#: lib/api.php:198
+#, fuzzy
+msgid "Sources"
 msgstr "Èxit"
 
-msgid "The data got lost"
-msgstr "Les dades s'han perdut"
+#: config/prefs.php.dist:157
+msgid "Specify where you want advanced search results to appear."
+msgstr ""
 
-msgid "The data got lost."
-msgstr "Les dades s'han perdut."
+#: browse.php:141
+#, php-format
+msgid "Successfully added %s to %s"
+msgstr ""
 
-msgid "The file contained no data."
-msgstr "L'arxiu no conté dades."
+#: browse.php:222
+#, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr ""
 
-msgid "There are no writeable address books."
-msgstr "No hi ha llibretes d'adreces on es pugui escriure."
+#: data.php:50
+msgid "TSV"
+msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: templates/data/import.inc:14 templates/data/export.inc:14
+msgid "Tab separated values"
 msgstr ""
-"Hi ha hagut un error al pujar l'arxiu. Potser l'arxiu era més gran que el "
-"tamany màxim permès."
 
-msgid ""
-"There was an error adding this object. Contact your system administrator for "
-"further help."
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
 msgstr ""
-"HI ha hagut un error al afegir aquest objecte. Contacteu l'administrador del sistema"
-"per a ajuda addicional."
 
-msgid ""
-"There was an error deleting this object. Contact your system administrator "
-"for further help."
+#: lib/Driver.php:1054
+#, php-format
+msgid "The address book \"%s\" does not exist."
 msgstr ""
-"Hi ha hagut un error al eliminar aquest objecte. Contacteu l'administrador del sistema"
-"per a ajuda addicional."
 
+#: addressbooks.php:45
+#, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr ""
 
-msgid "There was an error importing the data."
-msgstr "HI ha hagut un error al importar les dades."
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
 
-msgid "There was an error importing the uploaded file"
-msgstr "HI ha hagut un error al importar l'arxiu carregat"
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
 
-msgid ""
-"This file controls the default preferences for Turba, and also controls "
-"which preferences users can alter."
+#: data.php:303
+#, php-format
+msgid "The address book could not be purged: %s"
+msgstr ""
+
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
+msgid "The contact you requested does not exist."
+msgstr ""
+
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "L'arxiu %s ha estat importat satisfactòriament"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
 msgstr ""
-"Aquest arxiu contrala les preferències predeterminades de Turba, també controla quines són les preferències que"
-"poden ser alterades pels usuaris."
 
+#: browse.php:31
+#, fuzzy
+msgid "There are no browseable address books."
+msgstr "No hi ha llibretes d'adreces on es pugui escriure."
 
+#: add.php:29
+#, fuzzy
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+"There are no writeable address books. None of the available address books "
+"are configured to allow you to add new entries to them. If you believe this "
+"is an error, please contact your system administrator."
 msgstr ""
-"Aquest arxiu controla els full d'estil que s'utilitzen per fixar colors "
-"i tipus de lletra, a més de reemplaçar els predeterminats per Horde."
+"Cap de les llibrestes d'adreces disponibles està configurada per permetre-us "
+"afegir-hi noves entrades. Si considereu que això é sun error, si su plau "
+"contacteu l'administrador de sistemes."
 
+#: add.php:121
+#, fuzzy
 msgid ""
-"This file defines the Turba global attribute names and types - names, email "
-"addresses, etc."
+"There was an error adding the new contact. Contact your system administrator "
+"for further help."
 msgstr ""
-"Aquest arxiu defineix l'atribut global de noms i tipus de Turba - "
-"noms, adreces de correu, etc."
+"HI ha hagut un error al afegir aquest objecte. Contacteu l'administrador del "
+"sistemaper a ajuda addicional."
 
-msgid "This file defines the list of available sources for Turba."
-msgstr "Aquest arxiu defineix la llista de fonts disponibles per a Turba."
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "HI ha hagut un error al importar les dades."
 
-msgid ""
-"This is the main Turba configuration file. It contains paths and options for "
-"the Turba scripts."
+#: browse.php:238
+#, fuzzy
+msgid "There was an error creating a new list."
+msgstr "HI ha hagut un error al importar les dades."
+
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "HI ha hagut un error al importar l'arxiu carregat"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
+msgstr "HI ha hagut un error al importar l'arxiu carregat"
+
+#: delete.php:37
+#, fuzzy, php-format
+msgid "There was an error deleting this contact: %s"
+msgstr "HI ha hagut un error al importar les dades."
+
+#: browse.php:72
+#, fuzzy
+msgid "There was an error deleting this object."
+msgstr "HI ha hagut un error al importar les dades."
+
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
+msgstr "HI ha hagut un error al importar les dades."
+
+#: data.php:335
+#, fuzzy, php-format
+msgid "There was an error importing the data: %s"
+msgstr "HI ha hagut un error al importar les dades."
+
+#: lib/api.php:507 lib/api.php:761
+#, fuzzy
+msgid "There was an error importing the iCalendar data."
+msgstr "HI ha hagut un error al importar les dades."
+
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "HI ha hagut un error al importar les dades."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
+msgstr "HI ha hagut un error al importar l'arxiu carregat"
+
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "HI ha hagut un error al importar l'arxiu carregat"
+
+#: edit.php:158
+#, fuzzy, php-format
+msgid "There was an error updating this entry: %s"
+msgstr "HI ha hagut un error al importar les dades."
+
+#: data.php:179
+#, fuzzy
+msgid "There were no addresses to export."
+msgstr "No hi ha llibretes d'adreces on es pugui escriure."
+
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
 msgstr ""
-"Aquest és l'arxiu principal de configuració de Turba. Conté les rutes i opcions de tots "
-"els scripts de Turba."
 
-msgid "This number must be at least one."
-msgstr "Aquest número ha de ser, al menys, un 1."
+#: data.php:269
+msgid "This file format is not supported."
+msgstr ""
 
-msgid "This person is already in your addressbook."
-msgstr "Aquesta persona ja ha estat enregistrada en la vostra llibreta d'adreces."
+#: lib/api.php:1122 lib/api.php:1135
+#, fuzzy, php-format
+msgid "This person already has a %s entry in the address book"
+msgstr ""
+"Aquesta persona ja ha estat enregistrada en la vostra llibreta d'adreces."
 
-msgid "This value must be a number."
-msgstr "Aquest valor ha de ser un número."
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
 
+#: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Títol"
 
-msgid "Turba is not properly configured"
-msgstr "Turba no està configurat correctament"
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
 
-#, c-format
+#: lib/Driver.php:979
+#, php-format
 msgid "Unable to load the definition of %s."
 msgstr "Incapaç de carregar la definició de %s."
 
-msgid "User Options"
-msgstr "Opcions de l'Usuari"
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
+#, fuzzy
+msgid "Undo Changes"
+msgstr "Desar els Canvis"
 
-msgid "Warning"
-msgstr "Avís"
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, php-format
+msgid "Unsupported Content-Type: %s"
+msgstr ""
+
+#: config/sources.php.dist:376
+#, fuzzy
+msgid "Verisign Directory"
+msgstr "Directori"
+
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, php-format
+msgid "View \"%s\""
+msgstr ""
+
+#: minisearch.php:78
+#, fuzzy
+msgid "View Contact"
+msgstr "Afegir nou contacte"
 
+#: config/prefs.php.dist:124
+msgid "View to display by default:"
+msgstr ""
+
+#: config/attributes.php.dist:208
+msgid "Website URL"
+msgstr ""
+
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "Adreça Laboral"
 
+#: config/attributes.php.dist:124
+msgid "Work City"
+msgstr ""
+
+#: config/attributes.php.dist:139
+#, fuzzy
+msgid "Work Country"
+msgstr "Telèfon Laboral"
+
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "Telèfon Laboral"
 
-msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in Turba."
+#: config/attributes.php.dist:134
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Telèfon Laboral"
+
+#: config/attributes.php.dist:129
+#, fuzzy
+msgid "Work State/Province"
+msgstr "Telèfon Laboral"
+
+#: config/attributes.php.dist:119
+#, fuzzy
+msgid "Work Street Address"
+msgstr "Adreça Laboral"
+
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
 msgstr ""
-"No heu associat cap dels camps de l'arxiu importat als camps "
-"corresponents a Turba."
 
-msgid "Your Information"
-msgstr "La vostra Informació"
+#: edit.php:69 display.php:58 view.php:36
+msgid "You do not have permission to view this contact."
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Les opcions han estat actualitzades."
+#: vcard.php:40
+msgid "You do not have permission to view this object."
+msgstr ""
 
-msgid "[Edit]"
-msgstr "[Editar]"
+#: templates/browse/javascript.inc:55
+msgid "You must select a target address book."
+msgstr ""
 
-msgid "add column"
-msgstr "afegir columna"
+#: templates/browse/javascript.inc:23
+msgid "You must select a target list."
+msgstr ""
 
-msgid "move left"
-msgstr "moure a l'esquerra"
+#: edit.php:32
+msgid "You must select at least one contact first."
+msgstr ""
 
-msgid "move right"
-msgstr "moure a la dreta"
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
+msgid "You must select at least one entry first."
+msgstr ""
 
-msgid "remove column"
-msgstr "treure columna"
+#: edit.php:73
+msgid "You only have permission to view this contact."
+msgstr ""
+
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
+
+#: lib/Turba.php:484
+#, fuzzy
+msgid "_Browse"
+msgstr "Examinar"
+
+#: templates/browse/actions.inc:40
+msgid "_Contacts"
+msgstr ""
+
+#: templates/browse/actions.inc:2
+#, fuzzy
+msgid "_Delete"
+msgstr "Eliminar"
+
+#: lib/Turba.php:493
+#, fuzzy
+msgid "_Import/Export"
+msgstr "Importar/Exportar"
+
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Llistar"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Importar Llibreta d'adreces"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Afegir nou contacte"
+
+#: templates/browse/actions.inc:2
+msgid "_Remove from this list"
+msgstr ""
+
+#: lib/Turba.php:489
+#, fuzzy
+msgid "_Search"
+msgstr "Cercar"
+
+#: vcard.php:46
+msgid "contact.vcf"
+msgstr ""
+
+#: data.php:199 data.php:204 templates/data/export.inc:1
+msgid "contacts.csv"
+msgstr ""
+
+#: data.php:209
+msgid "contacts.tsv"
+msgstr ""
+
+#: data.php:219
+msgid "contacts.vcf"
+msgstr ""
+
+#: templates/prefs/imsp_opt.inc:34
+msgid "none"
+msgstr ""
+
+#: templates/browse/actions.inc:24
+msgid "to a Contact List"
+msgstr ""
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
+msgstr "Exportar Llibreta d'adreces"
+
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
+msgid "vCard"
+msgstr ""


--- orig/po/ja_JP.po
+++ mod/po/ja_JP.po
@@ -5,92 +5,146 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Turba 2.0.2\n"
-"POT-Creation-Date: 2005-02-10 02:08+0100\n"
-"PO-Revision-Date: 2005-02-18 15:00+0900\n"
+"Project-Id-Version: Turba 2.0\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2005-01-13 08:00+0900\n"
 "Last-Translator: Hiromi Kimura <hiromi at tac.tsukuba.ac.jp>\n"
 "Language-Team: Japanese <unknown at unknown.domain>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=SHIFT_JIS\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Pine Œ`Ž®‚̃AƒhƒŒƒX’ "
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "‘I‘ð‚³‚ê‚½ƒAƒhƒŒƒX’ ‚Ö"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr ""
+
+#: browse.php:124
+#, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr ""
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"© –¼\",\"Firstname Lastname\""
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"–¼, ©\",\"Lastname, Firstname\""
 
-#: add.php:95
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s ‚ð’ljÁ‚µ‚Ü‚µ‚½B"
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "%s ƒtƒ@ƒCƒ‹‚ªƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr ""
 
-#: browse.php:146
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr ""
-
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr ""
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Pine Œ`Ž®‚̃AƒhƒŒƒX’ "
 
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
 msgstr "iFrames ‚ðƒTƒ|[ƒg‚·‚éƒuƒ‰ƒEƒU‚ª•K—v‚Å‚·"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
 msgstr "ŒŸõƒtƒH[ƒ€‚̏ã"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "_VÚ×ŒŸõ"
+#: view.php:52
+#, fuzzy, php-format
+msgid "Access denied to %s"
+msgstr "%s ‚Í %s ‚ɒljÁ‚³‚ê‚Ü‚µ‚½"
 
-# msgstr "Šg’£ŒŸõ"
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:22
+#, fuzzy
 msgid "Add"
-msgstr ""
+msgstr "_A’ljÁ"
+
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "•s³‚ȃAƒhƒŒƒX’ ‚Å‚·"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "‘I‘ð‚³‚ê‚½ƒAƒhƒŒƒX’  '%s'B"
 
-#: templates/prefs/columnselect.inc:238
+# msgstr "Šg’£ŒŸõ"
+#: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "—ñ‚̒ljÁ"
 
-#: templates/browse/actions.inc:33
+#: edit.php:128
+msgid "Add file"
+msgstr ""
+
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "‚±‚±‚ɒljÁ"
 
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Pine Œ`Ž®‚̃AƒhƒŒƒX’ "
+
 # msgstr "’ljÁ"
-#: browse.php:30 config/prefs.php.dist:99
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "ƒAƒhƒŒƒX’ ˆê——"
 
-#: add.php:94
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Pine Œ`Ž®‚̃AƒhƒŒƒX’ "
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "ƒAƒhƒŒƒX’ €–Ú"
 
-#: lib/Driver.php:492
-msgid "Address book is read-only."
-msgstr "ƒAƒhƒŒƒX’ ‚Í“Ç‚ÝŽæ‚èê—p‚Å‚·B"
-
-#: data.php:236
+#: data.php:305
+#, fuzzy
 msgid "Address book successfully purged."
-msgstr ""
+msgstr "%s ƒtƒ@ƒCƒ‹‚ªƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B"
+
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "ƒAƒhƒŒƒX’ €–Ú"
+
+# msgstr "ƒ^ƒu‚Å‹æØ‚ç‚ꂽƒf[ƒ^"
+#: templates/prefs/addressbookselect.inc:170
+#, fuzzy
+msgid "Address books that will not be displayed:"
+msgstr "ƒAƒhƒŒƒX’ ‚ðÁ‹Ž‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Ú×ŒŸõ"
 
@@ -99,109 +153,108 @@
 msgid "Alias"
 msgstr "•Ê–¼"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "‘S‚Ä"
 
-#: lib/api.php:372
+#: lib/api.php:552
 msgid "Already Exists"
 msgstr "Šù‚É‘¶Ý‚µ‚Ü‚·"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "–{“–‚É %s ‚ðíœ‚µ‚Ä‚à‚¢‚¢‚Å‚·‚©H"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "‘I‘ð‚³‚ê‚½€–Ú‚ð–{“–‚ɍ폜‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "¸‡"
 
-#: templates/prefs/columnselect.inc:234
-msgid "Available Columns:"
-msgstr "—˜—p‰Â”\‚È—ñ:"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "_C%s ‚É–ß‚é"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "%s ‚É–ß‚é"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "_CŠÈˆÕŒŸõ"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
 msgstr "ŠÈˆÕŒŸõ"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
 msgstr "ŒŸõƒtƒH[ƒ€‚̉º"
 
-#: lib/Driver/ldap.php:75 lib/Driver/ldap.php:78
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "ƒoƒCƒ“ƒhŽ¸”s: (%s) %s"
 
-#: config/attributes.php.dist:168
+#: config/attributes.php.dist:178
 msgid "Birthday"
 msgstr "’a¶“ú"
 
-#: config/attributes.php.dist:163
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "_B‰{——"
+
+#: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "E‹Æ•ª—Þ"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr ""
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "_LŒŸõ‚̃NƒŠƒA"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr ""
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"‚ ‚È‚½‚̌l“IƒAƒhƒŒƒX’ A˜A—æAŒŸõ‚ÉŽg—p‚·‚éƒfƒtƒHƒ‹ƒg‚̐l–¼•ë‚ð‘I‚ñ‚ʼnº"
-"‚³‚¢B"
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "ƒAƒhƒŒƒX’ ‚ð‘I‘ð"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "ƒAƒhƒŒƒX’ ‚ð‘I‘ð"
 
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "ƒAƒhƒŒƒX’ ‚ð‘I‘ð"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "ƒAƒhƒŒƒX’ ‚ð‘I‘ð"
+
 #: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
 msgstr "ƒAƒhƒŒƒXˆê——‚É•\Ž¦‚·‚é—ñ‚̏‡”Ô‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢B"
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "ŒŸõ‚̃NƒŠƒA"
-
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "•\Ž¦—ñƒIƒvƒVƒ‡ƒ“"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "ƒRƒ“ƒ}‹æØ‚èŒ`Ž®"
 
 # msgstr "ƒJƒ“ƒ}‚Å‹æØ‚ç‚ꂽƒf[ƒ^"
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "ƒRƒ“ƒ}‹æØ‚èŒ`Ž® (Microsoft Outlook)"
 
@@ -209,113 +262,149 @@
 msgid "Company"
 msgstr "‰ïŽÐ"
 
-#: config/attributes.php.dist:134
+#: config/attributes.php.dist:144
 msgid "Company Address"
 msgstr "‰ïŽÐZŠ"
 
-#: lib/api.php:611 lib/api.php:781
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Ú‘±Ž¸”s: %s"
 
-#: lib/Driver/ldap.php:64
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Ú‘±Ž¸”s"
 
-#: browse.php:85
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "˜A—æ‚̓ŠƒXƒg‚©‚çíœ‚³‚ê‚Ü‚µ‚½B"
+
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "˜A—æ‚̓ŠƒXƒg‚©‚çíœ‚³‚ê‚Ü‚µ‚½B"
 
-#: browse.php:267
-#, php-format
+#: browse.php:266
+#, fuzzy, php-format
 msgid "Contacts in list: %s"
-msgstr ""
-
-#: browse.php:289
-#, php-format
-msgid "Contents of %s"
-msgstr "%s ‚Ì“à—e"
+msgstr "Ú‘±Ž¸”s: %s"
 
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:12
 msgid "Copy"
 msgstr "ƒRƒs["
 
-#: lib/ObjectView.php:133
-msgid "Created"
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
 msgstr "ì¬"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "ƒfƒtƒHƒ‹ƒg•\Ž¦"
+# msgstr "ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢:"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "ŒÂl“IƒAƒhƒŒƒX’ "
+
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
+msgstr ""
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
-msgstr "‚ ‚È‚½‚̌l“IƒAƒhƒŒƒX’ A˜A—æAŒŸõ‚ÉŽg—p‚·‚éƒfƒtƒHƒ‹ƒg‚̐l–¼•ë"
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "ì¬"
 
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "ƒfƒtƒHƒ‹ƒg‚Ì•À‚я‡F"
 
 # msgstr "ƒfƒtƒHƒ‹ƒg‚̃\[ƒg•ûŒüF"
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "íœ"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "ƒAƒhƒŒƒX’ ‚Ì‘I‘ð"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "íœ‚ÌŠm”F"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "íœƒ{ƒ^ƒ“‚Ì“®ì"
 
-#: lib/Driver/ldap.php:267
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "íœ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: (%s) %s"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "íœ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
 
-#: config/attributes.php.dist:203
+#: config/attributes.php.dist:213
 msgid "Department"
 msgstr "•”"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "~‡"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "l–¼•ë"
 
 # msgstr "ƒfƒBƒŒƒNƒgƒŠ"
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "•\Ž¦ƒIƒvƒVƒ‡ƒ“"
+
+# msgstr "ƒfƒBƒŒƒNƒgƒŠ"
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "•\Ž¦ƒIƒvƒVƒ‡ƒ“"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
 msgstr "€–Ú‚ðíœ‚·‚éÛ‚ÉŠm”F‚µ‚Ü‚·‚©H"
 
-#: templates/browse/contactrow.inc:29
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
+msgstr "VCard ‚̃_ƒEƒ“ƒ[ƒh"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "VCard ‚̃_ƒEƒ“ƒ[ƒh"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:37
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "•ÒW"
 
-#: templates/browse/contactrow.inc:37
-#, php-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "'%s' ‚̕ҏW"
 
-#: edit.php:53 edit.php:80
+# msgstr "‘‚«o‚µ"
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "ƒAƒhƒŒƒX’ ‚̃GƒNƒXƒ|[ƒg"
+
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
 msgstr "%s €–ڂ̕ҏW"
@@ -324,37 +413,52 @@
 msgid "Email"
 msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX"
 
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
 # msgstr "ƒ[ƒ‹"
-#: edit.php:79
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
 msgstr "%s ‚̍€–Ú‚ðXV‚µ‚Ü‚µ‚½B"
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s ƒtƒ@ƒCƒ‹‚ªƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "ƒAƒhƒŒƒX’ ‚ɐڑ±‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "ƒGƒNƒXƒ|[ƒg"
 
 # msgstr "‘‚«o‚µ"
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "ƒAƒhƒŒƒX’ ‚̃GƒNƒXƒ|[ƒg"
 
 # msgstr "ƒAƒhƒŒƒX’ ‚̏‘‚«o‚µ"
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "‘I‘ð‚³‚ê‚½‚à‚Ì‚¾‚¯ƒGƒNƒXƒ|[ƒg‚·‚éB"
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "ˆÈ‰º‚̃AƒhƒŒƒX’ ‚Ì‘S‚Ä‚Ì“à—e‚ðƒGƒNƒXƒ|[ƒg‚·‚éB"
 
-#: data.php:110 data.php:228 browse.php:62 browse.php:120 browse.php:135
-#: add.php:71 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "ƒAƒhƒŒƒX’ ‚ɐڑ±‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
 
-#: browse.php:145
+#: browse.php:139
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "%s ‚ð %s ‚ɒljÁ‚Å‚«‚Ü‚¹‚ñ: %s"
@@ -364,58 +468,67 @@
 msgstr "ƒŠƒXƒg‚̉{——‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
 # msgstr "ƒŠƒXƒg‚̉{——‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: browse.php:303
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "l–¼•ë‚̉{——‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
 # msgstr "ƒfƒBƒŒƒNƒgƒŠ‚̉{——‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: lib/Driver/ldap.php:304
-#, php-format
-msgid "Failed to change name: (%s) %s, %s"
-msgstr "–¼‘O‚̕ύX‚ÉŽ¸”s‚µ‚Ü‚µ‚½: (%s) %s, %s"
-
-#: lib/Driver/ldap.php:312
-#, php-format
+#: lib/Driver/ldap.php:309
+#, fuzzy, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
-msgstr "–¼‘O‚̕ύX‚ÉŽ¸”s‚µ‚Ü‚µ‚½: (%s) %s; ‹Œ DN = %s, V DN = %s, ƒ‹[ƒg = %s"
+msgstr "–¼‘O‚̕ύX‚ÉŽ¸”s‚µ‚Ü‚µ‚½: (%s) %s, %s"
 
-#: browse.php:140
+#: browse.php:120
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "’ljÁ‚·‚ׂ«ƒIƒuƒWƒFƒNƒg‚ªŒ©•t‚©‚è‚Ü‚¹‚ñ: %s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "ƒAƒhƒŒƒX’ ‚ɐڑ±‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "l–¼•ë‚ðŒŸõ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
 
-# msgstr "%s ƒfƒBƒŒƒNƒgƒŠ‚ðŒŸõ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: config/attributes.php.dist:157
+#: config/attributes.php.dist:167
 msgid "Fax"
 msgstr ""
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Œ¨‘"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "ŒŸõ"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "ŒŸõ"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr ""
 
-#: config/attributes.php.dist:192
+#: config/attributes.php.dist:202
 msgid "Freebusy URL"
 msgstr "—\’èî•ñ URL"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr ""
 
 # msgstr "·ol"
-#: config/sources.php.dist:521
+#: config/sources.php.dist:604
 msgid "Global Address Book"
 msgstr "LˆæƒAƒhƒŒƒX’ "
 
-#: templates/browse/column_headers.inc:10 templates/browse/contactrow.inc:48
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "ƒOƒ‹[ƒv"
 
@@ -423,81 +536,83 @@
 msgid "Home Address"
 msgstr "Ž©‘î‚̏ZŠ"
 
-#: config/attributes.php.dist:88
+#: config/attributes.php.dist:93
 msgid "Home City"
 msgstr "Ž©‘î‚ÌŽs"
 
-#: config/attributes.php.dist:103
+#: config/attributes.php.dist:108
 msgid "Home Country"
 msgstr "Ž©‘î‚̍‘"
 
-#: config/attributes.php.dist:140
+#: config/attributes.php.dist:150
 msgid "Home Phone"
 msgstr "Ž©‘î‚Ì“d˜b”ԍ†"
 
-#: config/attributes.php.dist:98
+#: config/attributes.php.dist:103
 msgid "Home Postal Code"
 msgstr "Ž©‘î‚Ì—X•Ö”ԍ†"
 
-#: config/attributes.php.dist:93
+#: config/attributes.php.dist:98
 msgid "Home State/Province"
 msgstr "Ž©‘î‚̏B^Œ§"
 
 #: config/attributes.php.dist:88
+#, fuzzy
 msgid "Home Street Address"
-msgstr "Ž©‘î‚̔Ԓn"
+msgstr "Ž©‘î‚̏ZŠ"
 
-#: config/sources.php.dist:457
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr ""
 
-#: templates/data/import.inc:9
+# msgstr "’ljÁ"
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "ƒAƒhƒŒƒX’ ˆê——"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "ƒAƒhƒŒƒX’ ‚̃Cƒ“ƒ|[ƒgAƒXƒeƒbƒv %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "ƒAƒhƒŒƒX’ ‚̃Cƒ“ƒ|[ƒg^ƒGƒNƒXƒ|[ƒg"
 
-# msgstr "ƒAƒhƒŒƒX’ ‚ÌŽæ‚荞‚݁^‘‚«o‚µ"
-#: lib/api.php:358 lib/api.php:577
-msgid "Invalid Content-Type"
-msgstr "•s³‚È Content-Type ‚Å‚·"
-
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:596 lib/api.php:683
 msgid "Invalid ID"
 msgstr "•s³‚È ID ‚Å‚·"
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:852
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
 msgstr "•s³‚ȃAƒhƒŒƒX’ ‚Å‚·"
 
-#: lib/api.php:856 lib/api.php:927 lib/api.php:979
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
 msgstr "•s³‚ȃ[ƒ‹ƒAƒhƒŒƒX‚Å‚·"
 
 # msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚ª•s³‚Å‚·B"
-#: lib/api.php:864
+#: lib/api.php:1089
 msgid "Invalid entry"
 msgstr "•s³‚È“ü—Í‚Å‚·"
 
 # msgstr "“ü—Í’l‚ª•s³‚Å‚·B"
-#: lib/Driver/ldap.php:263
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "•s³‚ȃLƒC‚ªŽw’肳‚ê‚Ü‚µ‚½B"
 
-#: lib/api.php:860
+#: lib/api.php:1085
 msgid "Invalid name"
 msgstr "•s³‚È–¼‘O‚Å‚·"
 
 # msgstr "–¼‘O‚ª•s³‚Å‚·B"
-#: lib/api.php:560
+#: lib/api.php:735
 msgid "Invalid objectId"
 msgstr "•s³‚ȃIƒuƒWƒFƒNƒgID ‚Å‚·"
 
-#: lib/Driver/ldap.php:39
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
@@ -508,376 +623,450 @@
 msgstr "ÅI•ÏX"
 
 #: config/attributes.php.dist:53
+#, fuzzy
 msgid "Last Name"
-msgstr ""
+msgstr "–¼‘O"
 
-#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:16
+#, fuzzy
 msgid "List"
-msgstr "ƒŠƒXƒg"
+msgstr "V‹KƒŠƒXƒg"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "‚ªŽŸ‚Ɉê’v‚·‚é"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "Å‘å‚̃y[ƒW”"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Å‘å‚̃y[ƒW”"
 
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "V‹KƒŠƒXƒg"
+
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
 msgstr "ŠÈˆÕŒŸõ"
 
-#: lib/Driver/ldap.php:298
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr ""
 
-#: config/attributes.php.dist:152
+#: config/attributes.php.dist:162
 msgid "Mobile Phone"
 msgstr "Œg‘Ñ“d˜b"
 
-#: lib/Driver/ldap.php:326 lib/Driver/ldap.php:343
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "•ÏXŽ¸”s: (%s) %s"
 
-#: lib/api.php:965
+#: lib/api.php:1193
 msgid "More than 1 entry found"
 msgstr "‚P‚ˆȏ゠‚è‚Ü‚·"
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:11
 msgid "Move"
 msgstr "ˆÚ“®"
 
-#: templates/prefs/columnselect.inc:248
+#: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "¶‚Ɉړ®"
 
-#: templates/prefs/columnselect.inc:250
+#: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "‰E‚Ɉړ®"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry Œ`Ž®‚̃AƒhƒŒƒX’ "
 
-#: lib/api.php:886
+#: lib/api.php:1113
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr ""
 
-#: config/sources.php.dist:165 config/sources.php.dist:294
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
 msgstr "Ž„‚̃AƒhƒŒƒX’ "
 
-#: config/attributes.php.dist:42
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
+msgstr "Ž„‚̃AƒhƒŒƒX’ "
+
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "–¼‘O"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "–¼‘O‚ÌŒ`Ž®"
 
 # msgstr "–¼‘O‚Ì•\Ž¦Œ`Ž®"
-#: config/sources.php.dist:72
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter ƒƒ“ƒo[‚̐l–¼•ë"
 
-#: add.php:45 add.php:111 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "V‹K˜A—æ"
 
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "V‹KƒŠƒXƒg"
-
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
 msgstr "ŽŸ"
 
-#: config/attributes.php.dist:208
+#: config/attributes.php.dist:218
 msgid "Nickname"
 msgstr "ƒjƒbƒNƒl[ƒ€"
 
-#: lib/api.php:967 lib/api.php:1016
+#: lib/api.php:1195 lib/api.php:1244
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "%s ‚Í %s ‚É‚ ‚è‚Ü‚¹‚ñ"
 
-#: lib/api.php:936
+#: lib/api.php:1163
 msgid "No address books found."
 msgstr "ƒAƒhƒŒƒX’ ‚ªŒ©•t‚©‚è‚Ü‚¹‚ñB"
 
-#: minisearch.php:85
+#: minisearch.php:83
 msgid "No contacts found"
 msgstr "˜A—æ‚ªŒ©•t‚©‚è‚Ü‚¹‚ñ"
 
-#: lib/api.php:338
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
 msgstr "vCard ƒf[ƒ^‚ªŒ©•t‚©‚è‚Ü‚¹‚ñB"
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "‚È‚µ"
 
-#: config/attributes.php.dist:174
+#: config/attributes.php.dist:184
 msgid "Notes"
 msgstr "’‹L"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "1ƒy[ƒW‚̍€–ڐ”"
 
-#: lib/api.php:436
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
 msgstr "ƒIƒuƒWƒFƒNƒg‚ªŒ©•t‚©‚è‚Ü‚¹‚ñ"
 
-#: config/attributes.php.dist:213
+#: config/attributes.php.dist:223
 msgid "Office"
 msgstr "‰ïŽÐ"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "‚»‚Ì‘¼‚̃IƒvƒVƒ‡ƒ“"
 
-#: config/attributes.php.dist:180
+#: config/attributes.php.dist:190
 msgid "PGP Public Key"
 msgstr "PGP ŒöŠJŒ®"
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:870
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
 msgstr "ƒAƒNƒZƒX‚ª‹‘”Û‚³‚ê‚Ü‚µ‚½"
 
-#: lib/Driver.php:453
+#: lib/Driver.php:543
 msgid "Permission denied"
 msgstr "ƒAƒNƒZƒX‚ª‹‘”Û‚³‚ê‚Ü‚µ‚½"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "ƒAƒNƒZƒX‚ª‹‘”Û‚³‚ê‚Ü‚µ‚½"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine Œ`Ž®‚̃AƒhƒŒƒX’ "
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
 msgstr "V‹KƒŠƒXƒg‚Ì–¼‘O‚ð“ü—Í‚µ‚ĉº‚³‚¢F"
 
-#: templates/prefs/columnselect.inc:219
-msgid "Please select a directory:"
-msgstr "l–¼•ë‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
 # msgstr "ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢:"
-#: config/sources.php.dist:373
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "ŒÂl“IƒAƒhƒŒƒX’ "
 
-#: lib/Driver/ldap.php:139
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "–â‚¢‡‚킹Ž¸”s: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "ŠÈˆÕŒŸõ"
 
-#: lib/Driver/ldap.php:183 lib/Driver/ldap.php:191 lib/Driver/ldap.php:423
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "“Ǎž‚ÝŽ¸”s: (%s) %s"
 
-#: templates/browse/footer.inc:6
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr ""
 
-#: templates/prefs/columnselect.inc:240
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "ƒAƒhƒŒƒX’ ‚ð‘I‘ð"
+
+#: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "—ñ‚ðíœ"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "ƒŠƒXƒg‚©‚çŠO‚·"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
+#, fuzzy
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
 "ƒCƒ“ƒ|[ƒg‚ÅŠù‘¶‚̃AƒhƒŒƒX’ ‚ð’u‚«Š·‚¦‚Ü‚·‚©H <b>ŒxF‚»‚¤‚·‚é‚ÆŒ»Ý‚̃Aƒh"
 "ƒŒƒX’ ‚Ì“à—e‚Í‘S‚ÄŽ¸‚í‚ê‚Ü‚·B</b>"
 
-#: lib/Driver.php:343
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "—v‹‚³‚ꂽƒIƒuƒWƒFƒNƒg‚ÍŒ©•t‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
 msgstr "ƒfƒtƒHƒ‹ƒg‚É–ß‚·"
 
-#: config/attributes.php.dist:186
+#: config/attributes.php.dist:196
 msgid "S/MIME Public Certificate"
 msgstr "S/MIME ŒöŠJØ–¾‘"
 
-#: lib/Driver/ldap.php:74
-#, php-format
+#: lib/Driver/ldap.php:69
+#, fuzzy, php-format
 msgid "STARTTLS failed: (%s) %s"
-msgstr ""
+msgstr "“Ǎž‚ÝŽ¸”s: (%s) %s"
 
-#: edit.php:57 add.php:46
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "•Û‘¶"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "ŒŸõ"
 
-#: browse.php:252 minisearch.php:66
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "ŒŸõŒ‹‰Ê"
 
-#: lib/api.php:786
+#: lib/api.php:1011
 msgid "Search failed"
 msgstr "ŒŸõŽ¸”s"
 
-#: lib/api.php:876 lib/api.php:882 lib/api.php:891 lib/api.php:904
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
 msgstr "ŒŸõŽ¸”s: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "ŒŸõ‚̃IƒvƒVƒ‡ƒ“"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "ŒŸõ’† ..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "ƒAƒhƒŒƒX’ ‚Ì‘I‘ð"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "ƒGƒNƒXƒ|[ƒg‚·‚éƒAƒhƒŒƒX’ ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢:"
 
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "ƒŠƒXƒg‚Ì‘I‘ð"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "ƒCƒ“ƒ|[ƒgæ‚̃AƒhƒŒƒX’ ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢:"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "ƒGƒNƒXƒ|[ƒg‚·‚éƒAƒhƒŒƒX’ ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "ƒCƒ“ƒ|[ƒgæ‚̃AƒhƒŒƒX’ ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Œ³‚̃tƒ@ƒCƒ‹‚ÌŒ`Ž®‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "ƒGƒNƒXƒ|[ƒg‚·‚éŒ`Ž®‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "ƒCƒ“ƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Œ³‚̃tƒ@ƒCƒ‹‚ÌŒ`Ž®‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "•\Ž¦‚ÌŒ`Ž®‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "ƒfƒtƒHƒ‹ƒg‚Ì•\Ž¦‰æ–Ê‚ð‘I‘ð‚µ‚Ü‚·B"
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "ƒAƒhƒŒƒX‚̈ꗗ‚Å•\Ž¦‚·‚é—ñ‚ð‘I‘ð‚µ‚Ü‚·B"
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "–¼‘O‚Ì•\Ž¦Œ`Ž®‚ð‘I‘ð‚µ‚Ü‚·B"
 
-#: templates/prefs/columnselect.inc:244
-msgid "Selected Columns:"
-msgstr "‘I‘ð‚µ‚½—ñ:"
-
-#: add.php:59
-#, php-format
-msgid "Selected address book '%s'."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
 msgstr "‘I‘ð‚³‚ê‚½ƒAƒhƒŒƒX’  '%s'B"
 
-#: config/sources.php.dist:230
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "‹¤—L‚̐l–¼•ë"
 
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "_W‘S‚Ä•\Ž¦"
-
-#: templates/browse/select.inc:11
-msgid "Show"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
 msgstr "•\Ž¦"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "‘S‚Ä•\Ž¦"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "˜A—æ‚Ì•\Ž¦"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "ƒŠƒXƒg‚Ì•\Ž¦"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "_C˜A—æ‚ð•\Ž¦"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "_LƒŠƒXƒg‚Ì•\Ž¦"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "•À‚я‡"
 
 # msgstr "ƒ\[ƒg•ûŒü"
-#: lib/api.php:154
+#: lib/api.php:198
 msgid "Sources"
 msgstr "ƒ\[ƒX"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
 msgstr "Ú×ŒŸõ‚ÌŒ‹‰Ê‚ð‚Ç‚±‚É•\Ž¦‚·‚é‚©Žw’肵‚ĉº‚³‚¢B"
 
-#: browse.php:147
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s ‚Í %s ‚ɒljÁ‚³‚ê‚Ü‚µ‚½"
 
-#: data.php:29
+#: browse.php:222
+#, fuzzy, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "%s ‚Í %s ‚ɒljÁ‚³‚ê‚Ü‚µ‚½"
+
+#: data.php:50
 msgid "TSV"
 msgstr ""
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "ƒ^ƒu‹æØ‚èŒ`Ž®"
 
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
 # msgstr "ƒ^ƒu‚Å‹æØ‚ç‚ꂽƒf[ƒ^"
-#: data.php:234
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "ƒAƒhƒŒƒX’ ‚ðÁ‹Ž‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "‚±‚̃AƒhƒŒƒX’ ‚͓Ǐo‚µê—p‚Å‚·"
+
+#: addressbooks.php:70
+#, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr ""
+
+#: addressbooks.php:89
+#, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr ""
+
+# msgstr "ƒ^ƒu‚Å‹æØ‚ç‚ꂽƒf[ƒ^"
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "ƒAƒhƒŒƒX’ ‚ðÁ‹Ž‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "—v‹‚³‚ꂽ˜A—æ‚Í‘¶Ý‚µ‚Ü‚¹‚ñB"
 
-#: browse.php:58
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s ƒtƒ@ƒCƒ‹‚ªƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "‰{——‰Â”\‚ȃAƒhƒŒƒX’ ‚Í‚ ‚è‚Ü‚¹‚ñB"
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -887,7 +1076,7 @@
 "ƒhƒŒƒX’ ‚Í—pˆÓ‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB‚»‚ꂪŠÔˆá‚¢‚¾‚ÆŽv‚¤‚È‚çAƒVƒXƒeƒ€ŠÇ—ŽÒ‚É‚¨–â"
 "‚¢‡‚킹‚­‚¾‚³‚¢B"
 
-#: add.php:107
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -895,135 +1084,174 @@
 "˜A—æ‚̒ljÁ’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½BÚ×‚ɂ‚¢‚Ă̓VƒXƒeƒ€ŠÇ—ŽÒ‚É‚¨–â‚¢‡"
 "‚킹‚­‚¾‚³‚¢B"
 
-#: browse.php:204
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "ƒIƒuƒWƒFƒNƒgíœ’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "V‹KƒŠƒXƒgì¬Žž‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
 
-#: browse.php:154
-#, php-format
-msgid "There was an error deleting %s from the source address book."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "‚±‚̍€–ڂ̍XV’†‚ɃGƒ‰[‚ª‚ ‚è‚Ü‚µ‚½: %s"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "ƒAƒhƒŒƒX’ ‚©‚ç %s íœ’†‚ɃGƒ‰[‚ª‚ ‚è‚Ü‚µ‚½B"
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "‚±‚̘A—æ‚̍폜’†‚ɃGƒ‰[‚ª‚ ‚è‚Ü‚µ‚½: %s"
 
-#: browse.php:93
+#: browse.php:72
 msgid "There was an error deleting this object."
 msgstr "ƒIƒuƒWƒFƒNƒgíœ’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
 
-#: browse.php:282
-msgid "There was an error displaying the select List"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
 msgstr "ƒŠƒXƒg•\Ž¦’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "ƒf[ƒ^‚̃Cƒ“ƒ|[ƒg’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½: %s"
 
-#: lib/api.php:334
+#: lib/api.php:507 lib/api.php:761
 msgid "There was an error importing the iCalendar data."
 msgstr "iCalendar ‚̃Cƒ“ƒ|[ƒg’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
 
-#: browse.php:83
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "V‹KƒŠƒXƒgì¬Žž‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "ƒIƒuƒWƒFƒNƒgíœ’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
 
-#: edit.php:84
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "‚±‚̍€–ڂ̍XV’†‚ɃGƒ‰[‚ª‚ ‚è‚Ü‚µ‚½: %s"
+
+#: edit.php:158
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "‚±‚̍€–ڂ̍XV’†‚ɃGƒ‰[‚ª‚ ‚è‚Ü‚µ‚½: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "ƒGƒNƒXƒ|[ƒg‚·‚ׂ«ƒAƒhƒŒƒX’ ‚ª‚ ‚è‚Ü‚¹‚ñB"
 
-#: lib/Driver.php:403 lib/Driver.php:444
-msgid "This address book is read-only"
-msgstr "‚±‚̃AƒhƒŒƒX’ ‚͓Ǐo‚µê—p‚Å‚·"
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
+
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
 
-#: data.php:211
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "‚±‚ÌŒ`Ž®‚̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: lib/api.php:895 lib/api.php:908
+#: lib/api.php:1122 lib/api.php:1135
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "‚±‚̐l•¨‚Í‚·‚łɃAƒhƒŒƒX’ ‚É %s ‚Æ‚µ‚Ä“o˜^‚³‚ê‚Ä‚¢‚Ü‚·B"
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Œ¨‘"
 
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
 # msgstr "ŒhÌ"
-#: lib/Driver.php:816
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "%s ‚Ì’è‹`‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñB"
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
 msgstr "•ÏX‚ðŽæ‚èÁ‚·"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, fuzzy, php-format
+msgid "Unsupported Content-Type: %s"
 msgstr "ƒTƒ|[ƒg‚µ‚Ä‚¢‚È‚¢ Content-Type ‚Å‚·B"
 
-#: config/sources.php.dist:131
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign ŽÐ‚̐l–¼•ë"
 
-#: templates/browse/contactrow.inc:31
-#, php-format
-msgid "View '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
 msgstr "'%s' ‚ð•\Ž¦"
 
-#: minisearch.php:80
+#: minisearch.php:78
 msgid "View Contact"
 msgstr "˜A—æ‚ð•\Ž¦"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "ƒfƒtƒHƒ‹ƒg‚Ì•\Ž¦‰æ–Ê:"
 
-#: config/attributes.php.dist:198
+#: config/attributes.php.dist:208
 msgid "Website URL"
 msgstr "Web ‚Ì URL"
 
-#: config/attributes.php.dist:108
+#: config/attributes.php.dist:113
 msgid "Work Address"
 msgstr "‹Î–±æ‚̏ZŠ"
 
-#: config/attributes.php.dist:114
+#: config/attributes.php.dist:124
 msgid "Work City"
 msgstr "‹Î–±æ‚ÌŽs"
 
-#: config/attributes.php.dist:129
+#: config/attributes.php.dist:139
 msgid "Work Country"
 msgstr "‹Î–±æ‚̍‘"
 
-#: config/attributes.php.dist:146
+#: config/attributes.php.dist:156
 msgid "Work Phone"
 msgstr "‹Î–±æ‚Ì“d˜b”ԍ†"
 
-#: config/attributes.php.dist:124
+#: config/attributes.php.dist:134
 msgid "Work Postal Code"
 msgstr "‹Î–±æ‚Ì—X•Ö”ԍ†"
 
-#: config/attributes.php.dist:119
+#: config/attributes.php.dist:129
 msgid "Work State/Province"
 msgstr "‹Î–±æ‚̏B^Œ§"
 
 #: config/attributes.php.dist:119
+#, fuzzy
 msgid "Work Street Address"
-msgstr "‹Î–±æ‚̔Ԓn"
+msgstr "‹Î–±æ‚̏ZŠ"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "”z•zƒŠƒXƒg‚ðì¬‚µ‚悤‚Æ‚µ‚Ä‚¢‚Ü‚·B"
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-#: edit.php:44 display.php:48
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "‚ ‚È‚½‚Í‚±‚̘A—æ‚ðŒ©‚éŒ —˜‚ª‚ ‚è‚Ü‚¹‚ñB"
 
@@ -1031,48 +1259,74 @@
 msgid "You do not have permission to view this object."
 msgstr "‚ ‚È‚½‚Í‚±‚̃IƒuƒWƒFƒNƒg‚ðŒ©‚éŒ —˜‚ª‚ ‚è‚Ü‚¹‚ñB"
 
-#: templates/browse/javascript.inc:41
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "–Ú“I‚̃AƒhƒŒƒX’ ‚ð‘I‚ñ‚ʼnº‚³‚¢B"
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
 msgstr "–Ú“I‚̃ŠƒXƒg‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
-#: templates/browse/javascript.inc:58
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "­‚È‚­‚Æ‚à‚P‚‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "­‚È‚­‚Æ‚à‚P‚‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
 msgstr "‚ ‚È‚½‚É‚Í‚±‚̘A—æ‚ðŒ©‚é‚¾‚¯‚ÌŒ —˜‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
 
-#: templates/browse/contactrow.inc:12
-msgid "[no value]"
+#: browse.php:285
+msgid "Your default address book is not browseable."
 msgstr ""
 
-#: lib/Turba.php:240
-msgid "_Add"
-msgstr "_A’ljÁ"
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
+msgid "[no value]"
+msgstr ""
 
-#: lib/Turba.php:239
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "_B‰{——"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "_C˜A—æ‚ð•\Ž¦"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
 msgstr "_Díœ"
 
-#: lib/Turba.php:245
+#: lib/Turba.php:493
 msgid "_Import/Export"
 msgstr "_IƒCƒ“/ƒAƒEƒg"
 
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "_LƒŠƒXƒg‚Ì•\Ž¦"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Ž„‚̃AƒhƒŒƒX’ "
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "V‹K˜A—æ"
+
 # msgstr "_IƒCƒ“ƒ|[ƒg^ƒGƒNƒXƒ|[ƒg"
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
 msgstr "_RƒŠƒXƒg‚©‚çíœ"
 
-#: lib/Turba.php:241
+#: lib/Turba.php:489
 msgid "_Search"
 msgstr "_SŒŸõ"
 
@@ -1080,19 +1334,35 @@
 msgid "contact.vcf"
 msgstr ""
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr ""
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr ""
 
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
+#: data.php:219
+#, fuzzy
+msgid "contacts.vcf"
+msgstr "˜A—æ‚ªŒ©•t‚©‚è‚Ü‚¹‚ñ"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "‚È‚µ"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "˜A—æ‚Ì•\Ž¦"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
 msgstr "‘I‘ð‚³‚ê‚½ƒAƒhƒŒƒX’ ‚Ö"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr ""


--- orig/scripts/upgrades/2004-10-26_create_default_histories.php
+++ mod/scripts/upgrades/2004-10-26_create_default_histories.php
@@ -1,9 +1,9 @@
 #!/usr/local/bin/php
 <?php
 /**
- * $Horde: turba/scripts/upgrades/2004-10-26_create_default_histories.php,v 1.5.4.3 2005/06/27 10:04:46 jan Exp $
+ * $Horde: turba/scripts/upgrades/2004-10-26_create_default_histories.php,v 1.5.4.6 2006/03/01 19:31:46 chuck Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -27,17 +27,16 @@
 
 @define('TURBA_BASE', dirname(__FILE__) . '/../..');
 require_once TURBA_BASE . '/lib/base.php';
-require_once 'Horde/History.php';
 
 $history = &Horde_History::singleton();
 
 // Run through every contact source.
 foreach ($cfgSources as $key => $curSource) {
-    if (empty($curSource['export']) || !empty($curSource['readonly'])) {
+    if (empty($curSource['browse']) || !empty($curSource['readonly'])) {
         continue;
     }
 
-    $driver = &Turba_Driver::singleton($key, $curSource);
+    $driver = &Turba_Driver::singleton($key);
     if (is_a($driver, 'PEAR_Error')) {
         var_dump($driver);
         exit;


--- orig/templates/browse/footer.inc
+++ mod/templates/browse/footer.inc
@@ -1,5 +1,5 @@
 <div class="control">
- <b><?php echo _("Records displayed:") ?></b>
+ <strong><?php echo _("Records displayed:") ?></strong>
 <?php
 if (!empty($numDisplayed)) {
     echo '[' . sprintf(_("%s to %s of %s"), $start, $end, $numDisplayed) . ']';


--- orig/lib/prefs.php
+++ mod/lib/prefs.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * $Horde: turba/lib/prefs.php,v 1.2.10.2 2005/03/05 23:15:56 chuck Exp $
+ * $Horde: turba/lib/prefs.php,v 1.2.10.5 2006/01/01 21:29:16 jan Exp $
  *
- * Copyright 2001-2005 Jon Parise <jon at horde.org>
- * Copyright 2002-2005 Jan Schneider <jan at horde.org>
+ * Copyright 2001-2006 Jon Parise <jon at horde.org>
+ * Copyright 2002-2006 Jan Schneider <jan at horde.org>
  *
- * See the enclosed file LICENSE for license information (ASL).  If you                      
+ * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
  */
 
@@ -20,6 +20,46 @@
     return false;
 }
 
+function handle_addressbookselect($updated)
+{
+    $addressbooks = Util::getFormData('addressbooks');
+    if (!empty($addressbooks)) {
+        $GLOBALS['prefs']->setValue('addressbooks', $addressbooks);
+        return true;
+    }
+
+    return false;
+}
+
+function handle_imsp_opt($updated)
+{
+    global $cfgSources;
+    $name = Util::getFormData('imsp_books_delete');
+    if ($name != 'none') {
+        require_once 'Net/IMSP/Utils.php';
+        $result = Net_IMSP_Utils::deleteBook($cfgSources[$name]);
+        if (is_a($result, 'PEAR_Error')) {
+            return false;
+        }
+    }
+    $name = Util::getFormData('imsp_name');
+    if ($name != '') {
+        // Get user's default IMSP $cfgSource entry
+        foreach ($cfgSources as $key => $params) {
+            if ($params['type'] == 'imsp' && $params['params']['is_root']) {
+                $default = $key;
+                break;
+            }
+        }
+        require_once 'Net/IMSP/Utils.php';
+        $result = Net_IMSP_Utils::createBook($cfgSources[$default], $name);
+        if (is_a($result, 'PEAR_Error')) {
+            return false;
+        }
+    }
+    return true;
+}
+
 /* Assign variables for select lists. */
 if (!$prefs->isLocked('default_dir')) {
     $default_dir_options = array();


--- orig/search.php
+++ mod/search.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: turba/search.php,v 1.94.4.4 2005/07/24 02:20:21 chuck Exp $
+ * $Horde: turba/search.php,v 1.94.4.9 2006/01/01 21:29:15 jan Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -10,6 +10,9 @@
 
 @define('TURBA_BASE', dirname(__FILE__));
 require_once TURBA_BASE . '/lib/base.php';
+require_once TURBA_BASE . '/lib/List.php';
+require_once TURBA_BASE . '/lib/ListView.php';
+require_once TURBA_BASE . '/lib/Object.php';
 
 /* Verify if the search mode variable is passed in form or is
  * registered in the session. Always use basic search by default */
@@ -20,26 +23,8 @@
     $_SESSION['turba_search_mode'] = 'basic';
 }
 
-/* Make sure the search session variable is registered in the session,
- * and obtain a global-scope reference to it. */
-if (!$conf['search']['cache'] || !isset($_SESSION['turba_search_results'])) {
-    $_SESSION['turba_search_results'] = null;
-} else {
-    if (Util::getFormData('clear')) {
-        $_SESSION['turba_search_results'] = null;
-    } elseif (!empty($_SESSION['turba_search_results'])) {
-        require_once TURBA_BASE . '/lib/List.php';
-        require_once TURBA_BASE . '/lib/Object.php';
-        $_SESSION['turba_search_results'] = Turba_List::unserialize($_SESSION['turba_search_results']);
-    }
-}
-
 /* Run search if there is one. */
-$source = Util::getFormData('source');
-if (!isset($source) && isset($cfgSources) && is_array($cfgSources) &&
-    count($cfgSources) > 0) {
-    $source = $prefs->getValue('default_dir');
-}
+$source = Util::getFormData('source', Turba::getDefaultAddressBook());
 if (!isset($cfgSources[$source])) {
     reset($cfgSources);
     $source = key($cfgSources);
@@ -47,7 +32,7 @@
 
 $criteria = Util::getFormData('criteria');
 $val = Util::getFormData('val');
-$driver = &Turba_Driver::singleton($source, $cfgSources[$source]);
+$driver = &Turba_Driver::singleton($source);
 if (is_a($driver, 'PEAR_Error')) {
     $notification->push(sprintf(_("Failed to access the address book: %s"), $driver->getMessage()), 'horde.error');
     $map = array();
@@ -66,26 +51,32 @@
         }
     }
 
-    if (isset($criteria) && isset($val)) {
+    if ((is_array($criteria) && count($criteria)) || !empty($val)) {
         if (($_SESSION['turba_search_mode'] == 'basic' &&
              is_object($results = $driver->search(array($criteria => $val)))) ||
             ($_SESSION['turba_search_mode'] == 'advanced' &&
              is_object($results = $driver->search($criteria)))) {
 
-            if (!is_object($_SESSION['turba_search_results'])) {
-                $_SESSION['turba_search_results'] = &new Turba_List();
+            if (is_a($results, 'PEAR_Error')) {
+                $notification->push($results, 'horde.error');
+            } else {
+                // Read the columns to display from the preferences.
+                $sources = Turba::getColumns();
+                $columns = isset($sources[$source]) ? $sources[$source] : array();
+                $sortcolumn = ($prefs->getValue('sortby') == 0 ||
+                               !isset($columns[$prefs->getValue('sortby') - 1]))
+                    ? (($prefs->getValue('name_format') == 'first_last')
+                       ? 'name'
+                       : 'lastname')
+                    : $columns[$prefs->getValue('sortby') - 1];
+
+                $results->sort($sortcolumn, $prefs->getValue('sortdir'));
+
+                $view = &new Turba_ListView($results);
+                $view->setType('search');
             }
-            $combinedResults = &new Turba_List();
-            $combinedResults->merge($_SESSION['turba_search_results'], false);
-            $combinedResults->merge($results);
-            $_SESSION['turba_search_results'] = $combinedResults->serialize();
-
-            $url = Util::addParameter('browse.php', array('key' => '**search',
-                                                          'source' => $source));
-            header('Location: ' . Horde::applicationUrl($url, true));
-            exit;
         } else {
-            $notification->push(sprintf(_("Failed to search the directory: %s"), ''), 'horde.error');
+            $notification->push(_("Failed to search the address book"), 'horde.error');
         }
     }
 }
@@ -104,8 +95,9 @@
 if ($_SESSION['turba_search_mode'] == 'advanced') {
     require TURBA_TEMPLATES . '/browse/search_criteria.inc';
 }
-require $registry->get('templates', 'horde') . '/common-footer.inc';
-
-if (is_object($_SESSION['turba_search_results'])) {
-    $_SESSION['turba_search_results'] = $_SESSION['turba_search_results']->serialize();
+if (isset($view) && is_object($view)) {
+    require TURBA_TEMPLATES . '/browse/javascript.inc';
+    require TURBA_TEMPLATES . '/browse/header.inc';
+    $view->display();
 }
+require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/data.php
+++ mod/data.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: turba/data.php,v 1.70.4.2.2.1 2005/12/10 22:08:34 chuck Exp $
+ * $Horde: turba/data.php,v 1.70.4.5 2006/01/01 21:29:15 jan Exp $
  *
- * Copyright 2001-2005 Jan Schneider <jan at horde.org>
+ * Copyright 2001-2006 Jan Schneider <jan at horde.org>
  *
  * See the enclosed file LICENSE for license information (ASL).  If you
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -15,6 +15,27 @@
     return IMPORT_FILE;
 }
 
+/**
+ * Remove empty attributes from attributes array.
+ *
+ * @param mixed $val    Value from attributes array.
+ *
+ * @return boolean         Boolean used by array_filter.
+ */
+function _emptyAttributeFilter($var)
+{
+    if (!is_array($var)) {
+        return ($var != '');
+    } else {
+        foreach ($var as $v) {
+            if ($v == '') {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
 @define('TURBA_BASE', dirname(__FILE__));
 require_once TURBA_BASE . '/lib/base.php';
 require_once 'Horde/Data.php';
@@ -82,53 +103,58 @@
 /* Loop through the action handlers. */
 switch ($actionID) {
 case 'export':
-    $contacts = array();
+    $sources = array();
     if (Util::getFormData('selected')) {
         foreach (Util::getFormData('objectkeys') as $objectkey) {
             list($source, $key) = explode(':', $objectkey, 2);
-            if (!isset($contacts[$source])) {
-                $contacts[$source] = array();
+            if (strpos($key, ':')) {
+                list($owner, $key) = explode(':', $key, 2);
             }
-            $contacts[$source][] = $key;
+            if (!isset($sources[$source])) {
+                $sources[$source] = array();
+            }
+            $sources[$source][] = $key;
         }
     } else {
         $source = Util::getFormData('source');
-        if (!isset($source) && isset($cfgSources) &&
-            is_array($cfgSources) && count($cfgSources) > 0) {
+        if (!isset($source) && !empty($cfgSources)) {
             reset($cfgSources);
             $source = key($cfgSources);
         }
-        $contacts[$source] = array();
+        $sources[$source] = array();
     }
 
     $data = array();
+    $contacts = array();
     $all_fields = array();
-    foreach ($contacts as $source => $fields) {
+    foreach ($sources as $source => $objectkeys) {
         /* Create a Turba storage instance. */
-        $storage = &Turba_Driver::singleton($source, $cfgSources[$source]);
+        $storage = &Turba_Driver::singleton($source);
         if (is_a($storage, 'PEAR_Error')) {
             $notification->push(sprintf(_("Failed to access the address book: %s"), $storage->getMessage()), 'horde.error');
             $error = true;
             break;
         }
-        /* Get the full, sorted address list. */
-        if (count($fields)) {
-            $addresses = &$storage->getObjects($fields);
+
+        /* Get the full, sorted contact list. */
+        if (count($objectkeys)) {
+            $results = &$storage->getObjects($objectkeys);
         } else {
-            $addresses = $storage->search(array());
-            if (is_a($addresses, 'Turba_List')) {
-                $addresses = $addresses->objects;
+            $results = $storage->search(array());
+            if (is_a($results, 'Turba_List')) {
+                $results = $results->objects;
             }
         }
-        if (is_a($addresses, 'PEAR_Error')) {
-            $notification->push(sprintf(_("Failed to search the directory: %s"), $addresses->getMessage()), 'horde.error');
+        if (is_a($results, 'PEAR_Error')) {
+            $notification->push(sprintf(_("Failed to search the directory: %s"), $results->getMessage()), 'horde.error');
             $error = true;
             break;
         }
+
         $fields = $storage->getFields();
         $all_fields = array_merge($all_fields, $fields);
         $params = $storage->getParams();
-        foreach ($addresses as $ob) {
+        foreach ($results as $ob) {
             $row = array();
             foreach ($fields as $field) {
                 if (substr($field, 0, 2) != '__') {
@@ -146,8 +172,10 @@
             }
             $data[] = $row;
         }
+
+        $contacts = array_merge($contacts, $results);
     }
-    if (count($data) == 0) {
+    if (!count($data)) {
         $notification->push(_("There were no addresses to export."), 'horde.message');
         $error = true;
         break;
@@ -155,7 +183,7 @@
 
     /* Make sure that all rows have the same columns if exporting from
      * different sources. */
-    if (count($contacts) > 1) {
+    if (count($sources) > 1) {
         for ($i = 0; $i < count($data); $i++) {
             foreach ($all_fields as $field) {
                 if (!isset($data[$i][$field])) {
@@ -165,8 +193,7 @@
         }
     }
 
-    $exportID = Util::getFormData('exportID');
-    switch ($exportID) {
+    switch (Util::getFormData('exportID')) {
     case EXPORT_CSV:
         $csv = &Horde_Data::singleton('csv');
         $csv->exportFile(_("contacts.csv"), $data, true);
@@ -181,11 +208,42 @@
         $tsv = &Horde_Data::singleton('tsv');
         $tsv->exportFile(_("contacts.tsv"), $data, true);
         exit;
+
+    case EXPORT_VCARD:
+        $cards = array();
+        foreach ($contacts as $contact) {
+            $cards[] =& Turba_Driver::tovCard($contact);
+        }
+
+        $vcard = &Horde_Data::singleton('vcard');
+        $vcard->exportFile(_("contacts.vcf"), $cards, true);
+        exit;
     }
     break;
 
 case IMPORT_FILE:
-    $_SESSION['import_data']['target'] = Util::getFormData('dest');
+    $dest = Util::getFormData('dest');
+    $storage = &Turba_Driver::singleton($dest);
+    if (is_a($storage, 'PEAR_Error')) {
+        $notification->push(sprintf(_("Failed to access the address book: %s"), $storage->getMessage()), 'horde.error');
+        $error = true;
+        break;
+    }
+
+    /* Check permissions. */
+    $max_contacts = Turba::hasPermission($dest . ':max_contacts', 'source');
+    if ($max_contacts !== true &&
+        $max_contacts <= $storage->countContacts()) {
+        $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d contacts in \"%s\"."), $max_contacts, $storage->title), ENT_COMPAT, NLS::getCharset());
+        if (!empty($conf['hooks']['permsdenied'])) {
+            $message = Horde::callHook('_perms_hook_denied', array('turba:max_contacts'), 'horde', $message);
+        }
+        $notification->push($message, 'horde.error', array('content.raw'));
+        $error = true;
+        break;
+    }
+
+    $_SESSION['import_data']['target'] = $dest;
     $_SESSION['import_data']['purge'] = Util::getFormData('purge');
     break;
 
@@ -215,6 +273,17 @@
         if (is_a($next_step, 'PEAR_Error')) {
             $notification->push($next_step->getMessage(), 'horde.error');
             $next_step = $data->cleanup();
+        } else {
+            /* Raise warnings if some exist. */
+            if (method_exists($data, 'warnings')) {
+                $warnings = $data->warnings();
+                if (count($warnings)) {
+                    foreach ($warnings as $warning) {
+                        $notification->push($warning, 'horde.warning');
+                    }
+                    $notification->push(_("The import can be finished despite the warnings."), 'horde.message');
+                }
+            }
         }
     }
 }
@@ -223,11 +292,11 @@
 if (is_array($next_step)) {
     /* Create a Turba storage instance. */
     $dest = $_SESSION['import_data']['target'];
-    $storage = &Turba_Driver::singleton($dest, $cfgSources[$dest]);
+    $storage = &Turba_Driver::singleton($dest);
     if (is_a($storage, 'PEAR_Error')) {
         $notification->push(sprintf(_("Failed to access the address book: %s"), $storage->getMessage()), 'horde.error');
     } else {
-        // Purge old address book if requested.
+        /* Purge old address book if requested. */
         if ($_SESSION['import_data']['purge']) {
             $result = $storage->deleteAll();
             if (is_a($result, 'PEAR_Error')) {
@@ -242,14 +311,32 @@
             if (is_a($row, 'Horde_iCalendar_vcard')) {
                 $row = $storage->toHash($row);
             }
-            $row['__owner'] = Auth::getAuth();
-            $success = $storage->add($row);
 
-            if (is_a($success, 'PEAR_Error')) {
-                $notification->push(sprintf(_("There was an error importing the data: %s"),
-                                            $success->getMessage()), 'horde.error');
+            /* Don't search for empty attributes. */
+            $row = array_filter($row, '_emptyAttributeFilter');
+            $result = $storage->search($row);
+            if (is_a($result, 'PEAR_Error')) {
+                $notification->push($result, 'horde.error');
                 $error = true;
                 break;
+            } elseif ($result->count()) {
+                $result->reset();
+                $object = $result->next();
+                $notification->push(sprintf(_("\"%s\" already exists and was not imported."), $object->getValue('name')), 'horde.message');
+            } else {
+                /* Get share information. */
+                if ($storage->usingShares) {
+                    $row['__owner'] = $storage->share->get('uid');
+                } else {
+                    $row['__owner'] = Auth::getAuth();
+                }
+                $result = $storage->add($row);
+                if (is_a($result, 'PEAR_Error')) {
+                    $notification->push(sprintf(_("There was an error importing the data: %s"),
+                                                $result->getMessage()), 'horde.error');
+                    $error = true;
+                    break;
+                }
             }
         }
         if (!$error) {
@@ -280,10 +367,9 @@
     /* Build the directory sources select widget. */
     $unique_source = '';
     $source_options = array();
-    foreach ($cfgSources as $key => $entry) {
-        $selected = ($key == $default_source) ? ' selected="selected"' : '';
+    foreach (Turba::getAddressBooks() as $key => $entry) {
         if (!empty($entry['export'])) {
-            $source_options[] = '<option value="' . htmlspecialchars($key) . '"' . $selected . '>' .
+            $source_options[] = '<option value="' . htmlspecialchars($key) . '">' .
                 htmlspecialchars($entry['title']) . "</option>\n";
             $unique_source = $key;
         }
@@ -293,19 +379,28 @@
     $unique_dest = '';
     $dest_options = array();
     $hasWriteable = false;
-    foreach ($cfgSources as $key => $entry) {
+    foreach (Turba::getAddressBooks(PERMS_EDIT) as $key => $entry) {
         $selected = ($key == $default_source) ? ' selected="selected"' : '';
-        if (empty($entry['readonly']) || (isset($entry['admin']) && in_array(Auth::getAuth(), $entry['admin']))) {
-            $dest_options[] = '<option value="' . htmlspecialchars($key) . '"' . $selected . '>' .
-                htmlspecialchars($entry['title']) . "</option>\n";
-            $unique_dest = $key;
-            $hasWriteable = true;
-        }
+        $dest_options[] = '<option value="' . htmlspecialchars($key) . '" ' . $selected . '>' .
+            htmlspecialchars($entry['title']) . "</option>\n";
+        $unique_dest = $key;
+        $hasWriteable = true;
     }
 
     if (!$hasWriteable) {
         array_shift($templates[$next_step]);
     }
+
+    /* Build the charset options. */
+    $charsets = $nls['encodings'];
+    $all_charsets = $nls['charsets'];
+    natcasesort($all_charsets);
+    foreach ($all_charsets as $charset) {
+        if (!isset($charsets[$charset])) {
+            $charsets[$charset] = $charset;
+        }
+    }
+    $my_charset = NLS::getCharset(true);
 }
 
 foreach ($templates[$next_step] as $template) {


--- orig/templates/browse/footerAlpha.inc
+++ mod/templates/browse/footerAlpha.inc
@@ -1,9 +1,10 @@
+<?php if ($this->count() > $prefs->getValue('perpage')): ?>
 <div class="control" style="text-align:center">
 <?php
 $show = Util::getFormData('show', 'all');
 $currentPage = String::upper($page);
 if ($currentPage == '*') {
-    echo '<b>(' . _("All") . ')</b>&nbsp;';
+    echo '<strong>(' . _("All") . ')</strong>&nbsp;';
 } else {
     echo Horde::link(Horde::applicationUrl(Util::addParameter($viewurl, array('page' => '*',
                                                                               'show' => $show)))) . _("All") . '</a>&nbsp;';
@@ -11,7 +12,7 @@
 for ($i = 65; $i < 91; $i++) {
     $a = chr($i);
     if ($currentPage == $a) {
-        echo '<b>(' . $a . ')</b>&nbsp;';
+        echo '<strong>(' . $a . ')</strong>&nbsp;';
     } else {
         $link = Util::addParameter($viewurl, array('page' => $a,
                                                    'show' => $show));
@@ -20,3 +21,4 @@
 }
 ?>
 </div>
+<?php endif; ?>


--- orig/po/tr_TR.po
+++ mod/po/tr_TR.po
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Turba-2.0.2\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-02-10 02:08+0100\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2005-02-10 02:08+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: i18n at lists.horde.org\n"
@@ -19,81 +19,131 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: config/prefs.php.dist:111
+#: templates/prefs/imsp_opt.inc:42
+#, fuzzy
+msgid " Add an IMSP Address Book"
+msgstr "Pine Adres Defteri"
+
+#: templates/prefs/imsp_opt.inc:31
+#, fuzzy
+msgid " Delete IMSP Address Book"
+msgstr "Seçilen Adres Defterine"
+
+#: data.php:325
+#, php-format
+msgid "\"%s\" already exists and was not imported."
+msgstr ""
+
+#: browse.php:126
+#, fuzzy, php-format
+msgid "\"%s\" was not copied because it is a list."
+msgstr "'%s' bir liste olduðu için kopyalanmadý."
+
+#: browse.php:124
+#, fuzzy, php-format
+msgid "\"%s\" was not moved because it is a list."
+msgstr "'%s' bir liste olduðu için taþýnamadý."
+
+#: config/prefs.php.dist:137
 msgid "\"Firstname Lastname\"  (ie. John Doe)"
 msgstr "\"Ad Soyad\" (Ör. Ali Yýlmaz)"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:136
 msgid "\"Lastname, Firstname\" (ie. Doe, John)"
 msgstr "\"Soyad, Ad\" (Ör. Yýlmaz, Ali)"
 
-#: add.php:96
+#: add.php:109
 #, php-format
 msgid "%s added."
 msgstr "%s eklendi"
 
-#: data.php:256
+#: data.php:343
 #, php-format
 msgid "%s file successfully imported"
 msgstr "%s dosyasý baþarýyla (içeri) aktarýldý"
 
-#: templates/browse/footer.inc:9
+#: templates/browse/footer.inc:5
 #, php-format
 msgid "%s to %s of %s"
 msgstr "%s ile %s, toplam %s"
 
-#: browse.php:146
-#, php-format
-msgid "'%s' was not copied because it is a list."
-msgstr "'%s' bir liste olduðu için kopyalanmadý."
-
-#: browse.php:144
-#, php-format
-msgid "'%s' was not moved because it is a list."
-msgstr "'%s' bir liste olduðu için taþýnamadý."
+#: lib/Turba.php:446
+#, fuzzy, php-format
+msgid "%s's Address Book"
+msgstr "Pine Adres Defteri"
 
 #: lib/Block/minisearch.php:45
 msgid "A browser that supports iFrames is required"
 msgstr "iFrames destekleyen bir tarayýcý gerekmektedir"
 
-#: config/prefs.php.dist:132
+#: config/prefs.php.dist:159
 msgid "Above search form"
 msgstr "Yukarý arama formu"
 
-#: templates/browse/search.inc:65
-msgid "Ad_vanced Search"
-msgstr "Geliþ_miþ Arama"
+#: view.php:52
+#, fuzzy, php-format
+msgid "Access denied to %s"
+msgstr "%s %s e baþarýyla eklendi"
 
-#: add.php:61
+#: add.php:56 templates/browse/actions.inc:22
 msgid "Add"
 msgstr "Ekle"
 
+#: templates/prefs/addressbookselect.inc:174
+#, fuzzy
+msgid "Add address book"
+msgstr "Geçersiz adres defteri"
+
+#: config/prefs.php.dist:48
+#, fuzzy
+msgid "Add and Delete IMSP address books"
+msgstr "Seçilen adres defteri '%s'."
+
 #: templates/prefs/columnselect.inc:237
 msgid "Add column"
 msgstr "Kolon ekle"
 
-#: templates/browse/actions.inc:33
+#: edit.php:128
+msgid "Add file"
+msgstr ""
+
+#: templates/browse/actions.inc:22
 msgid "Add to"
 msgstr "Ekle"
 
-#: browse.php:30 config/prefs.php.dist:99
+#: templates/addressbooks.inc:86
+#, fuzzy
+msgid "Address Book"
+msgstr "Pine Adres Defteri"
+
+#: browse.php:28 config/prefs.php.dist:125
 msgid "Address Book Listing"
 msgstr "Adres Defteri Listeleme"
 
-#: add.php:95
+#: config/prefs.php.dist:10
+#, fuzzy
+msgid "Address Books"
+msgstr "Pine Adres Defteri"
+
+#: add.php:108
 msgid "Address book entry"
 msgstr "Adres defteri kaydý"
 
-#: lib/Driver.php:496
-msgid "Address book is read-only."
-msgstr "Adres defteri salt-okunur."
-
-#: data.php:236
+#: data.php:305
 msgid "Address book successfully purged."
 msgstr "Adres defteri baþarýyla boþaltýldý."
 
-#: search.php:94 templates/browse/search.inc:65
-#: templates/browse/search.inc:113
+#: templates/addressbooks.inc:62
+#, fuzzy
+msgid "Address book to delete "
+msgstr "Adres defteri kaydý"
+
+#: templates/prefs/addressbookselect.inc:170
+#, fuzzy
+msgid "Address books that will not be displayed:"
+msgstr "Adres defteri boþaltýlamadý: %s"
+
+#: search.php:88 templates/browse/search.inc:37
 msgid "Advanced Search"
 msgstr "Geliþmiþ Arama"
 
@@ -101,55 +151,37 @@
 msgid "Alias"
 msgstr "Öteki Ad"
 
-#: templates/browse/footerAlpha.inc:10 templates/browse/footerAlpha.inc:13
+#: templates/browse/footerAlpha.inc:7 templates/browse/footerAlpha.inc:10
+#: templates/browse/actions.inc:41
 msgid "All"
 msgstr "Tümü"
 
-#: lib/api.php:372
+#: lib/api.php:552
 msgid "Already Exists"
 msgstr "Zaten Var"
 
-#: templates/browse/javascript.inc:79
+#: templates/browse/javascript.inc:93
 #, php-format
 msgid "Are you sure that you want to delete %s?"
 msgstr "%s silmek istediðinizden emin misiniz?"
 
-#: templates/browse/javascript.inc:53
+#: templates/browse/javascript.inc:67
 msgid "Are you sure that you want to delete the selected entries?"
 msgstr "Seçilen giriþleri silmek istediðinizden emin misiniz?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:96
 msgid "Ascending"
 msgstr "Artan"
 
-#: templates/prefs/columnselect.inc:233
-msgid "Available Columns:"
-msgstr "Mevcut Kolonlar:"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Ba_ck to %s"
-msgstr "Ge_ri Dön %s"
-
-#: templates/browse/actions.inc:55
-#, php-format
-msgid "Back to %s"
-msgstr "%s Geri Dön"
-
-#: templates/browse/search.inc:116
-msgid "Basi_c Search"
-msgstr "_Basit Arama"
-
-#: search.php:91 templates/browse/search.inc:62
-#: templates/browse/search.inc:116
+#: search.php:85 templates/browse/search.inc:36
 msgid "Basic Search"
 msgstr "Basit Arama"
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:158
 msgid "Below search form"
 msgstr "Aþaðý arama formu"
 
-#: lib/Driver/ldap.php:82 lib/Driver/ldap.php:85
+#: lib/Driver/ldap.php:77 lib/Driver/ldap.php:80
 #, php-format
 msgid "Bind failed: (%s) %s"
 msgstr "Baðlantý kurulamadý (%s) %s"
@@ -158,51 +190,68 @@
 msgid "Birthday"
 msgstr "Doðum günü"
 
+#: templates/menu.inc:7
+#, fuzzy
+msgid "Browse"
+msgstr "_Gözat"
+
 #: config/attributes.php.dist:173
 msgid "Business Category"
 msgstr "Ýþ Sýnýfý"
 
-#: data.php:28
+#: data.php:49
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/browse/actions.inc:59
-msgid "C_lear Search"
-msgstr "Arama_yý Temizle"
+#: lib/Object/Group.php:57
+msgid "Can't add a group to itself."
+msgstr ""
 
 #: templates/browse/column_headers.inc:7
 msgid "Check _All/None"
 msgstr "Tümü_nü Ýþaretle/Ýþaretleme"
 
-#: config/prefs.php.dist:29
-msgid ""
-"Choose a default directory for your personal addressbook, contact lists, and "
-"searches."
-msgstr ""
-"Kiþisel adres defteriniz, iletiþim listeleriniz ve aramalarýnýz için ön "
-"tanýmlý bir dizin seçin."
+#: templates/addressbooks.inc:44
+#, fuzzy
+msgid "Choose a name"
+msgstr "Bir adres defteri seçin"
 
-#: add.php:53
+#: add.php:48
 msgid "Choose an address book"
 msgstr "Bir adres defteri seçin"
 
+#: templates/prefs/columnselect.inc:221
+#, fuzzy
+msgid "Choose an address book:"
+msgstr "Bir adres defteri seçin"
+
+#: templates/prefs/addressbookselect.inc:165
+msgid "Choose which address books to display, and in what order:"
+msgstr ""
+
+#: config/prefs.php.dist:11
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "Bir adres defteri seçin"
+
 #: templates/prefs/columnselect.inc:228
-msgid "Choose the order of the columns to display in the address list."
+#, fuzzy
+msgid "Choose which columns to display and in what order:"
 msgstr "Adres listesinde görüntelenecek kolonlarýn sýrasýný seçin."
 
-#: templates/browse/actions.inc:59
-msgid "Clear Search"
-msgstr "Aramayý Temizle"
-
-#: config/prefs.php.dist:10
+#: config/prefs.php.dist:17
 msgid "Column Options"
 msgstr "Kolon Seçenekleri"
 
-#: templates/data/import.inc:18 templates/data/export.inc:16
+#: templates/prefs/columnselect.inc:233
+msgid "Columns that will not be displayed:"
+msgstr ""
+
+#: templates/data/import.inc:13 templates/data/export.inc:12
 msgid "Comma separated values"
 msgstr "Virgül ile ayrýlmýþ deðerler"
 
-#: templates/data/export.inc:17
+#: templates/data/export.inc:13
 msgid "Comma separated values (Microsoft Outlook)"
 msgstr "Virgül ile ayrýlmýþ deðerler (Microsoft Outlook)"
 
@@ -214,70 +263,81 @@
 msgid "Company Address"
 msgstr "Firma Adresi"
 
-#: lib/api.php:611 lib/api.php:800
+#: lib/api.php:318 lib/api.php:363 lib/api.php:407 lib/api.php:491
+#: lib/api.php:601 lib/api.php:688 lib/api.php:741 lib/api.php:819
+#: lib/api.php:1006 lib/api.php:1094
 #, php-format
 msgid "Connection failed: %s"
 msgstr "Baðlantý baþarýsýz: %s"
 
-#: lib/Driver/ldap.php:63
+#: lib/Driver/ldap.php:58
 msgid "Connection failure"
 msgstr "Baðlantý baþarýsýz"
 
-#: browse.php:85
+#: browse.php:191 browse.php:232
+#, fuzzy
+msgid "Contact added to list."
+msgstr "Ýletiþim noktasý listeden silindi."
+
+#: browse.php:60
 msgid "Contact removed from list."
 msgstr "Ýletiþim noktasý listeden silindi."
 
-#: browse.php:279
+#: browse.php:266
 #, php-format
 msgid "Contacts in list: %s"
 msgstr "Listedeki iletiþim noktalarý: %s"
 
-#: browse.php:301
-#, php-format
-msgid "Contents of %s"
-msgstr "%s içeriði"
-
-#: templates/browse/actions.inc:20
+#: templates/browse/actions.inc:12
 msgid "Copy"
 msgstr "Kopyala"
 
-#: lib/ObjectView.php:134
-msgid "Created"
+#: templates/addressbooks.inc:53
+#, fuzzy
+msgid "Create"
 msgstr "Oluþturuldu"
 
-#: config/prefs.php.dist:16
-msgid "Default Display"
-msgstr "Öntanýmlý Görünüm"
+#: templates/addressbooks.inc:40
+#, fuzzy
+msgid "Create Address Book"
+msgstr "Özel Adres Defteri"
 
-#: config/prefs.php.dist:121
-msgid ""
-"Default directory for your personal addressbook, contact lists, and searches."
+#: lib/ListView.php:315
+msgid "Create a new Contact List in:"
 msgstr ""
-"Kiþisel adres defteriniz, iletiþim listeleriniz ve aramalarýnýz için "
-"öntanýmlý dizin."
 
-#: config/prefs.php.dist:72
+#: lib/ObjectView.php:133
+msgid "Created"
+msgstr "Oluþturuldu"
+
+#: config/prefs.php.dist:98
 msgid "Default sorting direction:"
 msgstr "Öntanýmlý sýralama yönü:"
 
-#: templates/browse/actions.inc:5 lib/Renderer.php:48
+#: templates/addressbooks.inc:76 templates/browse/actions.inc:2
+#: lib/Object.php:328 lib/Renderer.php:47 lib/Renderer.php:50
 msgid "Delete"
 msgstr "Sil"
 
-#: config/prefs.php.dist:35
+#: templates/addressbooks.inc:58
+#, fuzzy
+msgid "Delete Address Book"
+msgstr "Adres Defteri Seç"
+
+#: config/prefs.php.dist:38
 msgid "Delete Confirmation"
 msgstr "Silme Onayý"
 
-#: config/prefs.php.dist:36
+#: config/prefs.php.dist:39
 msgid "Delete button behaviour"
 msgstr "Silme düðmesi davranýþý"
 
-#: lib/Driver/ldap.php:274
+#: lib/Driver/ldap.php:270
 #, php-format
 msgid "Delete failed: (%s) %s"
 msgstr "Silme baþarýsýz: (%s) %s"
 
-#: delete.php:32
+#: delete.php:38
 msgid "Deletion failed"
 msgstr "Silme baþarýsýz"
 
@@ -285,38 +345,58 @@
 msgid "Department"
 msgstr "Bölüm"
 
-#: config/prefs.php.dist:71
+#: config/prefs.php.dist:97
 msgid "Descending"
 msgstr "Azalan"
 
-#: templates/browse/search.inc:132
+#: templates/addressbooks.inc:115
+msgid "Description"
+msgstr ""
+
+#: templates/browse/search.inc:118
 msgid "Directory"
 msgstr "Dizin"
 
-#: config/prefs.php.dist:9 config/prefs.php.dist:15 config/prefs.php.dist:21
-#: config/prefs.php.dist:27
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Display"
+msgstr "Görünüm Seçenekleri"
+
+#: config/prefs.php.dist:9 config/prefs.php.dist:16 config/prefs.php.dist:23
+#: config/prefs.php.dist:30
 msgid "Display Options"
 msgstr "Görünüm Seçenekleri"
 
-#: config/prefs.php.dist:149
+#: config/prefs.php.dist:176
 msgid "Do you want to confirm deleting entries?"
 msgstr "Giriþleri silmeyi onaylamak istiyor musunuz?"
 
-#: templates/browse/contactrow.inc:25
+#: lib/Object.php:297
+#, fuzzy
+msgid "Download"
+msgstr "vCard indir"
+
+#: templates/browse/row.inc:17 templates/browse/contactrow.inc:25
 msgid "Download vCard"
 msgstr "vCard indir"
 
-#: templates/browse/column_headers.inc:8 templates/browse/contactrow.inc:33
-#: lib/Renderer.php:46
+#: templates/addressbooks.inc:102 templates/browse/row.inc:25
+#: templates/browse/column_headers.inc:10 templates/browse/actions.inc:3
+#: templates/browse/contactrow.inc:33 lib/Renderer.php:42
 msgid "Edit"
 msgstr "Düzenle"
 
-#: templates/browse/contactrow.inc:33
-#, php-format
-msgid "Edit '%s'"
+#: templates/browse/row.inc:25 templates/browse/contactrow.inc:33
+#, fuzzy, php-format
+msgid "Edit \"%s\""
 msgstr "'%s' Düzenle"
 
-#: edit.php:53 edit.php:80
+#: templates/addressbooks.inc:81
+#, fuzzy
+msgid "Edit Address Books"
+msgstr "Adres Defterini Dýþarý Aktar"
+
+#: edit.php:78 edit.php:154
 #, php-format
 msgid "Edit entry for %s"
 msgstr "%s giriþini düzenle"
@@ -325,58 +405,78 @@
 msgid "Email"
 msgstr "E-posta"
 
-#: edit.php:79
+#: edit.php:147
+#, php-format
+msgid "Entry for %s updated, but saving the uploaded file failed: %s"
+msgstr ""
+
+#: edit.php:149 edit.php:152
 #, php-format
 msgid "Entry for %s updated."
 msgstr "%s kaydu güncellendi."
 
-#: templates/browse/actions.inc:11 templates/data/export.inc:46
+#: browse.php:74
+#, fuzzy
+msgid "Entry successfully deleted."
+msgstr "%s dosyasý baþarýyla (içeri) aktarýldý"
+
+#: lib/api.php:413
+#, fuzzy, php-format
+msgid "Error searching the address book: %s"
+msgstr "Adres defterine eriþim baþarýsýz: %s"
+
+#: templates/browse/actions.inc:6 templates/data/export.inc:41
 msgid "Export"
 msgstr "Dýþarý Aktar"
 
-#: templates/data/export.inc:7
+#: templates/data/export.inc:6
 msgid "Export Address Book"
 msgstr "Adres Defterini Dýþarý Aktar"
 
-#: templates/data/export.inc:26
+#: templates/data/export.inc:21
 msgid "Export only the selected contacts."
 msgstr "Sadece seçilen iletiþim noktalarýný dýþarý aktar."
 
-#: templates/data/export.inc:32
+#: templates/data/export.inc:27
 msgid "Export the following address book completely."
 msgstr "Bu adres defterini tümüyle dýþarý aktar."
 
-#: data.php:110 data.php:228 browse.php:62 browse.php:120 browse.php:135
-#: add.php:72 search.php:51
+#: data.php:134 data.php:228 data.php:297 browse.php:35 browse.php:90
+#: browse.php:112 add.php:67 search.php:37
 #, php-format
 msgid "Failed to access the address book: %s"
 msgstr "Adres defterine eriþim baþarýsýz: %s"
 
-#: browse.php:154
+#: browse.php:139
 #, php-format
 msgid "Failed to add %s to %s: %s"
 msgstr "%s i %s e ekleme baþarýsýz: %s"
 
-#: browse.php:284
+#: browse.php:272
 msgid "Failed to browse list"
 msgstr "Liste görüntüleme baþarýsýz"
 
-#: browse.php:315
+#: browse.php:310
 msgid "Failed to browse the directory"
 msgstr "Dizin görüntüleme baþarýsýz"
 
-#: lib/Driver/ldap.php:312
+#: lib/Driver/ldap.php:309
 #, php-format
 msgid "Failed to change name: (%s) %s; Old DN = %s, New DN = %s, Root = %s"
 msgstr ""
 "Ýsim deðiþtirme baþarýsýz: (%s) %s; Eski DN = %s, Yeni DN = %s, Kök = %s"
 
-#: browse.php:140
+#: browse.php:120
 #, php-format
 msgid "Failed to find object to be added: %s"
 msgstr "Eklenecek nesne bulunamadý: %s"
 
-#: data.php:124 search.php:85
+#: search.php:79
+#, fuzzy
+msgid "Failed to search the address book"
+msgstr "Adres defterine eriþim baþarýsýz: %s"
+
+#: data.php:149
 #, php-format
 msgid "Failed to search the directory: %s"
 msgstr "Dizin arama baþarýsýz: %s"
@@ -385,10 +485,20 @@
 msgid "Fax"
 msgstr "Faks"
 
-#: templates/browse/search.inc:72
+#: edit.php:124 display.php:100
+#, fuzzy
+msgid "Files"
+msgstr "Ünvan"
+
+#: templates/browse/search.inc:70
 msgid "Find"
 msgstr "Bul"
 
+#: edit.php:97 edit.php:187
+#, fuzzy
+msgid "Finish"
+msgstr "Bul"
+
 #: config/attributes.php.dist:48
 msgid "First Name"
 msgstr "Ad"
@@ -397,15 +507,15 @@
 msgid "Freebusy URL"
 msgstr "Freebusy Adresi"
 
-#: templates/browse/search.inc:85
+#: templates/browse/search.inc:83
 msgid "From"
 msgstr "Ýçinde"
 
-#: config/sources.php.dist:532
+#: config/sources.php.dist:604
 msgid "Global Address Book"
 msgstr "Genel Adres Defteri"
 
-#: templates/browse/contactrow.inc:44
+#: templates/browse/row.inc:43 templates/browse/contactrow.inc:44
 msgid "Group"
 msgstr "Grup"
 
@@ -437,60 +547,61 @@
 msgid "Home Street Address"
 msgstr "Ev Adresi"
 
-#: config/sources.php.dist:468
+#: config/sources.php.dist:506
 msgid "IMSP"
 msgstr "IMSP"
 
-#: templates/data/import.inc:9
+#: config/prefs.php.dist:47
+#, fuzzy
+msgid "IMSP Address Book Administration"
+msgstr "Adres Defteri Listeleme"
+
+#: templates/data/import.inc:7
 #, php-format
 msgid "Import Address Book, Step %d"
 msgstr "Adres Defteri Ýçeri Aktarma, Adým %d"
 
-#: data.php:274
+#: data.php:361
 msgid "Import/Export Address Books"
 msgstr "Adres Defterlerini Ýçeri/Dýþarý Aktar"
 
-#: lib/api.php:358 lib/api.php:577
-msgid "Invalid Content-Type"
-msgstr "Geçersiz Ýçerik Türü"
-
-#: lib/api.php:419 lib/api.php:508
+#: lib/api.php:596 lib/api.php:683
 msgid "Invalid ID"
 msgstr "Geçersiz kimlik"
 
-#: lib/api.php:191 lib/api.php:316 lib/api.php:415 lib/api.php:504
-#: lib/api.php:556 lib/api.php:871
+#: lib/api.php:230 lib/api.php:402 lib/api.php:486 lib/api.php:592
+#: lib/api.php:679 lib/api.php:731 lib/api.php:1077
 msgid "Invalid address book"
 msgstr "Geçersiz adres defteri"
 
-#: lib/api.php:875 lib/api.php:946 lib/api.php:999
+#: lib/api.php:1081 lib/api.php:1154 lib/api.php:1207
 msgid "Invalid email"
 msgstr "Geçersiz e-posta"
 
-#: lib/api.php:883
+#: lib/api.php:1089
 msgid "Invalid entry"
 msgstr "Geçersiz kayýt"
 
-#: lib/Driver/ldap.php:270
+#: lib/Driver/ldap.php:266
 msgid "Invalid key specified."
 msgstr "Geçersiz anahtar belirtildi."
 
-#: lib/api.php:879
+#: lib/api.php:1085
 msgid "Invalid name"
 msgstr "Geçersiz ad"
 
-#: lib/api.php:560
+#: lib/api.php:735
 msgid "Invalid objectId"
 msgstr "Geçersiz nesne kimliði"
 
-#: lib/Driver/ldap.php:38
+#: lib/Driver/ldap.php:30
 msgid ""
 "LDAP support is required but the LDAP module is not available or not loaded."
 msgstr ""
 "LDAP desteði gerekiyor ancak LDAP modülü kullanýlabilir deðil ya da "
 "yüklenmedi."
 
-#: lib/ObjectView.php:139
+#: lib/ObjectView.php:138
 msgid "Last Modified"
 msgstr "Son Güncelleme"
 
@@ -498,23 +609,33 @@
 msgid "Last Name"
 msgstr "Soyad"
 
-#: templates/browse/column_headers.inc:10
+#: templates/browse/column_headers.inc:16
 msgid "List"
 msgstr "Liste"
 
-#: templates/browse/search.inc:79
+#: templates/browse/search.inc:77
 msgid "Matching"
 msgstr "Eþleþen"
 
-#: config/prefs.php.dist:81
+#: lib/api.php:205
+#, fuzzy
+msgid "Maximum Number of Contacts"
+msgstr "Azami sayfa sayýsý"
+
+#: config/prefs.php.dist:107
 msgid "Maximum number of pages"
 msgstr "Azami sayfa sayýsý"
 
+#: lib/Block/tree_menu.php:3
+#, fuzzy
+msgid "Menu List"
+msgstr "Yeni Liste"
+
 #: lib/Block/minisearch.php:3
 msgid "Mini Search"
 msgstr "Minik Arama"
 
-#: lib/Driver/ldap.php:306
+#: lib/Driver/ldap.php:302
 msgid "Missing DN in LDAP source configuration."
 msgstr "LDAP kaynak yapýlandýrmasýnda eksik DN."
 
@@ -522,62 +643,67 @@
 msgid "Mobile Phone"
 msgstr "Mobil Telefon"
 
-#: lib/Driver/ldap.php:335 lib/Driver/ldap.php:352
+#: lib/Driver/ldap.php:332 lib/Driver/ldap.php:348
 #, php-format
 msgid "Modify failed: (%s) %s"
 msgstr "Deðiþiklik baþarýsýz: (%s) %s"
 
-#: lib/api.php:985
+#: lib/api.php:1193
 msgid "More than 1 entry found"
 msgstr "Birden fazla kayýt bulundu"
 
-#: templates/browse/actions.inc:19
+#: templates/browse/actions.inc:11
 msgid "Move"
 msgstr "Taþý"
 
 #: templates/prefs/columnselect.inc:247
+#: templates/prefs/addressbookselect.inc:184
 msgid "Move left"
 msgstr "Sola taþý"
 
 #: templates/prefs/columnselect.inc:249
+#: templates/prefs/addressbookselect.inc:186
 msgid "Move right"
 msgstr "Saða taþý"
 
-#: data.php:31 templates/data/import.inc:21
+#: data.php:52 templates/data/import.inc:16
 msgid "Mulberry Address Book"
 msgstr "Mulberry Adres Defteri"
 
-#: lib/api.php:905
+#: lib/api.php:1113
 #, php-format
 msgid ""
 "Multiple persons with address [%s], but none with name [%s] already exist"
 msgstr "[%s] adresi ile birden fazla kiþi bulundu ancak [%s] isminde biri yok"
 
-#: config/sources.php.dist:174 config/sources.php.dist:304
-msgid "My Addressbook"
+#: config/sources.php.dist:107 config/sources.php.dist:243
+#, fuzzy
+msgid "My Address Book"
+msgstr "Adres Defterim"
+
+#: addressbooks.php:120
+#, fuzzy
+msgid "My Address Books"
 msgstr "Adres Defterim"
 
-#: config/attributes.php.dist:42
+#: templates/addressbooks.inc:107 config/attributes.php.dist:42
 msgid "Name"
 msgstr "Ad"
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:31
 msgid "Name Format"
 msgstr "Ad Biçimi"
 
-#: config/sources.php.dist:78
+#: config/sources.php.dist:315
 msgid "Netcenter Member Directory"
 msgstr "Netcenter Üye Dizini"
 
-#: add.php:45 add.php:112 lib/Block/minisearch.php:27
+#: add.php:36 add.php:124 lib/Block/minisearch.php:27
+#: lib/Block/tree_menu.php:27
 msgid "New Contact"
 msgstr "Yeni Ýletiþim Noktasý"
 
-#: templates/browse/actions.inc:37
-msgid "New List"
-msgstr "Yeni Liste"
-
-#: templates/data/import.inc:42
+#: edit.php:88 edit.php:95 edit.php:202 templates/data/import.inc:45
 msgid "Next"
 msgstr "Devam"
 
@@ -585,24 +711,24 @@
 msgid "Nickname"
 msgstr "Takma Ad"
 
-#: lib/api.php:987 lib/api.php:1036
+#: lib/api.php:1195 lib/api.php:1244
 #, php-format
 msgid "No %s entry found for %s"
 msgstr "%s giriþi bulunamadý: %s"
 
-#: lib/api.php:955
+#: lib/api.php:1163
 msgid "No address books found."
 msgstr "Hiç adres defteri bulunamadý."
 
-#: minisearch.php:87
+#: minisearch.php:83
 msgid "No contacts found"
 msgstr "Hiç iletiþim noktasý bulunamadý"
 
-#: lib/api.php:338
+#: lib/api.php:511 lib/api.php:766
 msgid "No vCard data was found."
 msgstr "Hiç vCard verisi bulunamadý."
 
-#: templates/browse/footer.inc:11
+#: templates/browse/footer.inc:7
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -610,11 +736,11 @@
 msgid "Notes"
 msgstr "Notlar"
 
-#: config/prefs.php.dist:89
+#: config/prefs.php.dist:115
 msgid "Number of items per page"
 msgstr "Sayfa baþýna öðe sayýsý"
 
-#: lib/api.php:436
+#: lib/api.php:614 lib/api.php:747
 msgid "Object not found"
 msgstr "Nesne bulunamadý"
 
@@ -622,7 +748,18 @@
 msgid "Office"
 msgstr "Ofis"
 
-#: config/prefs.php.dist:34
+#: templates/prefs/imsp_opt.inc:23
+msgid ""
+"Once you save this option page, the address book will be permanently "
+"deleted. If this is not what you want, then you must change your selection "
+"to \"None\"."
+msgstr ""
+
+#: lib/api.php:774
+msgid "Only one vcard supported."
+msgstr ""
+
+#: config/prefs.php.dist:37 config/prefs.php.dist:46
 msgid "Other Options"
 msgstr "Diðer Seçenekler"
 
@@ -630,70 +767,86 @@
 msgid "PGP Public Key"
 msgstr "PGP Açýk Anahtarý"
 
-#: lib/api.php:322 lib/api.php:425 lib/api.php:514 lib/api.php:569
-#: lib/api.php:728 lib/api.php:889
+#: lib/api.php:495 lib/api.php:605 lib/api.php:692 lib/api.php:934
+#: lib/api.php:1098
 msgid "Permission Denied"
 msgstr "Eriþim Engellendi"
 
-#: lib/Driver.php:454
+#: lib/Driver.php:543
 msgid "Permission denied"
 msgstr "Eriþim engellendi"
 
-#: data.php:32 templates/data/import.inc:22
+#: templates/addressbooks.inc:99
+#, fuzzy
+msgid "Permissions"
+msgstr "Eriþim Engellendi"
+
+#: data.php:53 templates/data/import.inc:17
 msgid "Pine Address Book"
 msgstr "Pine Adres Defteri"
 
-#: templates/browse/javascript.inc:25
-msgid "Please enter the name of the new list:"
+#: templates/browse/javascript.inc:28
+#, fuzzy
+msgid "Please name the new contact list:"
 msgstr "Lütfen yeni listenin adýný girin:"
 
-#: templates/prefs/columnselect.inc:221
-msgid "Please select a directory:"
-msgstr "Lütfen bir dizin seçin:"
+#: edit.php:91 edit.php:94 edit.php:194
+msgid "Previous"
+msgstr ""
 
-#: config/sources.php.dist:384
+#: config/sources.php.dist:416
 msgid "Private Address Book"
 msgstr "Özel Adres Defteri"
 
-#: lib/Driver/ldap.php:146
+#: lib/Driver/ldap.php:147
 #, php-format
 msgid "Query failed: (%s) %s"
 msgstr "Sorgu baþarýsýz: (%s) %s"
 
-#: templates/block/minisearch.inc:43
+#: templates/block/minisearch.inc:18
 msgid "Quick Search"
 msgstr "Hýzlý Arama"
 
-#: lib/Driver/ldap.php:190 lib/Driver/ldap.php:198 lib/Driver/ldap.php:432
+#: lib/Driver/ldap.php:191 lib/Driver/ldap.php:199 lib/Driver/ldap.php:429
 #, php-format
 msgid "Read failed: (%s) %s"
 msgstr "Okuma baþarýsýz: (%s) %s"
 
-#: templates/browse/footer.inc:6
+#: lib/Renderer.php:49
+msgid "Really delete this contact?"
+msgstr ""
+
+#: templates/browse/footer.inc:2
 msgid "Records displayed:"
 msgstr "Görüntülenen kayýtlar:"
 
+#: templates/prefs/addressbookselect.inc:176
+#, fuzzy
+msgid "Remove address book"
+msgstr "Bir adres defteri seçin"
+
 #: templates/prefs/columnselect.inc:239
 msgid "Remove column"
 msgstr "Kolonu sil"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:2
 msgid "Remove from this list"
 msgstr "Bu listeden sil"
 
-#: templates/data/import.inc:26
+#: templates/data/import.inc:21
+#, fuzzy
 msgid ""
-"Replace existing address book with the imported one? <b>Warning: This "
-"deletes all entries in your current address book.</b>"
+"Replace existing address book with the imported one? <strong>Warning: This "
+"deletes all entries in your current address book.</strong>"
 msgstr ""
 "Yüklenen adres defterini varolan ile deðiþtirmek istiyor musunuz? <b>Uyarý: "
 "Bu iþlem þu anki adres defterinizdeki tüm giriþleri siler.</b>"
 
-#: lib/Driver.php:344
+#: lib/Driver.php:438
 msgid "Requested object not found."
 msgstr "Belirtilen nesne bulunamadý."
 
-#: add.php:46 templates/browse/search.inc:126
+#: add.php:37 templates/browse/search.inc:113
 msgid "Reset to Defaults"
 msgstr "Öntanýmlý deðerleri ata"
 
@@ -701,166 +854,195 @@
 msgid "S/MIME Public Certificate"
 msgstr "S/MIME Açýk Sertifikasý"
 
-#: lib/Driver/ldap.php:74
+#: lib/Driver/ldap.php:69
 #, php-format
 msgid "STARTTLS failed: (%s) %s"
 msgstr "STARTTLS baþarýsýz: (%s) %s"
 
-#: edit.php:57 add.php:46
+#: edit.php:99 add.php:37 templates/addressbooks.inc:124
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/browse/search.inc:98 templates/browse/search.inc:125
-#: templates/block/minisearch.inc:48 config/prefs.php.dist:100
+#: templates/browse/search.inc:96 templates/browse/search.inc:112
+#: templates/block/minisearch.inc:21 lib/Block/tree_menu.php:49
+#: config/prefs.php.dist:126
 msgid "Search"
 msgstr "Ara"
 
-#: browse.php:264 minisearch.php:66
-msgid "Search Results"
+#: minisearch.php:63
+#, fuzzy
+msgid "Search Results:"
 msgstr "Arama Sonuçlarý"
 
-#: lib/api.php:805
+#: lib/api.php:1011
 msgid "Search failed"
 msgstr "Arama baþarýsýz"
 
-#: lib/api.php:895 lib/api.php:901 lib/api.php:910 lib/api.php:923
+#: lib/api.php:1103 lib/api.php:1109 lib/api.php:1118 lib/api.php:1131
 #, php-format
 msgid "Search failed: %s"
 msgstr "Arama baþarýsýz: %s"
 
-#: config/prefs.php.dist:28
-msgid "Searching Options"
-msgstr "Arama Seçenekleri"
-
-#: templates/block/minisearch.inc:49
+#: templates/block/minisearch.inc:22
 msgid "Searching..."
 msgstr "Arýyor..."
 
-#: templates/browse/select.inc:9
-msgid "Select Address Book"
-msgstr "Adres Defteri Seç"
+#: templates/addressbooks.inc:66
+#, fuzzy
+msgid "Select an address book to delete"
+msgstr "Verilerin dýþarý aktarýlacaðý adres defterini seçin:"
 
-#: templates/browse/actions.inc:35
-msgid "Select List"
-msgstr "Liste Seç"
+#: templates/addressbooks.inc:90
+#, fuzzy
+msgid "Select an address book to edit"
+msgstr "Verilerin içine aktarýlacaðý adres defterini seçin:"
 
-#: templates/data/export.inc:37
+#: templates/data/export.inc:32
 msgid "Select the address book to export from:"
 msgstr "Verilerin dýþarý aktarýlacaðý adres defterini seçin:"
 
-#: templates/data/import.inc:31
+#: templates/data/import.inc:26
 msgid "Select the address book to import to:"
 msgstr "Verilerin içine aktarýlacaðý adres defterini seçin:"
 
-#: templates/data/export.inc:14
+#: templates/data/import.inc:35
+#, fuzzy
+msgid "Select the charset of the source file:"
+msgstr "Kaynak dosyanýn biçimini seçin:"
+
+#: templates/data/export.inc:10
 msgid "Select the export format:"
 msgstr "Dýþarý aktarma biçimini seçin:"
 
-#: templates/data/import.inc:40
+#: templates/data/import.inc:43
 msgid "Select the file to import:"
 msgstr "Ýçeri aktarýlacak dosyayý seçin:"
 
-#: templates/data/import.inc:16
+#: templates/data/import.inc:11
 msgid "Select the format of the source file:"
 msgstr "Kaynak dosyanýn biçimini seçin:"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:135
 msgid "Select the format used to display names:"
 msgstr "Ýsimlerin görüntüleneceði biçimi seçin:"
 
-#: config/prefs.php.dist:17
-msgid "Select view to display by default."
+#: config/prefs.php.dist:25
+#, fuzzy
+msgid "Select view to display by default, sort options, and paging options."
 msgstr "Öntanýmlý görünümü seçin."
 
-#: config/prefs.php.dist:11
+#: config/prefs.php.dist:18
 msgid "Select which fields to display in the address lists."
 msgstr "Adres listelerinde hangi alanlarýn görüntüleneceðini seçin."
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:32
 msgid "Select which format to display names."
 msgstr "Ýsimlerin görüntüleneceði biçimi seçin."
 
-#: templates/prefs/columnselect.inc:243
-msgid "Selected Columns:"
-msgstr "Seçilen Kolonlar:"
-
-#: add.php:59
-#, php-format
-msgid "Selected address book '%s'."
+#: add.php:54
+#, fuzzy, php-format
+msgid "Selected address book \"%s\"."
 msgstr "Seçilen adres defteri '%s'."
 
-#: config/sources.php.dist:239
+#: config/sources.php.dist:173
 msgid "Shared Directory"
 msgstr "Paylaþýlan Dizin"
 
-#: templates/browse/actions.inc:53
-msgid "Sho_w All"
-msgstr "Tü_münü Göster"
-
-#: templates/browse/select.inc:11
-msgid "Show"
+#: templates/browse/actions.inc:39
+#, fuzzy, php-format
+msgid "Show %s"
 msgstr "Göster"
 
-#: templates/browse/actions.inc:53
+#: templates/browse/actions.inc:41
 msgid "Show All"
 msgstr "Tümünü Göster"
 
-#: templates/browse/actions.inc:52
+#: templates/browse/actions.inc:40
 msgid "Show Contacts"
 msgstr "Ýletiþim Noktalarýný Göster"
 
-#: templates/browse/actions.inc:51
+#: templates/browse/actions.inc:39
 msgid "Show Lists"
 msgstr "Listeleri Göster"
 
-#: templates/browse/actions.inc:52
-msgid "Show _Contacts"
-msgstr "Ýletiþim _Noktalarýný Göster"
-
-#: templates/browse/actions.inc:51
-msgid "Show _Lists"
-msgstr "Lis_teleri Göster"
-
-#: templates/browse/column_headers.inc:12
-#: templates/browse/column_headers.inc:17
+#: templates/browse/column_headers.inc:21
+#: templates/browse/column_headers.inc:34
 msgid "Sort Direction"
 msgstr "Sýralama Yönü"
 
-#: lib/api.php:154
+#: lib/api.php:198
 msgid "Sources"
 msgstr "Kaynaklar"
 
-#: config/prefs.php.dist:130
+#: config/prefs.php.dist:157
 msgid "Specify where you want advanced search results to appear."
 msgstr "Geliþmiþ arama sonuçlarýnýn nerede görüntüleneceðini belirtin."
 
-#: browse.php:156
+#: browse.php:141
 #, php-format
 msgid "Successfully added %s to %s"
 msgstr "%s %s e baþarýyla eklendi"
 
-#: data.php:29
+#: browse.php:222
+#, fuzzy, php-format
+msgid "Successfully created the contact list \"%s\"."
+msgstr "%s %s e baþarýyla eklendi"
+
+#: data.php:50
 msgid "TSV"
 msgstr "TSV"
 
-#: templates/data/import.inc:19 templates/data/export.inc:18
+#: templates/data/import.inc:14 templates/data/export.inc:14
 msgid "Tab separated values"
 msgstr "Tab ile ayrýlmýþ deðerler"
 
-#: data.php:234
+#: view.php:15
+msgid "The VFS backend needs to be configured to enable attachment uploads."
+msgstr ""
+
+#: lib/Driver.php:1054
+#, fuzzy, php-format
+msgid "The address book \"%s\" does not exist."
+msgstr "Adres defteri boþaltýlamadý: %s"
+
+#: addressbooks.php:45
+#, fuzzy, php-format
+msgid "The address book \"%s\" was created successfully."
+msgstr "Adres defteri baþarýyla boþaltýldý."
+
+#: addressbooks.php:70
+#, fuzzy, php-format
+msgid "The address book \"%s\" was removed successfully."
+msgstr "Adres defteri baþarýyla boþaltýldý."
+
+#: addressbooks.php:89
+#, fuzzy, php-format
+msgid "The address book \"%s\" was successfully updated."
+msgstr "Adres defteri baþarýyla boþaltýldý."
+
+#: data.php:303
 #, php-format
 msgid "The address book could not be purged: %s"
 msgstr "Adres defteri boþaltýlamadý: %s"
 
-#: edit.php:24 vcard.php:22 display.php:23
+#: edit.php:47 vcard.php:22 display.php:23 view.php:26
 msgid "The contact you requested does not exist."
 msgstr "Belirttiðiniz iletiþim noktasý yok."
 
-#: browse.php:58
+#: edit.php:116
+#, fuzzy, php-format
+msgid "The file \"%s\" has successfully been deleted."
+msgstr "%s dosyasý baþarýyla (içeri) aktarýldý"
+
+#: data.php:284
+msgid "The import can be finished despite the warnings."
+msgstr ""
+
+#: browse.php:31
 msgid "There are no browseable address books."
 msgstr "Gözatýlabilecek bir adres defteri yok"
 
-#: add.php:38
+#: add.php:29
 msgid ""
 "There are no writeable address books. None of the available address books "
 "are configured to allow you to add new entries to them. If you believe this "
@@ -870,7 +1052,7 @@
 "giriþler ekleyebileceðiniz þekilde yapýlandýrýlmamýþ. Eðer bunun bir hata "
 "durumu olduðunu düþünüyorsanýz lüften sistem yöneticinize baþvurun."
 
-#: add.php:108
+#: add.php:121
 msgid ""
 "There was an error adding the new contact. Contact your system administrator "
 "for further help."
@@ -878,94 +1060,131 @@
 "Yeni iletiþim noktasý eklerken hata oluþtu. Lüften sistem "
 "yöneticinizebaþvurun."
 
-#: browse.php:212
+#: browse.php:189 browse.php:230
+#, fuzzy
+msgid "There was an error adding this object."
+msgstr "Bu nesneyi silerken hata oluþtu."
+
+#: browse.php:238
 msgid "There was an error creating a new list."
 msgstr "Yeni liste üretilirken hata oluþtu."
 
-#: browse.php:163
-#, php-format
-msgid "There was an error deleting %s from the source address book."
+#: addressbooks.php:35
+#, fuzzy, php-format
+msgid "There was an error creating this address book: %s"
+msgstr "Bu kayýtý güncellerken hata oluþtu: %s"
+
+#: browse.php:147
+#, fuzzy, php-format
+msgid "There was an error deleting \"%s\" from the source address book."
 msgstr "Kaynak adres defterinden %s'yi silerken hata oluþtu."
 
-#: delete.php:31
+#: delete.php:37
 #, php-format
 msgid "There was an error deleting this contact: %s"
 msgstr "Bu iletiþim noktasýný silerken hata oluþtu: %s"
 
-#: browse.php:93
+#: browse.php:72
 msgid "There was an error deleting this object."
 msgstr "Bu nesneyi silerken hata oluþtu."
 
-#: browse.php:294
-msgid "There was an error displaying the select List"
+#: browse.php:278
+#, fuzzy
+msgid "There was an error displaying the list"
 msgstr "Seçilen listeyi görüntülerken hata oluþtu"
 
-#: data.php:249
+#: data.php:335
 #, php-format
 msgid "There was an error importing the data: %s"
 msgstr "Veriyi içeri aktarýrken hata oluþtu: %s"
 
-#: lib/api.php:334
+#: lib/api.php:507 lib/api.php:761
 msgid "There was an error importing the iCalendar data."
 msgstr "iCalendar verisini içeri aktarýrken hata oluþtu."
 
-#: browse.php:83
-msgid "There was an error removing this object."
+#: browse.php:58
+#, fuzzy
+msgid "There was an error removing a contact from the list."
+msgstr "Yeni liste üretilirken hata oluþtu."
+
+#: addressbooks.php:55 addressbooks.php:60 addressbooks.php:68
+#, fuzzy, php-format
+msgid "There was an error removing this address book: %s"
 msgstr "Bu nesneyi silerken hata oluþtu."
 
-#: edit.php:84
+#: addressbooks.php:81 addressbooks.php:87
+#, fuzzy, php-format
+msgid "There was an error updating this address book: %s"
+msgstr "Bu kayýtý güncellerken hata oluþtu: %s"
+
+#: edit.php:158
 #, php-format
 msgid "There was an error updating this entry: %s"
 msgstr "Bu kayýtý güncellerken hata oluþtu: %s"
 
-#: data.php:151
+#: data.php:179
 msgid "There were no addresses to export."
 msgstr "Dýþarý aktarýlacak hiç adres yok."
 
-#: lib/Driver.php:404 lib/Driver.php:445
-msgid "This address book is read-only"
-msgstr "Bu adres defteri salt-okunur."
+#: templates/prefs/addressbookselect.inc:180
+msgid "These address books will display in this order:"
+msgstr ""
 
-#: data.php:211
+#: templates/prefs/columnselect.inc:243
+msgid "These columns will display in this order:"
+msgstr ""
+
+#: data.php:269
 msgid "This file format is not supported."
 msgstr "Bu dosya biçimi desteklenmiyor."
 
-#: lib/api.php:914 lib/api.php:927
+#: lib/api.php:1122 lib/api.php:1135
 #, php-format
 msgid "This person already has a %s entry in the address book"
 msgstr "Bu kiþiye ait %s kayýtý adres defterinde mevcut."
 
+#: config/prefs.php.dist:147
+msgid ""
+"This will be the default address book when adding or importing contacts."
+msgstr ""
+
 #: config/attributes.php.dist:70
 msgid "Title"
 msgstr "Ünvan"
 
-#: lib/Driver.php:825
+#: lib/Turba.php:435
+#, php-format
+msgid "Unable to create new share.  Missing source type."
+msgstr ""
+
+#: lib/Driver.php:979
 #, php-format
 msgid "Unable to load the definition of %s."
 msgstr "%s tanýmý yüklenemiyor."
 
-#: edit.php:57
+#: edit.php:88 edit.php:91 edit.php:94 edit.php:99 edit.php:196
 msgid "Undo Changes"
 msgstr "Deðiþiklikleri Geri Al"
 
-#: lib/api.php:466
-msgid "Unsupported Content-Type."
+#: lib/api.php:540 lib/api.php:643 lib/api.php:779
+#, fuzzy, php-format
+msgid "Unsupported Content-Type: %s"
 msgstr "Desteklenmeyen Ýçerik Türü"
 
-#: config/sources.php.dist:139
+#: config/sources.php.dist:376
 msgid "Verisign Directory"
 msgstr "Verisign Dizini"
 
-#: templates/browse/contactrow.inc:27
-#, php-format
-msgid "View '%s'"
+#: templates/browse/row.inc:19 templates/browse/contactrow.inc:27
+#, fuzzy, php-format
+msgid "View \"%s\""
 msgstr "'%s' Görüntüle"
 
-#: minisearch.php:82
+#: minisearch.php:78
 msgid "View Contact"
 msgstr "Ýletiþim Noktasýný Görüntüle"
 
-#: config/prefs.php.dist:98
+#: config/prefs.php.dist:124
 msgid "View to display by default:"
 msgstr "Öntanýmlý görünüm"
 
@@ -1001,11 +1220,12 @@
 msgid "Work Street Address"
 msgstr "Ýþ Adresi"
 
-#: templates/browse/javascript.inc:25
-msgid "You are creating a distribution list."
-msgstr "Bir daðýtým listesi oluþturuyorsunuz."
+#: data.php:237 browse.php:93 browse.php:201 add.php:73
+#, php-format
+msgid "You are not allowed to create more than %d contacts in \"%s\"."
+msgstr ""
 
-#: edit.php:44 display.php:48
+#: edit.php:69 display.php:58 view.php:36
 msgid "You do not have permission to view this contact."
 msgstr "Bu iletiþim noktasýný görüntülemeye izniniz yok."
 
@@ -1013,47 +1233,73 @@
 msgid "You do not have permission to view this object."
 msgstr "Bu nesneyi görüntülemeye izniniz yok."
 
-#: templates/browse/javascript.inc:41
+#: templates/browse/javascript.inc:55
 msgid "You must select a target address book."
 msgstr "Bir hedef adres defteri seçmelisiniz."
 
-#: templates/browse/javascript.inc:18
+#: templates/browse/javascript.inc:23
 msgid "You must select a target list."
 msgstr "Bir hedef liste seçmelisiniz."
 
-#: templates/browse/javascript.inc:58
+#: edit.php:32
+#, fuzzy
+msgid "You must select at least one contact first."
+msgstr "Önce en az bir ksyýt seçmelisiniz."
+
+#: templates/browse/javascript.inc:17 templates/browse/javascript.inc:49
+#: templates/browse/javascript.inc:72
 msgid "You must select at least one entry first."
 msgstr "Önce en az bir ksyýt seçmelisiniz."
 
-#: edit.php:48
+#: edit.php:73
 msgid "You only have permission to view this contact."
 msgstr "Bu iletiþim noktasýný sadece görüntüleme izniniz var."
 
-#: templates/browse/contactrow.inc:12
+#: browse.php:285
+msgid "Your default address book is not browseable."
+msgstr ""
+
+#: templates/browse/row.inc:6 templates/browse/contactrow.inc:12
 msgid "[no value]"
 msgstr "[deðer yok]"
 
-#: lib/Turba.php:275
-msgid "_Add"
-msgstr "_Ekle"
-
-#: lib/Turba.php:274
+#: lib/Turba.php:484
 msgid "_Browse"
 msgstr "_Gözat"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:40
+#, fuzzy
+msgid "_Contacts"
+msgstr "Ýletiþim _Noktalarýný Göster"
+
+#: templates/browse/actions.inc:2
 msgid "_Delete"
 msgstr "S_il"
 
-#: lib/Turba.php:280
+#: lib/Turba.php:493
 msgid "_Import/Export"
 msgstr "Ýçeri/_Dýþarý Aktar"
 
-#: templates/browse/actions.inc:5
+#: templates/browse/actions.inc:39
+#, fuzzy
+msgid "_Lists"
+msgstr "Liste"
+
+#: lib/Turba.php:481
+#, fuzzy
+msgid "_My Address Books"
+msgstr "Adres Defterim"
+
+#: lib/Turba.php:487
+#, fuzzy
+msgid "_New Contact"
+msgstr "Yeni Ýletiþim Noktasý"
+
+#: templates/browse/actions.inc:2
 msgid "_Remove from this list"
 msgstr "B_u listeden sil"
 
-#: lib/Turba.php:276
+#: lib/Turba.php:489
 msgid "_Search"
 msgstr "_Arama"
 
@@ -1061,19 +1307,35 @@
 msgid "contact.vcf"
 msgstr "contact.vcf"
 
-#: data.php:172 data.php:177 templates/data/export.inc:1
+#: data.php:199 data.php:204 templates/data/export.inc:1
 msgid "contacts.csv"
 msgstr "contacts.csv"
 
-#: data.php:182
+#: data.php:209
 msgid "contacts.tsv"
 msgstr "contacts.tsv"
 
-#: templates/browse/actions.inc:22
-msgid "to Selected Address Book"
+#: data.php:219
+#, fuzzy
+msgid "contacts.vcf"
+msgstr "contact.vcf"
+
+#: templates/prefs/imsp_opt.inc:34
+#, fuzzy
+msgid "none"
+msgstr "Hiçbiri"
+
+#: templates/browse/actions.inc:24
+#, fuzzy
+msgid "to a Contact List"
+msgstr "Ýletiþim Noktalarýný Göster"
+
+#: templates/browse/actions.inc:14
+#, fuzzy
+msgid "to a different Address Book"
 msgstr "Seçilen Adres Defterine"
 
-#: data.php:30 templates/browse/column_headers.inc:9
-#: templates/data/import.inc:20 templates/data/export.inc:20
+#: data.php:51 templates/browse/column_headers.inc:13
+#: templates/data/import.inc:15 templates/data/export.inc:15
 msgid "vCard"
 msgstr "vCard"




More information about the pkg-horde-hackers mailing list