From 166979a07aa547655b9c8a5cc605bf026cf92234 Mon Sep 17 00:00:00 2001 From: "Duck (Jakob Munih)" Date: Fri, 30 Jan 2009 17:22:48 +0100 Subject: [PATCH] Various small fixes from my svn. Finally I will move my work to git --- folks/config/hooks.php.dist | 501 +++++++------- folks/config/prefs.php.dist | 4 +- folks/edit/blacklist.php | 2 +- folks/index.php | 2 +- folks/lib/Driver.php | 3 +- folks/lib/Driver/sql.php | 2 +- folks/lib/Folks.php | 2 +- folks/lib/Forms/Activity.php | 3 +- folks/lib/Forms/AddFriend.php | 5 +- folks/lib/Forms/Login.php | 7 +- folks/lib/Forms/Search.php | 5 +- folks/lib/Friends.php | 6 +- folks/lib/Friends/shared.php | 4 +- folks/lib/Friends/sql.php | 18 +- folks/lib/api.php | 8 +- folks/lib/base.php | 2 +- folks/lib/version.php | 2 +- folks/po/folks.pot | 2 +- folks/po/folksmini.pot | 1456 ----------------------------------------- folks/po/sl_SI.po | 304 +++++---- folks/report.php | 2 +- 21 files changed, 447 insertions(+), 1893 deletions(-) delete mode 100644 folks/po/folksmini.pot diff --git a/folks/config/hooks.php.dist b/folks/config/hooks.php.dist index f5f6d177f..bfe29876b 100644 --- a/folks/config/hooks.php.dist +++ b/folks/config/hooks.php.dist @@ -1,6 +1,6 @@ callByPackage('oscar', 'countVideos', array(array('author' => $user))); -// -// case 'attendances': -// return $GLOBALS['registry']->callByPackage('schedul', 'countUserAttendances', array(array('user' => $user))); -// -// case 'news': -// return $GLOBALS['registry']->callByPackage('news', 'countNews', array(array('user' => $user))); -// -// case 'wishes': -// $result = $GLOBALS['registry']->callByPackage('genie', 'listUserItems', array($user)); -// if ($result instanceof PEAR_Error) { -// return $result; -// } else { -// return count($result); -// } -// -// case 'galleries': -// return $GLOBALS['registry']->callByPackage('ansel', 'countGalleries', array('ansel', PERMS_SHOW, $user)); -// -// case 'blogs': -// return $GLOBALS['registry']->callByPackage('thomas', 'countPosts', array(array('user' => $user))); -// -// case 'classifieds': -// return $GLOBALS['registry']->callByPackage('classified', 'countAds', array(array('user_uid' => $user))); -// -// default: -// return 0; -// } -// -// } -// } +if (!function_exists('_folks_hook_countService')) { + + function _folks_hook_countService($service, $user) + { + switch ($service) { + + case 'videos': + return $GLOBALS['registry']->callByPackage('oscar', 'countVideos', array(array('author' => $user))); + + case 'attendances': + return $GLOBALS['registry']->callByPackage('schedul', 'countUserAttendances', array(array('user' => $user))); + + case 'news': + return $GLOBALS['registry']->callByPackage('news', 'countNews', array(array('user' => $user))); + + case 'wishes': + $result = $GLOBALS['registry']->callByPackage('genie', 'listUserItems', array($user)); + if ($result instanceof PEAR_Error) { + return $result; + } else { + return count($result); + } + + case 'galleries': + return $GLOBALS['registry']->callByPackage('ansel', 'countGalleries', array('ansel', PERMS_SHOW, $user)); + + case 'blogs': + return $GLOBALS['registry']->callByPackage('thomas', 'countPosts', array(array('user' => $user))); + + case 'classifieds': + return $GLOBALS['registry']->callByPackage('classified', 'countAds', array(array('user_uid' => $user))); + + default: + return 0; + } + + } +} + +// DB optimized version // // if (!function_exists('_folks_hook_countService')) { // @@ -114,36 +116,39 @@ // registry calls and one much faster with direct DB access but requres your // monitorig for application structure changes. -// if (!function_exists('_folks_hook_getService')) { -// function _folks_hook_getService($service, $user) -// { -// switch ($service) { -// -// case 'videos': -// return $GLOBALS['registry']->callByPackage('oscar', 'listVideos', array(array('author' => $user, 0, 3))); -// -// case 'attendances': -// return $GLOBALS['registry']->callByPackage('schedul', 'getUserAttendances', array($user)); -// -// case 'news': -// return $GLOBALS['registry']->callByPackage('news', 'listNews', array(array('user' => $user), 0, 3)); -// -// case 'wishes': -// return $GLOBALS['registry']->callByPackage('genie', 'listUserItems', array($user)); -// -// case 'galleries': -// return $GLOBALS['registry']->callByPackage('ansel', 'listGalleries', array('ansel', PERMS_SHOW, null, true, 0, 3, $user)); -// -// case 'blogs': -// return $GLOBALS['registry']->callByPackage('thomas', 'getRecentPosts', array($user, Auth::getAuth(), '', 3)); -// -// case 'classifieds': -// return $GLOBALS['registry']->callByPackage('classified', 'listAds', array(array('user_uid' => $user), 0, 3)); -// -// default: -// return array(); -// } -// +if (!function_exists('_folks_hook_getService')) { + function _folks_hook_getService($service, $user) + { + switch ($service) { + + case 'videos': + return $GLOBALS['registry']->callByPackage('oscar', 'listVideos', array(array('author' => $user, 0, 3))); + + case 'attendances': + return $GLOBALS['registry']->callByPackage('schedul', 'getUserAttendances', array($user)); + + case 'news': + return $GLOBALS['registry']->callByPackage('news', 'listNews', array(array('user' => $user), 0, 3)); + + case 'wishes': + return $GLOBALS['registry']->callByPackage('genie', 'listUserItems', array($user)); + + case 'galleries': + return $GLOBALS['registry']->callByPackage('ansel', 'listGalleries', array('ansel', PERMS_SHOW, null, true, 0, 3, $user)); + + case 'blogs': + return $GLOBALS['registry']->callByPackage('thomas', 'getRecentPosts', array($user, Auth::getAuth(), '', 3)); + + case 'classifieds': + return $GLOBALS['registry']->callByPackage('classified', 'listAds', array(array('user_uid' => $user), 0, 3)); + + default: + return array(); + } + } +} + +// DB optimized version // // if (!function_exists('_folks_hook_getService')) { // function _folks_hook_getService($service, $user) @@ -212,64 +217,64 @@ // paid service and perform autologin or redirect to a wikipage with // additional information -// if (!function_exists('_folks_hook_prelogin')) { -// -// function _folks_hook_prelogin($app) -// { -// require_once 'Horde/Group.php'; -// $group = Group::singleton(); -// $user_uid = Auth::getAuth(); -// -// switch ($app) { -// -// case 'gollem': -// -// if (Auth::isAdmin() || $group->userIsInGroup($user_uid, 1, false)) { -// $_GET['backend_key'] = 'kjbnzi78'; -// require $GLOBALS['registry']->get('fileroot', 'gollem') . '/redirect.php'; -// exit; -// } else { -// header('Location: ' . $GLOBALS['registry']->link('wiki/show', array('page' => 'PaidFiles'))); -// exit; -// } -// break; -// -// case 'imp': -// -// if (Auth::isAdmin() -// || $group->userIsInGroup($user_uid, 1, false) -// || $group->userIsInGroup($user_uid, 2, false)) { -// -// $db = DB::connect($GLOBALS['conf']['sql']); -// $password = $db->getOne('SELECT password FROM mails.accountuser WHERE username = ?', array($user_uid . '@HOST')); -// -// $GLOBALS['authentication'] = 'none'; -// $GLOBALS['noset_view'] = true; -// require_once $GLOBALS['registry']->get('fileroot', 'imp') . '/lib/base.php'; -// require_once IMP_BASE . '/lib/Session.php'; -// $server = IMP_Session::getAutoLoginServer(true); -// -// $try = IMP_Session::createSession($user_uid, $password, $server); -// if ($try === true) { -// if ($GLOBALS['browser']->isMobile()) { -// require $GLOBALS['registry']->get('fileroot', 'mimp') . '/mailbox.php'; -// } else { -// require $GLOBALS['registry']->get('fileroot', 'imp') . '/redirect.php'; -// } -// } else { -// $notification->push(_("There was an error login into your mail account.")); -// header('Location: ' . $GLOBALS['registry']->get('webroot', 'folks') . 'login.php'); -// } -// } else { -// header('Location: ' . $GLOBALS['registry']->link('wiki/show', array('page' => 'MailAccount'))); -// } -// -// exit; -// -// break; -// } -// } -// } +if (!function_exists('_folks_hook_prelogin')) { + + function _folks_hook_prelogin($app) + { + require_once 'Horde/Group.php'; + $group = Group::singleton(); + $user_uid = Auth::getAuth(); + + switch ($app) { + + case 'gollem': + + if (Auth::isAdmin() || $group->userIsInGroup($user_uid, 1, false)) { + $_GET['backend_key'] = 'kjbnzi78'; + require $GLOBALS['registry']->get('fileroot', 'gollem') . '/redirect.php'; + exit; + } else { + header('Location: ' . $GLOBALS['registry']->link('wiki/show', array('page' => 'PaidFiles'))); + exit; + } + break; + + case 'imp': + + if (Auth::isAdmin() + || $group->userIsInGroup($user_uid, 1, false) + || $group->userIsInGroup($user_uid, 2, false)) { + + $db = DB::connect($GLOBALS['conf']['sql']); + $password = $db->getOne('SELECT password FROM mails.accountuser WHERE username = ?', array($user_uid . '@HOST')); + + $GLOBALS['authentication'] = 'none'; + $GLOBALS['noset_view'] = true; + require_once $GLOBALS['registry']->get('fileroot', 'imp') . '/lib/base.php'; + require_once IMP_BASE . '/lib/Session.php'; + $server = IMP_Session::getAutoLoginServer(true); + + $try = IMP_Session::createSession($user_uid, $password, $server); + if ($try === true) { + if ($GLOBALS['browser']->isMobile()) { + require $GLOBALS['registry']->get('fileroot', 'mimp') . '/mailbox.php'; + } else { + require $GLOBALS['registry']->get('fileroot', 'imp') . '/redirect.php'; + } + } else { + $notification->push(_("There was an error login into your mail account.")); + header('Location: ' . $GLOBALS['registry']->get('webroot', 'folks') . 'login.php'); + } + } else { + header('Location: ' . $GLOBALS['registry']->link('wiki/show', array('page' => 'MailAccount'))); + } + + exit; + + break; + } + } +} // This hook is called when a user submits a signup request. It allows @@ -277,136 +282,136 @@ // attempts are made to add them to the system. Here we lowecase the useranme // and check if username or email is already taken -// if (!function_exists('_horde_hook_signup_preprocess')) { -// function _horde_hook_signup_preprocess($info) -// { -// if (isset($info['extra']['username'])) { -// $info['extra']['username'] = String::lower($info['extra']['username']); -// $username = $info['extra']['username']; -// } else { -// $info['user_name'] = String::lower($info['user_name']); -// $username = $info['user_name']; -// } -// -// if (!eregi("^[_a-z0-9-]*$", $username)) { -// return PEAR::raiseError(_("Username can contain only alphanumeric characters, underscore and minus.")); -// } -// -// $_db = DB::connect($GLOBALS['conf']['sql'], true); -// -// $query = 'SELECT user_uid, user_email FROM folks_users WHERE user_uid = ? OR user_email = ?'; -// $result = $_db->getRow($query, array($username, $info['extra']['email']), DB_FETCHMODE_ASSOC); -// -// if ($result instanceof PEAR_Error) { -// return $result; -// } elseif (empty($result)) { -// return $info; -// } elseif ($result['user_uid'] == $username) { -// return PEAR::raiseError(_("There is already an user registered with this username")); -// } elseif ($result['user_email'] == $info['extra']['email']) { -// return PEAR::raiseError(_("There is already an user registered with this email")); -// } -// -// return $info; -// } -// } +if (!function_exists('_horde_hook_signup_preprocess')) { + function _horde_hook_signup_preprocess($info) + { + if (isset($info['extra']['username'])) { + $info['extra']['username'] = String::lower($info['extra']['username']); + $username = $info['extra']['username']; + } else { + $info['user_name'] = String::lower($info['user_name']); + $username = $info['user_name']; + } + + if (!eregi("^[_a-z0-9-]*$", $username)) { + return PEAR::raiseError(_("Username can contain only alphanumeric characters, underscore and minus.")); + } + + $_db = DB::connect($GLOBALS['conf']['sql'], true); + + $query = 'SELECT user_uid, user_email FROM folks_users WHERE user_uid = ? OR user_email = ?'; + $result = $_db->getRow($query, array($username, $info['extra']['email']), DB_FETCHMODE_ASSOC); + + if ($result instanceof PEAR_Error) { + return $result; + } elseif (empty($result)) { + return $info; + } elseif ($result['user_uid'] == $username) { + return PEAR::raiseError(_("There is already an user registered with this username")); + } elseif ($result['user_email'] == $info['extra']['email']) { + return PEAR::raiseError(_("There is already an user registered with this email")); + } + + return $info; + } +} // Following on from the example in the above function, this is how a sample // _horde_hook_signup_addextra function would look like. // Here we connect to the database and update folks user table // with additional user data and send confirmation code to check his email -// if (!function_exists('_horde_hook_signup_addextra')) { -// function _horde_hook_signup_addextra($userID, $extra) -// { -// global $conf; -// -// $_db = DB::connect($conf['sql']); -// $fields = array(); -// $values = array(); -// foreach ($extra as $field => $value) { -// if ($field == 'user_name') { -// continue; -// } -// if ($field == 'password') { -// $value = hash('md5', $value); -// } -// $fields[] = 'user_' . String::lower($field); -// $values[] = String::convertCharset($value, NLS::getCharset(), $conf['sql']['charset']); -// } -// -// $values[] = $userID; -// $query = 'UPDATE folks_users SET ' . implode(' = ?, ', $fields) . ' = ? ' -// . ' WHERE user_uid = ?'; -// -// $result = $_db->query($query, $values); -// if ($result instanceof PEAR_Error) { -// return $result; -// } -// -// require_once $GLOBALS['registry']->get('fileroot', 'folks') . '/lib/Folks.php'; -// $code = Folks::encodeString($userID, 'activate' . hash('md5', $extra['password'])); -// $link = Util::addParameter(Horde::applicationUrl('account/approve.php', true, -1), -// array('user' => $userID, 'code' => $code), -// null, false); -// -// $body = sprintf(_("Your username on %s %s is: %s. \n\n Please confirm the registration by going to this link \n %s"), -// $GLOBALS['registry']->get('name', 'horde'), -// Horde::url($GLOBALS['registry']->get('webroot', 'horde'), true), -// $user['user_uid'], -// $link); -// -// $result = Folks::sendMail($extra['email'], _("Confirmation code"), $body); -// if ($result instanceof PEAR_Error) { -// $_db->query('DELETE FROM folks_users WHERE user_uid = ?', array($userID)); -// } -// -// return $result; -// } -// } +if (!function_exists('_horde_hook_signup_addextra')) { + function _horde_hook_signup_addextra($userID, $extra) + { + global $conf; + + $_db = DB::connect($conf['sql']); + $fields = array(); + $values = array(); + foreach ($extra as $field => $value) { + if ($field == 'user_name') { + continue; + } + if ($field == 'password') { + $value = hash('md5', $value); + } + $fields[] = 'user_' . String::lower($field); + $values[] = String::convertCharset($value, NLS::getCharset(), $conf['sql']['charset']); + } + + $values[] = $userID; + $query = 'UPDATE folks_users SET ' . implode(' = ?, ', $fields) . ' = ? ' + . ' WHERE user_uid = ?'; + + $result = $_db->query($query, $values); + if ($result instanceof PEAR_Error) { + return $result; + } + + require_once $GLOBALS['registry']->get('fileroot', 'folks') . '/lib/Folks.php'; + $code = Folks::encodeString($userID, 'activate' . hash('md5', $extra['password'])); + $link = Util::addParameter(Horde::applicationUrl('account/approve.php', true, -1), + array('user' => $userID, 'code' => $code), + null, false); + + $body = sprintf(_("Your username on %s %s is: %s. \n\n Please confirm the registration by going to this link \n %s"), + $GLOBALS['registry']->get('name', 'horde'), + Horde::url($GLOBALS['registry']->get('webroot', 'horde'), true), + $user['user_uid'], + $link); + + $result = Folks::sendMail($extra['email'], _("Confirmation code"), $body); + if ($result instanceof PEAR_Error) { + $_db->query('DELETE FROM folks_users WHERE user_uid = ?', array($userID)); + } + + return $result; + } +} // This is an example of a post-push hook; it is called right after an // application is pushed successfully onto the app stack. Here we check // If the user has a authentication cookie code. Compara it with one in DB // and autologin the user. -// if (!function_exists('_horde_hook_post_pushapp')) { -// function _horde_hook_post_pushapp($app) -// { -// if ($app != 'horde' || -// !isset($_COOKIE['folks_login_code']) || -// !isset($_COOKIE['folks_login_user'])) { -// return; -// } -// -// $user = Auth::getAuth(); -// if ($user) { -// return; -// } -// -// $conn = mysql_connect($GLOBALS['conf']['sql']['hostspec'], -// $GLOBALS['conf']['sql']['username'], -// $GLOBALS['conf']['sql']['password']); -// -// $query = 'SELECT user_password FROM ' -// . $GLOBALS['conf']['sql']['database'] -// . '.folks_users WHERE user_uid = "' -// . $_COOKIE['folks_login_user'] . '"'; -// -// $result = mysql_query($query); -// $r = mysql_fetch_assoc($result); -// -// if (mysql_num_rows($result) == 0) { -// return; -// } -// -// $key = date('m') . $r['user_password']; -// require_once $GLOBALS['registry']->get('fileroot', 'folks') . '/lib/Folks.php'; -// if ($_COOKIE['folks_login_code'] != Folks::encodeString($_COOKIE['folks_login_user'], $key)) { -// return; -// } -// -// $auth = &Auth::singleton('folks'); -// return $auth->setAuth($_COOKIE['folks_login_user'], array('transparent' => 1, 'password' => null)); -// } -// } +if (!function_exists('_horde_hook_post_pushapp')) { + function _horde_hook_post_pushapp($app) + { + if ($app != 'horde' || + !isset($_COOKIE['folks_login_code']) || + !isset($_COOKIE['folks_login_user'])) { + return; + } + + $user = Auth::getAuth(); + if ($user) { + return; + } + + $conn = mysql_connect($GLOBALS['conf']['sql']['hostspec'], + $GLOBALS['conf']['sql']['username'], + $GLOBALS['conf']['sql']['password']); + + $query = 'SELECT user_password FROM ' + . $GLOBALS['conf']['sql']['database'] + . '.folks_users WHERE user_uid = "' + . $_COOKIE['folks_login_user'] . '"'; + + $result = mysql_query($query); + $r = mysql_fetch_assoc($result); + + if (mysql_num_rows($result) == 0) { + return; + } + + $key = date('m') . $r['user_password']; + require_once $GLOBALS['registry']->get('fileroot', 'folks') . '/lib/Folks.php'; + if ($_COOKIE['folks_login_code'] != Folks::encodeString($_COOKIE['folks_login_user'], $key)) { + return; + } + + $auth = &Auth::singleton('folks'); + return $auth->setAuth($_COOKIE['folks_login_user'], array('transparent' => 1, 'password' => null)); + } +} diff --git a/folks/config/prefs.php.dist b/folks/config/prefs.php.dist index b884bbc3e..2e5a22f2b 100644 --- a/folks/config/prefs.php.dist +++ b/folks/config/prefs.php.dist @@ -1,6 +1,6 @@ _("Settings"), 'label' => _("Activity log"), - 'desc' => _("Set activity prefetences"), + 'desc' => _("Set activity preferences"), 'members' => array('log_user_comments', 'log_account_changes', 'log_scopes', 'log_scope_comments') ); diff --git a/folks/edit/blacklist.php b/folks/edit/blacklist.php index 4ec8dee3a..d241a213b 100644 --- a/folks/edit/blacklist.php +++ b/folks/edit/blacklist.php @@ -1,6 +1,6 @@ + * @author Duck */ define('FOLKS_BASE', dirname(__FILE__)); diff --git a/folks/lib/Driver.php b/folks/lib/Driver.php index f722f661c..f803b1a8b 100644 --- a/folks/lib/Driver.php +++ b/folks/lib/Driver.php @@ -3,7 +3,7 @@ * Folks_Driver:: defines an API for implementing storage backends for * Folks. * - * $Id: Driver.php 991 2008-10-10 10:27:58Z duck $ + * $Id: Driver.php 1247 2009-01-30 15:01:34Z duck $ * * Copyright Obala d.o.o. (www.obala.si) * @@ -815,5 +815,4 @@ class Folks_Driver { $GLOBALS['cache']->expire($user . '_activity'); return $this->_deleteActivity($scope, $date, $user); } - } diff --git a/folks/lib/Driver/sql.php b/folks/lib/Driver/sql.php index 481ca703a..0845c2aae 100644 --- a/folks/lib/Driver/sql.php +++ b/folks/lib/Driver/sql.php @@ -20,7 +20,7 @@ * The table structure can be created by the scripts/sql/folks_foo.sql * script. * - * $Id: sql.php 1074 2008-11-29 09:04:26Z duck $ + * $Id: sql.php 1234 2009-01-28 18:44:02Z duck $ * * Copyright 2008-2009 The Horde Project (http://www.horde.org/) * diff --git a/folks/lib/Folks.php b/folks/lib/Folks.php index 85c20f38e..3eaaffdb1 100644 --- a/folks/lib/Folks.php +++ b/folks/lib/Folks.php @@ -2,7 +2,7 @@ /** * Folks Base Class. * - * $Id: Folks.php 976 2008-10-07 21:24:47Z duck $ + * $Id: Folks.php 1247 2009-01-30 15:01:34Z duck $ * * Copyright Obala d.o.o. (www.obala.si) * diff --git a/folks/lib/Forms/Activity.php b/folks/lib/Forms/Activity.php index cb94c2223..23c53e582 100644 --- a/folks/lib/Forms/Activity.php +++ b/folks/lib/Forms/Activity.php @@ -1,6 +1,6 @@ + * @package Folks */ class Folks_Activity_Form extends Horde_Form { diff --git a/folks/lib/Forms/AddFriend.php b/folks/lib/Forms/AddFriend.php index 906284e62..24b610cf5 100644 --- a/folks/lib/Forms/AddFriend.php +++ b/folks/lib/Forms/AddFriend.php @@ -1,13 +1,14 @@ + * @package Folks */ class Folks_AddFriend_Form extends Horde_Form { diff --git a/folks/lib/Forms/Login.php b/folks/lib/Forms/Login.php index 3e8486d1f..7545c34e9 100644 --- a/folks/lib/Forms/Login.php +++ b/folks/lib/Forms/Login.php @@ -1,13 +1,14 @@ + * @package Folks */ class Folks_Login_Form extends Horde_Form { @@ -24,7 +25,7 @@ class Folks_Login_Form extends Horde_Form { $this->addVariable(_("Password"), 'password', 'password', true, false, _("Enter your password. Please be aware that password is case sensitive.")); - $v = &$this->addVariable(_("Remember login?"), 'loginfor', 'radio', true, false, null, + $v = &$this->addVariable(_("Remember login?"), 'loginfor', 'radio', true, false, null, array(array('0' => _("No, only for this view"), '1' => _("Yes, remember me so the next time I don't neet to login")))); $v->setDefault('0'); diff --git a/folks/lib/Forms/Search.php b/folks/lib/Forms/Search.php index 392dab57d..bbe629e58 100644 --- a/folks/lib/Forms/Search.php +++ b/folks/lib/Forms/Search.php @@ -1,13 +1,14 @@ + * @package Folks */ class Folks_Search_Form extends Horde_Form { diff --git a/folks/lib/Friends.php b/folks/lib/Friends.php index 402d1d3c2..d2dc7e4cb 100644 --- a/folks/lib/Friends.php +++ b/folks/lib/Friends.php @@ -3,7 +3,7 @@ * Folks_Friends:: defines an API for implementing storage backends for * Friends. * - * $Id: Friends.php 910 2008-09-24 19:02:50Z duck $ + * $Id: Friends.php 1248 2009-01-30 15:04:49Z duck $ * * Copyright Obala d.o.o. (www.obala.si) * @@ -86,7 +86,7 @@ class Folks_Friends { * @param array $params A hash containing any additional configuration * or connection parameters a subclass might need. */ - static function singleton($driver = null, $params = null) + static public function singleton($driver = null, $params = null) { $signature = $driver . ':' . $params['user']; if (!array_key_exists($signature, self::$instances)) { @@ -445,4 +445,4 @@ class Folks_Friends { return array_merge($permission->getUserPermissions(PERM_DELETE), $GLOBALS['conf']['auth']['admins']); } -} \ No newline at end of file +} diff --git a/folks/lib/Friends/shared.php b/folks/lib/Friends/shared.php index 7a2e41695..50a6fe2c4 100644 --- a/folks/lib/Friends/shared.php +++ b/folks/lib/Friends/shared.php @@ -6,7 +6,7 @@ require_once dirname(__FILE__) . '/sql.php'; * Folks_Friends:: defines an API for implementing storage backends for * Folks. * - * $Id: shared.php 1019 2008-10-31 08:18:10Z duck $ + * $Id: shared.php 1247 2009-01-30 15:01:34Z duck $ * * Copyright Obala d.o.o. (www.obala.si) * @@ -234,4 +234,4 @@ class Folks_Friends_shared extends Folks_Friends_sql { return $GLOBALS['folks_shares']->addShare($share); } -} +} \ No newline at end of file diff --git a/folks/lib/Friends/sql.php b/folks/lib/Friends/sql.php index 7e33ce3a0..71c9eb684 100644 --- a/folks/lib/Friends/sql.php +++ b/folks/lib/Friends/sql.php @@ -3,7 +3,7 @@ * Folks_Friends:: defines an API for implementing storage backends for * Folks. * - * $Id: sql.php 1008 2008-10-24 09:07:35Z duck $ + * $Id: sql.php 1247 2009-01-30 15:01:34Z duck $ * * Copyright Obala d.o.o. (www.obala.si) * @@ -34,20 +34,6 @@ class Folks_Friends_sql extends Folks_Friends { private $_write_db; /** - * friends list ID - * - * @var int - */ - private $_friends = 0; - - /** - * Black list ID - * - * @var int - */ - private $_blacklist = 1; - - /** * Constructs a new SQL storage object. * * @param array $params A hash containing connection parameters. @@ -275,4 +261,4 @@ class Folks_Friends_sql extends Folks_Friends { return true; } -} \ No newline at end of file +} diff --git a/folks/lib/api.php b/folks/lib/api.php index 4bc96dfd1..d4506af82 100644 --- a/folks/lib/api.php +++ b/folks/lib/api.php @@ -7,7 +7,7 @@ * See the enclosed file LICENSE for license information (BSD). If you * did not receive this file, see http://cvs.horde.org/co.php/folks/LICENSE. * - * $Id: api.php 979 2008-10-08 08:31:13Z duck $ + * $Id: api.php 1235 2009-01-28 19:25:04Z duck $ * * @author Duck * @package Folks @@ -292,10 +292,6 @@ function _folks_removeBlacklisted($user = null) */ function _folks_isBlacklisted($user = null) { - if (empty($user)) { - $user = Auth::getAuth(); - } - require_once dirname(__FILE__) . '/Friends.php'; $friends = Folks_Friends::singleton(null, array('user' => $user)); @@ -493,7 +489,7 @@ function _folks_removeUser($userId) * * @return boolean True on success or a PEAR_Error object on failure. */ -function _folks_removeUserData($user) +function _folks_removeUserData($user = null) { return _folks_removeUser($user); } diff --git a/folks/lib/base.php b/folks/lib/base.php index f98fd357a..c4c4b4d70 100644 --- a/folks/lib/base.php +++ b/folks/lib/base.php @@ -44,7 +44,7 @@ require_once FOLKS_BASE . '/lib/Driver.php'; $GLOBALS['folks_driver'] = Folks_Driver::factory(); // Cache -$GLOBALS['cache'] = &Horde_Cache::singleton($GLOBALS['conf']['cache']['driver'], +$GLOBALS['cache'] = Horde_Cache::singleton($GLOBALS['conf']['cache']['driver'], Horde::getDriverConfig('cache', $GLOBALS['conf']['cache']['driver'])); // Update user online status diff --git a/folks/lib/version.php b/folks/lib/version.php index d9e276b8d..a1f769b34 100644 --- a/folks/lib/version.php +++ b/folks/lib/version.php @@ -1 +1 @@ - + \ No newline at end of file diff --git a/folks/po/folks.pot b/folks/po/folks.pot index 1da6d6293..581813e5c 100644 --- a/folks/po/folks.pot +++ b/folks/po/folks.pot @@ -2,7 +2,7 @@ # FIRST AUTHOR , 2007. # Marko Milost , 2008. # Usms translation. -# Copyright 2007-2009 The Horde Project +# Copyright (C) 2007 Horde Project # This file is distributed under the same license as the FOlks package. msgid "" msgstr "" diff --git a/folks/po/folksmini.pot b/folks/po/folksmini.pot deleted file mode 100644 index 67788cfd5..000000000 --- a/folks/po/folksmini.pot +++ /dev/null @@ -1,1456 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright YEAR Horde Project -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2008-10-29 15:01+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: edit/friends.php:49 -#, php-format -msgid "%s added you as a friend on %s" -msgstr "" - -#: edit/approve.php:40 -#, php-format -msgid "%s approved you as a friend on %s" -msgstr "" - -#: edit/reject.php:39 -#, php-format -msgid "%s rejected you as a friend on %s" -msgstr "" - -#: user.php:63 -#, php-format -msgid "%s's profile" -msgstr "" - -#: edit/edit.php:30 edit/edit.php:46 -msgid "--- Select ---" -msgstr "" - -#: scripts/mail.php:157 -msgid "-c, --count Limit count" -msgstr "" - -#: scripts/mail.php:158 -msgid "-f, --from Limit offset" -msgstr "" - -#: scripts/mail.php:156 -msgid "-h, --help Show this help" -msgstr "" - -#: scripts/mail.php:160 -msgid "-p, --password[=password] Horde login password" -msgstr "" - -#: scripts/mail.php:159 -msgid "-u, --username[=username] Horde login username" -msgstr "" - -#: edit/friends.php:48 -#, php-format -msgid "A confirmation was send to \"%s\"." -msgstr "" - -#: templates/edit/activity.php:19 templates/edit/blacklist.php:13 -#: templates/edit/friends.php:13 -msgid "Action" -msgstr "" - -#: activity.php:17 templates/friends/friends.php:18 -#: templates/friends/friends.php:45 templates/user/user.php:121 -#: templates/user/user.php:360 templates/list/list.php:7 -#: templates/edit/activity.php:18 edit/tabs.php:26 edit/activity.php:19 -#: lib/Forms/Activity.php:19 lib/Forms/Activity.php:21 -msgid "Activity" -msgstr "" - -#: config/prefs.php.dist:30 -msgid "Activity log" -msgstr "" - -#: edit/activity.php:28 -msgid "Activity successfully deleted" -msgstr "" - -#: user.php:54 friends.php:31 edit/activity.php:40 -msgid "Activity successfully posted" -msgstr "" - -#: templates/user/actions.php:17 templates/user/user.php:142 -#, php-format -msgid "Add %s as a friend?" -msgstr "" - -#: templates/user/actions.php:20 -#, php-format -msgid "Add %s to you blacklist?" -msgstr "" - -#: lib/Forms/AddFriend.php:19 -msgid "Add / Remove" -msgstr "" - -#: templates/user/actions.php:14 templates/user/actions.php:15 -msgid "Add a comment" -msgstr "" - -#: edit/blacklist.php:53 edit/friends.php:96 -msgid "Add or remove user" -msgstr "" - -#: templates/user/user.php:167 templates/user/user.php:192 -#: templates/user/user.php:217 templates/user/user.php:244 -#: templates/user/user.php:270 templates/user/user.php:298 -#: templates/user/user.php:324 templates/user/user.php:357 -msgid "Add your content" -msgstr "" - -#: account/signup.php:38 -#, php-format -msgid "Added \"%s\" to the system. You can log in now." -msgstr "" - -#: edit/approve.php:52 -#, php-format -msgid "Added user %s as a friend." -msgstr "" - -#: report.php:36 -msgid "Advertisement content" -msgstr "" - -#: templates/user/user.php:108 templates/list/list.php:28 -msgid "Age" -msgstr "" - -#: lib/Forms/Search.php:22 -msgid "Age from" -msgstr "" - -#: lib/Forms/Search.php:23 -msgid "Age to" -msgstr "" - -#: templates/list/list.php:38 -msgid "Albums" -msgstr "" - -#: lib/Block/friends.php:36 -msgid "All" -msgstr "" - -#: templates/list/list.php:10 -msgid "All users" -msgstr "" - -#: edit/privacy.php:33 -msgid "All visitors" -msgstr "" - -#: edit/comments.php:28 -msgid "Any one" -msgstr "" - -#: templates/friends/friends.php:43 templates/edit/activity.php:16 -msgid "Application" -msgstr "" - -#: config/prefs.php.dist:129 -msgid "" -"Application you would like NOT to log activitiy when you post a new PUBLIC " -"COMMENT" -msgstr "" - -#: config/prefs.php.dist:114 -msgid "" -"Application you would like NOT to log your activitiy when you post a new " -"PUBLIC CONTENT." -msgstr "" - -#: templates/edit/friends.php:53 -msgid "Approve" -msgstr "" - -#: lib/Folks.php:131 lib/Folks.php:135 -msgid "Aquarius" -msgstr "" - -#: lib/Folks.php:139 lib/Folks.php:143 -msgid "Aries" -msgstr "" - -#: config/prefs.php.dist:50 -msgid "Ascesending" -msgstr "" - -#: edit/comments.php:29 -msgid "Authenticated users" -msgstr "" - -#: services.php:16 -msgid "Available services" -msgstr "" - -#: birthday.php:17 templates/list/list.php:9 edit/edit.php:29 -msgid "Birthday" -msgstr "" - -#: templates/user/actions.php:21 edit/tabs.php:24 edit/blacklist.php:19 -#: lib/Friends/sql.php:215 lib/Friends/letter.php:88 -msgid "Blacklist" -msgstr "" - -#: report.php:34 -msgid "Cancel" -msgstr "" - -#: lib/Folks.php:151 lib/Folks.php:155 -msgid "Cancer" -msgstr "" - -#: scripts/mail-filter.php:120 -msgid "Cannot authenticate at mail server:" -msgstr "" - -#: account/resetpassword.php:19 -msgid "Cannot reset password automatically, contact your administrator." -msgstr "" - -#: lib/Folks.php:272 -msgid "Cannot retrieve user email." -msgstr "" - -#: edit/password.php:20 -msgid "Cannot update password, contact your administrator." -msgstr "" - -#: lib/Folks.php:131 lib/Folks.php:175 -msgid "Capricorn" -msgstr "" - -#: edit/password.php:25 -msgid "Change Your Password" -msgstr "" - -#: edit/password.php:30 -msgid "Choose a password" -msgstr "" - -#: templates/user/user.php:116 templates/list/list.php:30 edit/edit.php:31 -#: lib/Forms/Search.php:19 lib/Forms/Search.php:21 -msgid "City" -msgstr "" - -#: templates/user/private.php:9 templates/user/friends.php:9 -msgid "Click here" -msgstr "" - -#: templates/user/authenticated.php:7 templates/user/authenticated.php:8 -msgid "Click here to login." -msgstr "" - -#: save_search.php:18 save_search.php:51 -msgid "Close" -msgstr "" - -#: lib/api.php:154 -#, php-format -msgid "Commented user %s." -msgstr "" - -#: edit/tabs.php:31 edit/comments.php:18 -msgid "Comments" -msgstr "" - -#: edit/comments.php:57 -msgid "Comments deleted successfuly" -msgstr "" - -#: account/approve.php:15 -msgid "Confirm email" -msgstr "" - -#: config/hooks.php.dist:237 -msgid "Confirmation code" -msgstr "" - -#: lib/Report.php:98 -#, php-format -msgid "Content abuse report in %s" -msgstr "" - -#: account/resetpassword.php:28 edit/password.php:28 edit/password.php:190 -msgid "Continue" -msgstr "" - -#: report.php:39 -msgid "Copyright infringement" -msgstr "" - -#: account/username.php:30 -msgid "Could not find any username with this email." -msgstr "" - -#: account/resetpassword.php:90 -msgid "" -"Could not reset the password for the requested user. Some or all of the " -"details are not correct. Try again or contact your administrator if you need " -"further help." -msgstr "" - -#: scripts/mail.php:43 -msgid "Couldn't read command-line options." -msgstr "" - -#: edit/edit.php:32 -msgid "Country" -msgstr "" - -#: edit/password.php:29 -msgid "Current password" -msgstr "" - -#: templates/friends/friends.php:17 templates/friends/friends.php:44 -#: templates/edit/activity.php:17 -msgid "Date" -msgstr "" - -#: scripts/mail-filter.php:133 -#, php-format -msgid "" -"Dear %s, we tried to send you an email, but if turns out that the mail is " -"usable any more. Maybe you run over quota. If your mail is discontinued, " -"please update your profile with the email you are using now at %s." -msgstr "" - -#: templates/list/search.php:14 templates/edit/activity.php:31 -msgid "Delete" -msgstr "" - -#: edit/comments.php:40 edit/comments.php:47 -msgid "Delete all current comments" -msgstr "" - -#: edit/edit.php:52 edit/edit.php:77 -msgid "Delete picture" -msgstr "" - -#: config/prefs.php.dist:49 -msgid "Descesending" -msgstr "" - -#: templates/user/user.php:344 templates/list/list.php:34 edit/edit.php:50 -#: lib/Forms/Search.php:19 -msgid "Description" -msgstr "" - -#: report.php:30 -msgid "Do you really want to report this user?" -msgstr "" - -#: lib/Block/random.php:40 -msgid "Does not metter" -msgstr "" - -#: account/tabs.php:25 -msgid "Don't have an account? Sign up." -msgstr "" - -#: templates/friends/friends.php:37 -msgid "Edit activities" -msgstr "" - -#: templates/friends/friends.php:11 -msgid "Edit friends" -msgstr "" - -#: templates/user/user.php:141 -msgid "Edit my firends" -msgstr "" - -#: edit/edit.php:18 edit/tabs.php:22 -msgid "Edit my profile" -msgstr "" - -#: lib/Folks.php:289 -msgid "Edit profile" -msgstr "" - -#: edit/edit.php:28 -msgid "Email" -msgstr "" - -#: scripts/mail-filter.php:132 -msgid "Email problem" -msgstr "" - -#: lib/Forms/Login.php:22 -#, php-format -msgid "Enter the username you registered to %s" -msgstr "" - -#: lib/Forms/Login.php:25 -msgid "Enter your password. Please be aware that password is case sensitive." -msgstr "" - -#: templates/user/user.php:274 -msgid "Faces" -msgstr "" - -#: templates/user/user.php:274 -msgid "Faces in user galleries" -msgstr "" - -#: templates/user/user.php:113 templates/list/list.php:67 edit/edit.php:30 -#: lib/Forms/Search.php:20 -msgid "Female" -msgstr "" - -#: account/tabs.php:29 -msgid "Forgot your password?" -msgstr "" - -#: account/username.php:17 account/tabs.php:32 -msgid "Forgot your username?" -msgstr "" - -#: templates/user/actions.php:10 -msgid "Forward" -msgstr "" - -#: templates/user/actions.php:18 -msgid "Friend" -msgstr "" - -#: friends.php:21 templates/user/user.php:144 edit/tabs.php:25 -#: edit/friends.php:19 lib/Folks.php:288 lib/Block/friends.php:3 -#: lib/Block/friends.php:23 -msgid "Friends" -msgstr "" - -#: lib/api.php:311 -msgid "Friends Birthdays" -msgstr "" - -#: templates/friends/friends.php:12 -msgid "Friends activities" -msgstr "" - -#: lib/Folks.php:147 lib/Folks.php:151 -msgid "Gemini" -msgstr "" - -#: templates/user/user.php:112 templates/list/list.php:26 edit/edit.php:30 -#: lib/Forms/Search.php:20 -msgid "Gender" -msgstr "" - -#: templates/user/user.php:56 -msgid "Has no picture" -msgstr "" - -#: templates/user/user.php:130 templates/list/list.php:32 edit/edit.php:34 -msgid "Homepage" -msgstr "" - -#: config/prefs.php.dist:16 -msgid "How to preview users" -msgstr "" - -#: templates/user/user.php:131 -msgid "I don't have it" -msgstr "" - -#: lib/Forms/Search.php:25 -msgid "Is online" -msgstr "" - -#: templates/user/user.php:102 -msgid "Last activity" -msgstr "" - -#: lib/Block/my_comments.php:3 lib/Block/my_comments.php:32 -msgid "Last comments on my profile" -msgstr "" - -#: templates/user/user.php:84 -msgid "Last time online" -msgstr "" - -#: lib/Folks.php:155 lib/Folks.php:159 -msgid "Leo" -msgstr "" - -#: lib/Folks.php:163 lib/Folks.php:167 -msgid "Libra" -msgstr "" - -#: lib/Block/random.php:33 lib/Block/new.php:33 lib/Block/recent.php:33 -msgid "Limit" -msgstr "" - -#: list.php:17 templates/list/list.php:10 lib/Folks.php:292 -msgid "List" -msgstr "" - -#: config/prefs.php.dist:99 -msgid "Log account changes?" -msgstr "" - -#: config/prefs.php.dist:89 -msgid "Log when we comment a user?" -msgstr "" - -#: scripts/mail.php:92 -#, php-format -msgid "Logged in successfully as \"%s\"." -msgstr "" - -#: account/tabs.php:22 lib/Forms/Login.php:19 -msgid "Login" -msgstr "" - -#: scripts/mail.php:88 -msgid "Login is incorrect." -msgstr "" - -#: login.php:54 -msgid "Login remainder" -msgstr "" - -#: login.php:124 -#, php-format -msgid "Login to %s" -msgstr "" - -#: templates/user/actions.php:9 -msgid "Look at this profile" -msgstr "" - -#: templates/user/user.php:113 templates/list/list.php:67 edit/edit.php:30 -#: lib/Forms/Search.php:20 -msgid "Male" -msgstr "" - -#: scripts/mail.php:154 -msgid "" -"Mandatory arguments to long options are mandatory for short options too." -msgstr "" - -#: lib/Forms/Search.php:24 -msgid "Mast have" -msgstr "" - -#: edit/comments.php:30 -msgid "Moderate comments - I will approve every single comment" -msgstr "" - -#: config/prefs.php.dist:23 -msgid "Modify account preferences" -msgstr "" - -#: templates/list/list.php:7 -msgid "Most active users" -msgstr "" - -#: templates/list/list.php:6 -msgid "Most popular users" -msgstr "" - -#: lib/Folks.php:287 -msgid "My profile" -msgstr "" - -#: templates/list/search.php:11 -msgid "My queries" -msgstr "" - -#: save_search.php:49 lib/Forms/Search.php:19 -msgid "Name" -msgstr "" - -#: new.php:17 templates/list/list.php:4 -msgid "New" -msgstr "" - -#: templates/list/list.php:4 -msgid "New registered user" -msgstr "" - -#: lib/Block/new.php:3 lib/Block/new.php:23 -msgid "New users" -msgstr "" - -#: templates/list/list.php:75 templates/list/list.php:76 -#: templates/list/list.php:77 templates/list/list.php:78 -#: templates/list/list.php:79 edit/privacy.php:49 config/prefs.php.dist:67 -#: config/prefs.php.dist:77 config/prefs.php.dist:87 config/prefs.php.dist:97 -msgid "No" -msgstr "" - -#: scripts/mail-filter.php:157 -msgid "No mail found" -msgstr "" - -#: edit/privacy.php:36 edit/comments.php:27 -msgid "No one" -msgstr "" - -#: templates/list/list.php:16 -msgid "No users found under selected criteria" -msgstr "" - -#: lib/Forms/Login.php:28 -msgid "No, only for this view" -msgstr "" - -#: config/prefs.php.dist:69 -msgid "Notify friends that I loged in" -msgstr "" - -#: edit/privacy.php:49 -msgid "Notify online friends that I logged in" -msgstr "" - -#: lib/Block/my_comments.php:20 -msgid "Number of comments to display" -msgstr "" - -#: config/prefs.php.dist:59 -msgid "Number of users perpage" -msgstr "" - -#: report.php:38 -msgid "Offensive content" -msgstr "" - -#: templates/user/user.php:77 lib/Block/friends.php:38 -msgid "Offline" -msgstr "" - -#: online.php:17 templates/user/user.php:75 templates/list/list.php:3 -#: lib/Block/random.php:39 lib/Block/friends.php:37 -msgid "Online" -msgstr "" - -#: templates/friends/friends.php:68 -msgid "Online friends" -msgstr "" - -#: edit/privacy.php:34 -msgid "Only authenticated users" -msgstr "" - -#: templates/user/user.php:402 templates/user/user.php:411 -msgid "Only authenticated users can post comments." -msgstr "" - -#: edit/privacy.php:35 -msgid "Only my friedns" -msgstr "" - -#: templates/user/user.php:170 templates/user/user.php:195 -#: templates/user/user.php:220 templates/user/user.php:247 -#: templates/user/user.php:273 templates/user/user.php:301 -#: templates/user/user.php:327 -msgid "Others user content" -msgstr "" - -#: edit/tabs.php:27 lib/Forms/Login.php:25 -msgid "Password" -msgstr "" - -#: edit/password.php:159 -msgid "Password changed." -msgstr "" - -#: templates/list/list.php:36 edit/edit.php:51 lib/Forms/Search.php:24 -msgid "Picture" -msgstr "" - -#: lib/Folks.php:135 lib/Folks.php:139 -msgid "Pisces" -msgstr "" - -#: lib/Forms/Login.php:38 -msgid "Please enter the text above" -msgstr "" - -#: account/resetpassword.php:47 -msgid "Please respond to your security question: " -msgstr "" - -#: popularity.php:17 templates/user/user.php:125 templates/list/list.php:6 -msgid "Popularity" -msgstr "" - -#: lib/Forms/Activity.php:24 -msgid "Post" -msgstr "" - -#: templates/user/user.php:168 templates/user/user.php:193 -#: templates/user/user.php:218 templates/user/user.php:245 -#: templates/user/user.php:271 templates/user/user.php:299 -#: templates/user/user.php:325 templates/user/user.php:358 -#: config/prefs.php.dist:15 -msgid "Preview" -msgstr "" - -#: edit/privacy.php:18 edit/tabs.php:23 -msgid "Privacy" -msgstr "" - -#: edit/privacy.php:31 -msgid "Private" -msgstr "" - -#: edit/privacy.php:27 -msgid "Public" -msgstr "" - -#: edit/privacy.php:28 -msgid "Public - only authenticated users can see my personal data" -msgstr "" - -#: edit/privacy.php:30 -msgid "Public - only my friends can see my presonal data" -msgstr "" - -#: lib/Block/random.php:3 lib/Block/random.php:23 -msgid "Random users" -msgstr "" - -#: lib/Block/recent.php:3 lib/Block/recent.php:23 -msgid "Recent visitors" -msgstr "" - -#: templates/edit/friends.php:55 -msgid "Reject" -msgstr "" - -#: lib/Forms/Login.php:27 -msgid "Remember login?" -msgstr "" - -#: templates/edit/blacklist.php:20 templates/edit/friends.php:21 -msgid "Remove" -msgstr "" - -#: account/renew.php:15 -msgid "Renew account" -msgstr "" - -#: report.php:34 report.php:51 templates/user/actions.php:25 -msgid "Report" -msgstr "" - -#: lib/Report.php:109 -msgid "Report by user" -msgstr "" - -#: lib/Report.php:40 -msgid "Report driver does not exist." -msgstr "" - -#: report.php:46 report.php:57 -msgid "Report reason" -msgstr "" - -#: report.php:45 report.php:56 -msgid "Report type" -msgstr "" - -#: templates/user/actions.php:24 -msgid "Report user" -msgstr "" - -#: config/prefs.php.dist:79 -msgid "" -"Require my confirmation if someone would like to add me to his freidn list." -msgstr "" - -#: edit/password.php:190 -msgid "Reset" -msgstr "" - -#: account/resetpassword.php:26 -msgid "Reset Your Password" -msgstr "" - -#: lib/Folks.php:171 lib/Folks.php:175 -msgid "Sagittarius" -msgstr "" - -#: save_search.php:51 edit/edit.php:52 edit/edit.php:57 edit/comments.php:40 -msgid "Save" -msgstr "" - -#: templates/list/search.php:3 -msgid "Save search criteria" -msgstr "" - -#: lib/Folks.php:167 lib/Folks.php:171 -msgid "Scorpio" -msgstr "" - -#: search.php:18 lib/Folks.php:291 lib/Forms/Search.php:26 -msgid "Search" -msgstr "" - -#: lib/Forms/Search.php:19 -msgid "Search by" -msgstr "" - -#: save_search.php:39 -msgid "Search criteria deleted." -msgstr "" - -#: save_search.php:28 -msgid "Search criteria saved successfuly" -msgstr "" - -#: account/resetpassword.php:49 edit/password.php:195 -msgid "Security answer" -msgstr "" - -#: edit/password.php:192 -msgid "Security question" -msgstr "" - -#: edit/password.php:189 -msgid "Security question used when reseting password" -msgstr "" - -#: account/username.php:19 -msgid "Send me my username" -msgstr "" - -#: templates/user/actions.php:7 templates/edit/friends.php:24 -msgid "Send message" -msgstr "" - -#: templates/user/actions.php:6 -msgid "Send private message" -msgstr "" - -#: templates/user/actions.php:9 -msgid "Send this profile to a friend" -msgstr "" - -#: lib/Folks.php:290 -msgid "Services" -msgstr "" - -#: config/prefs.php.dist:24 -msgid "Set account action details" -msgstr "" - -#: config/prefs.php.dist:31 -msgid "Set activity prefetences" -msgstr "" - -#: config/prefs.php.dist:17 -msgid "Set users preview paramaters" -msgstr "" - -#: config/prefs.php.dist:22 config/prefs.php.dist:29 -msgid "Settings" -msgstr "" - -#: lib/Block/friends.php:33 -msgid "Show friends that are" -msgstr "" - -#: account/signup.php:61 -msgid "Sign up" -msgstr "" - -#: templates/list/list.php:20 templates/list/list.php:43 -msgid "Sort Direction" -msgstr "" - -#: config/prefs.php.dist:41 config/prefs.php.dist:51 -msgid "Sort by" -msgstr "" - -#: templates/list/list.php:27 -msgid "Sort by Age" -msgstr "" - -#: templates/list/list.php:37 -msgid "Sort by Albums" -msgstr "" - -#: templates/list/list.php:29 -msgid "Sort by City" -msgstr "" - -#: templates/list/list.php:33 -msgid "Sort by Description" -msgstr "" - -#: templates/list/list.php:25 -msgid "Sort by Gender" -msgstr "" - -#: templates/list/list.php:31 -msgid "Sort by Homepage" -msgstr "" - -#: templates/list/list.php:35 -msgid "Sort by Picture" -msgstr "" - -#: templates/list/list.php:23 -msgid "Sort by Username" -msgstr "" - -#: templates/list/list.php:39 -msgid "Sort by Video" -msgstr "" - -#: templates/user/user.php:71 edit/privacy.php:40 -msgid "Status" -msgstr "" - -#: account/signup.php:44 -#, php-format -msgid "" -"Submitted request to add \"%s\" to the system. You cannot log in until your " -"request has been approved." -msgstr "" - -#: lib/Folks.php:143 lib/Folks.php:147 -msgid "Taurus" -msgstr "" - -#: report.php:37 -msgid "Terms and conditions infringement" -msgstr "" - -#: account/approve.php:65 account/renew.php:65 -msgid "" -"The code is not right. If you copy and paste the link from your email, " -"please check if you copied the whole string." -msgstr "" - -#: templates/edit/blacklist.php:4 -msgid "There are no users in your blacklist." -msgstr "" - -#: templates/edit/friends.php:4 -msgid "There are no users listed as your friend." -msgstr "" - -#: config/hooks.php.dist:184 -msgid "There is already an user registered with this email" -msgstr "" - -#: config/hooks.php.dist:182 -msgid "There is already an user registered with this username" -msgstr "" - -#: templates/edit/activity.php:7 -msgid "There is no activity logged for your account." -msgstr "" - -#: account/signup.php:50 account/signup.php:52 -#, php-format -msgid "There was a problem adding \"%s\" to the system: %s" -msgstr "" - -#: config/hooks.php.dist:138 -msgid "There was an error login into your mail account." -msgstr "" - -#: login.php:184 -msgid "This account was deleted or is expired." -msgstr "" - -#: login.php:178 -msgid "" -"This account was still not activated. Check your inbox, we sendy you the " -"activation code there." -msgstr "" - -#: lib/Block/my_comments.php:57 -msgid "Title" -msgstr "" - -#: lib/Report.php:122 -msgid "Unsupported" -msgstr "" - -#: edit/edit.php:68 -msgid "Updated his/her profile details." -msgstr "" - -#: edit/edit.php:70 -msgid "Updated his/her profile picture." -msgstr "" - -#: edit/edit.php:45 -msgid "Upload a new video" -msgstr "" - -#: scripts/mail.php:152 -#, php-format -msgid "Usage: %s [OPTIONS]..." -msgstr "" - -#: report.php:55 lib/Block/my_comments.php:58 -msgid "User" -msgstr "" - -#: lib/Driver.php:376 lib/Driver/sql.php:303 -#, php-format -msgid "User \"%s\" does not exists." -msgstr "" - -#: lib/Friends.php:185 lib/Friends.php:254 -#, php-format -msgid "User \"%s\" does not exits" -msgstr "" - -#: lib/Friends.php:262 -#, php-format -msgid "User \"%s\" is already in fiend list" -msgstr "" - -#: lib/Friends.php:270 -#, php-format -msgid "" -"User \"%s\" is already in fiend list, but we are waiting his/her approval." -msgstr "" - -#: account/renew.php:43 -#, php-format -msgid "User \"%s\" is not market to be in the removal process." -msgstr "" - -#: edit/friends.php:60 -#, php-format -msgid "User \"%s\" was added as your friend." -msgstr "" - -#: edit/blacklist.php:41 -#, php-format -msgid "User \"%s\" was added to your blacklist." -msgstr "" - -#: account/approve.php:43 -#, php-format -msgid "User \"%s\" was already activated." -msgstr "" - -#: edit/approve.php:38 -#, php-format -msgid "User \"%s\" was confirmed as a friend." -msgstr "" - -#: edit/reject.php:37 -#, php-format -msgid "User \"%s\" was rejected as a friend." -msgstr "" - -#: edit/blacklist.php:34 -#, php-format -msgid "User \"%s\" was removed from your blacklist." -msgstr "" - -#: edit/friends.php:41 -#, php-format -msgid "User \"%s\" was removed from your friend list." -msgstr "" - -#: edit/friends.php:52 -#, php-format -msgid "" -"User %s added you to his firends list on %s. \n" -"To approve, go to: %s \n" -"To reject, go to: %s \n" -"To see to his profile, go to: %s \n" -msgstr "" - -#: edit/approve.php:44 -#, php-format -msgid "" -"User %s confirmed you as a friend on %s.. \n" -"To see to his profile, go to: %s \n" -msgstr "" - -#: templates/user/user.php:391 -#, php-format -msgid "User %s does not wish to be commented." -msgstr "" - -#: templates/user/deleted.php:4 -#, php-format -msgid "User %s has been disabled." -msgstr "" - -#: templates/user/inactive.php:4 -#, php-format -msgid "User %s is inactive." -msgstr "" - -#: login.php:52 -#, php-format -msgid "" -"User %s just logged in.\n" -"%s" -msgstr "" - -#: edit/reject.php:43 -#, php-format -msgid "" -"User %s rejected you as a friend on %s.. \n" -"To see to his profile, go to: %s \n" -msgstr "" - -#: templates/user/authenticated.php:4 -#, php-format -msgid "" -"User %s would like to his profile remains visible only to authenticated " -"users." -msgstr "" - -#: templates/user/friends.php:4 -#, php-format -msgid "User %s would like to his profile remains visible only to his friends." -msgstr "" - -#: templates/user/private.php:4 -#, php-format -msgid "User %s would like to remain private." -msgstr "" - -#: account/signup.php:21 -msgid "User Registration has been disabled for this site." -msgstr "" - -#: lib/Block/random.php:36 -msgid "User is currently online?" -msgstr "" - -#: report.php:25 -msgid "User is not selected" -msgstr "" - -#: templates/user/actions.php:28 -msgid "User list" -msgstr "" - -#: report.php:62 report.php:68 -msgid "User was not reported." -msgstr "" - -#: report.php:65 -msgid "User was reported." -msgstr "" - -#: templates/friends/friends.php:16 templates/list/list.php:24 -#: templates/edit/blacklist.php:12 templates/edit/friends.php:12 -#: account/resetpassword.php:43 lib/Forms/AddFriend.php:18 -#: lib/Forms/Login.php:21 config/prefs.php.dist:40 -msgid "Username" -msgstr "" - -#: config/hooks.php.dist:169 -msgid "" -"Username can contain only alphanumeric characters, underscore and minus." -msgstr "" - -#: templates/user/actions.php:29 -msgid "Users" -msgstr "" - -#: lib/api.php:312 -msgid "Users Birthdays" -msgstr "" - -#: templates/list/list.php:9 -msgid "Users celebrating birthday today" -msgstr "" - -#: templates/list/list.php:3 -msgid "Users currently online" -msgstr "" - -#: templates/edit/friends.php:61 -msgid "Users that has you listed as a friend" -msgstr "" - -#: templates/edit/friends.php:48 -msgid "Users winting us to approve their friendship" -msgstr "" - -#: templates/list/list.php:40 edit/edit.php:46 lib/Forms/Search.php:24 -msgid "Video" -msgstr "" - -#: templates/edit/friends.php:22 -msgid "View profile" -msgstr "" - -#: lib/Folks.php:159 lib/Folks.php:163 -msgid "Virgo" -msgstr "" - -#: templates/user/user.php:131 -msgid "Visit my homepage" -msgstr "" - -#: templates/edit/friends.php:39 -msgid "We are waiting this users to approve our friendship" -msgstr "" - -#: user.php:48 friends.php:25 edit/activity.php:34 -msgid "What are you doing right now?" -msgstr "" - -#: lib/Friends/sql.php:214 lib/Friends/letter.php:87 -msgid "Whitelist" -msgstr "" - -#: edit/comments.php:38 -msgid "Who can post comments to your profile" -msgstr "" - -#: edit/privacy.php:46 -msgid "Who can see my acticity log on my profile" -msgstr "" - -#: edit/privacy.php:43 -msgid "Who can see when I was last time online" -msgstr "" - -#: lib/Forms/Search.php:18 -msgid "Word" -msgstr "" - -#: templates/list/list.php:75 templates/list/list.php:76 -#: templates/list/list.php:77 templates/list/list.php:78 -#: templates/list/list.php:79 edit/privacy.php:49 config/prefs.php.dist:68 -#: config/prefs.php.dist:78 config/prefs.php.dist:88 config/prefs.php.dist:98 -msgid "Yes" -msgstr "" - -#: lib/Forms/Login.php:29 -msgid "Yes, remember me so the next time I don't neet to login" -msgstr "" - -#: account/approve.php:62 account/renew.php:62 -msgid "You account is activated, you can login now." -msgstr "" - -#: login.php:135 -msgid "You are entering your data too fast!" -msgstr "" - -#: templates/user/user.php:399 templates/user/user.php:419 -#, php-format -msgid "You are on %s blacklist." -msgstr "" - -#: templates/user/private.php:8 templates/user/friends.php:8 -#, php-format -msgid "You can still send a private message to user %s." -msgstr "" - -#: lib/Friends.php:190 -#, php-format -msgid "You cannot add \"%s\" to your blacklist." -msgstr "" - -#: lib/Friends.php:248 -msgid "You cannot add yourself as your own friend." -msgstr "" - -#: lib/Friends.php:179 -msgid "You cannot add yourself to your blacklist." -msgstr "" - -#: lib/api.php:385 -msgid "You cannot log activities for other users." -msgstr "" - -#: lib/Driver.php:748 lib/Forms/Activity.php:32 -msgid "You cannot post an empty activity message." -msgstr "" - -#: account/approve.php:20 account/renew.php:20 -msgid "You must supply a confirmation code." -msgstr "" - -#: account/approve.php:28 account/renew.php:28 edit/approve.php:24 -#: edit/reject.php:24 -msgid "You must supply a username." -msgstr "" - -#: templates/friends/friends.php:38 -msgid "Your activities" -msgstr "" - -#: edit/comments.php:81 -msgid "Your comments preference was sucessfuly saved." -msgstr "" - -#: edit/edit.php:66 edit/privacy.php:65 -msgid "Your data were successfully updated." -msgstr "" - -#: account/username.php:20 -msgid "Your email" -msgstr "" - -#: edit/edit.php:82 -msgid "Your image was deleted successfully." -msgstr "" - -#: account/resetpassword.php:76 -#, php-format -msgid "" -"Your new password for %s is: %s. \n" -"\n" -" It was requested by %s on %s" -msgstr "" - -#: edit/password.php:66 -#, php-format -msgid "" -"Your new password is too long; passwords may not be more than %d characters " -"long!" -msgstr "" - -#: edit/password.php:145 -msgid "Your new password is too simple to guess! Not changed!" -msgstr "" - -#: edit/password.php:136 -msgid "Your new password is too simple to guess. Not changed!" -msgstr "" - -#: edit/password.php:61 -#, php-format -msgid "Your new password must be at least %d characters long!" -msgstr "" - -#: edit/password.php:44 -msgid "Your new password must be different from your current password" -msgstr "" - -#: edit/password.php:106 -#, php-format -msgid "Your new password must contain at least %d alphabetic characters." -msgstr "" - -#: edit/password.php:111 -#, php-format -msgid "Your new password must contain at least %d alphanumeric characters." -msgstr "" - -#: edit/password.php:116 -#, php-format -msgid "" -"Your new password must contain at least %d different types of characters. " -"The types are: lower, upper, numeric, and symbols." -msgstr "" - -#: edit/password.php:96 -#, php-format -msgid "Your new password must contain at least %d lowercase characters." -msgstr "" - -#: edit/password.php:101 -#, php-format -msgid "Your new password must contain at least %d numeric characters." -msgstr "" - -#: edit/password.php:91 -#, php-format -msgid "Your new password must contain at least %d uppercase characters." -msgstr "" - -#: edit/password.php:122 -#, php-format -msgid "Your new password must contain less than %d whitespace characters." -msgstr "" - -#: edit/password.php:124 -msgid "Your new password must not contain whitespace characters." -msgstr "" - -#: edit/password.php:50 -msgid "Your old password didn't match" -msgstr "" - -#: account/resetpassword.php:82 -msgid "Your password has been reset" -msgstr "" - -#: account/resetpassword.php:84 -#, php-format -msgid "" -"Your password has been reset, check your email (%s) and log in with your new " -"password." -msgstr "" - -#: edit/password.php:185 -msgid "Your securiy questions was updated." -msgstr "" - -#: account/username.php:34 -#, php-format -msgid "" -"Your username on %s %s is: %s. \n" -"\n" -" It was requested by %s on %s" -msgstr "" - -#: config/hooks.php.dist:231 -#, php-format -msgid "" -"Your username on %s %s is: %s. \n" -"\n" -" Please confirm the registration by going to this link \n" -" %s" -msgstr "" - -#: login.php:156 -msgid "Your username or password is incorrect." -msgstr "" - -#: account/username.php:41 -msgid "Your username was requested" -msgstr "" - -#: account/username.php:43 -#, php-format -msgid "Your username was sent, check your email (%s)." -msgstr "" - -#: login.php:172 -#, php-format -msgid "" -"Your username was temporary deacirvated. For any additional information " -"please write to %s, and don't forgot to incluide your username." -msgstr "" - -#: edit/password.php:30 -msgid "type the password twice to confirm" -msgstr "" diff --git a/folks/po/sl_SI.po b/folks/po/sl_SI.po index ff1d2e9b1..518039d2b 100644 --- a/folks/po/sl_SI.po +++ b/folks/po/sl_SI.po @@ -1,22 +1,29 @@ # translation of sl_SI.po to Slovene -# Duck , 2007. +# FIRST AUTHOR , 2007. # Marko Milost , 2008. # Usms translation. -# Copyright 2008-2009 The Horde Project +# Copyright (C) 2007 Horde Project # This file is distributed under the same license as the FOlks package. msgid "" msgstr "" "Project-Id-Version: sl_SI\n" "Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2008-10-29 15:01+0100\n" -"PO-Revision-Date: 2008-09-30 14:48+0200\n" +"POT-Creation-Date: 2009-01-30 16:22+0100\n" +"PO-Revision-Date: 2008-12-29 00:24+0100\n" "Last-Translator: Marko Milost \n" "Language-Team: Slovene \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3\n" +"Plural-Forms: nplurals=3\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: edit/personal.php:18 +msgid " Edit personal information" +msgstr "Uredite vaše osebne podatke" #: edit/friends.php:49 #, php-format @@ -73,26 +80,26 @@ msgid "Action" msgstr "Ukaz" #: activity.php:17 templates/friends/friends.php:18 -#: templates/friends/friends.php:45 templates/user/user.php:121 -#: templates/user/user.php:360 templates/list/list.php:7 +#: templates/friends/friends.php:45 templates/user/user.php:129 +#: templates/user/user.php:368 templates/list/list.php:7 #: templates/edit/activity.php:18 edit/tabs.php:26 edit/activity.php:19 -#: lib/Forms/Activity.php:19 lib/Forms/Activity.php:21 +#: lib/Forms/Activity.php:20 lib/Forms/Activity.php:22 msgid "Activity" msgstr "Aktivnost" #: config/prefs.php.dist:30 msgid "Activity log" -msgstr "Denvnik aktivnosti" +msgstr "Aktivnost" #: edit/activity.php:28 msgid "Activity successfully deleted" -msgstr "Aktivnos je bila uspešno izbisana" +msgstr "Aktivnost je bila uspešno izbrisana" #: user.php:54 friends.php:31 edit/activity.php:40 msgid "Activity successfully posted" -msgstr "Aktivnos je bila uspešno dodana" +msgstr "Aktivnost uspešno objavljena" -#: templates/user/actions.php:17 templates/user/user.php:142 +#: templates/user/actions.php:17 templates/user/user.php:150 #, php-format msgid "Add %s as a friend?" msgstr "Dodamo %s kot prijatelja?" @@ -102,7 +109,7 @@ msgstr "Dodamo %s kot prijatelja?" msgid "Add %s to you blacklist?" msgstr "Dodamo %s na črno listo?" -#: lib/Forms/AddFriend.php:19 +#: lib/Forms/AddFriend.php:20 msgid "Add / Remove" msgstr "Dodaj / Odstrani" @@ -110,14 +117,14 @@ msgstr "Dodaj / Odstrani" msgid "Add a comment" msgstr "Dodaj komentar" -#: edit/blacklist.php:53 edit/friends.php:96 +#: edit/blacklist.php:55 edit/friends.php:96 msgid "Add or remove user" msgstr "Dodaj ali odstrani uporabnika" -#: templates/user/user.php:167 templates/user/user.php:192 -#: templates/user/user.php:217 templates/user/user.php:244 -#: templates/user/user.php:270 templates/user/user.php:298 -#: templates/user/user.php:324 templates/user/user.php:357 +#: templates/user/user.php:175 templates/user/user.php:200 +#: templates/user/user.php:225 templates/user/user.php:252 +#: templates/user/user.php:278 templates/user/user.php:306 +#: templates/user/user.php:332 templates/user/user.php:365 msgid "Add your content" msgstr "Dodaj svojo vsebino" @@ -129,7 +136,7 @@ msgstr "Dodali smo \"%s\" v sistem. Lahko se prijavite." #: edit/approve.php:52 #, php-format msgid "Added user %s as a friend." -msgstr "Dodal %s kot prijatelja." +msgstr "Dodaj uporabnika %s kot prijatelja." #: report.php:36 msgid "Advertisement content" @@ -139,11 +146,11 @@ msgstr "Oglas" msgid "Age" msgstr "Starost" -#: lib/Forms/Search.php:22 +#: lib/Forms/Search.php:23 msgid "Age from" msgstr "Starost od" -#: lib/Forms/Search.php:23 +#: lib/Forms/Search.php:24 msgid "Age to" msgstr "Starost do" @@ -151,7 +158,7 @@ msgstr "Starost do" msgid "Albums" msgstr "Albumi" -#: lib/Block/friends.php:36 +#: lib/Block/friends.php:35 msgid "All" msgstr "Vsi" @@ -175,13 +182,15 @@ msgstr "Aplikacija" msgid "" "Application you would like NOT to log activitiy when you post a new PUBLIC " "COMMENT" -msgstr "Aplikacije za katere žeite da ne beleži komentiranja" +msgstr "" +"Aplikacije za katero si ne želite da se vodi javni spisek novosti." #: config/prefs.php.dist:114 msgid "" "Application you would like NOT to log your activitiy when you post a new " "PUBLIC CONTENT." -msgstr "Aplikacije za katere žeite da ne beleži dodajanje nove vsebine" +msgstr "" +"Aplikacije za katero si ne želite da se vodi javni spisek vaših novih komentarjev." #: templates/edit/friends.php:53 msgid "Approve" @@ -212,7 +221,7 @@ msgid "Birthday" msgstr "Rojstni dan" #: templates/user/actions.php:21 edit/tabs.php:24 edit/blacklist.php:19 -#: lib/Friends/sql.php:215 lib/Friends/letter.php:88 +#: lib/Friends/sql.php:201 lib/Friends/letter.php:88 msgid "Blacklist" msgstr "Črna lista" @@ -226,7 +235,7 @@ msgstr "Rak" #: scripts/mail-filter.php:120 msgid "Cannot authenticate at mail server:" -msgstr "Ne morem se prijaviti mail server:" +msgstr "" #: account/resetpassword.php:19 msgid "Cannot reset password automatically, contact your administrator." @@ -253,8 +262,8 @@ msgstr "Spremeni geslo" msgid "Choose a password" msgstr "Izberite geslo" -#: templates/user/user.php:116 templates/list/list.php:30 edit/edit.php:31 -#: lib/Forms/Search.php:19 lib/Forms/Search.php:21 +#: templates/user/user.php:124 templates/list/list.php:30 edit/edit.php:31 +#: lib/Forms/Search.php:20 lib/Forms/Search.php:22 msgid "City" msgstr "Mesto" @@ -273,7 +282,7 @@ msgstr "Zapri" #: lib/api.php:154 #, php-format msgid "Commented user %s." -msgstr "Je komentiral uporabnika %s." +msgstr "Komentarji uporabnika %s." #: edit/tabs.php:31 edit/comments.php:18 msgid "Comments" @@ -281,13 +290,13 @@ msgstr "Komentarji" #: edit/comments.php:57 msgid "Comments deleted successfuly" -msgstr "Komentarji so bili izbrisani" +msgstr "Komentarji so bili uspešno zbrisani" #: account/approve.php:15 msgid "Confirm email" msgstr "Potrditev email naslova" -#: config/hooks.php.dist:237 +#: config/hooks.php.dist:364 msgid "Confirmation code" msgstr "Šifra za potrditev uporabnika" @@ -335,17 +344,13 @@ msgstr "Trenutno geslo" msgid "Date" msgstr "Datum" -#: scripts/mail-filter.php:133 +#: scripts/mail-filter.php:176 #, php-format msgid "" "Dear %s, we tried to send you an email, but if turns out that the mail is " "usable any more. Maybe you run over quota. If your mail is discontinued, " "please update your profile with the email you are using now at %s." msgstr "" -"Pozdravljen %s,\n\n poslali smo vam obvestilo po elektronski pošti, " -"vendar se nam je vrnilo. Imate morda poln poštni predal? Vaš elektronski " -"naslov ne deluje več? Če je tako, vas prosimo, da v nastavitvah uporabnika " -"spremenite email naslov na delujočega: %s." #: templates/list/search.php:14 templates/edit/activity.php:31 msgid "Delete" @@ -363,16 +368,20 @@ msgstr "Izbriši sliko" msgid "Descesending" msgstr "Padajoče" -#: templates/user/user.php:344 templates/list/list.php:34 edit/edit.php:50 -#: lib/Forms/Search.php:19 +#: templates/user/user.php:352 templates/list/list.php:34 edit/edit.php:50 +#: lib/Forms/Search.php:20 msgid "Description" msgstr "Opis" +#: edit/personal.php:28 +msgid "Display 24-hour times?" +msgstr "Prikaži čas v 24 urni obliki?" + #: report.php:30 msgid "Do you really want to report this user?" msgstr "Res želite prijavit tega uporabnika?" -#: lib/Block/random.php:40 +#: lib/Block/random.php:39 msgid "Does not metter" msgstr "Ni pomembno" @@ -388,7 +397,7 @@ msgstr "Uredi aktivnosti" msgid "Edit friends" msgstr "Uredi prijatelje" -#: templates/user/user.php:141 +#: templates/user/user.php:149 msgid "Edit my firends" msgstr "Urejanje prijateljev" @@ -404,29 +413,29 @@ msgstr "Uredi profil" msgid "Email" msgstr "Email" -#: scripts/mail-filter.php:132 +#: scripts/mail-filter.php:175 msgid "Email problem" -msgstr "Opozorilo o vašem E-mailu" +msgstr "Napaka v email naslovu" -#: lib/Forms/Login.php:22 +#: lib/Forms/Login.php:23 #, php-format msgid "Enter the username you registered to %s" msgstr "Vnesite uporabniško ime s katerim ste se prijavili %s" -#: lib/Forms/Login.php:25 +#: lib/Forms/Login.php:26 msgid "Enter your password. Please be aware that password is case sensitive." msgstr "Vnesite vaše geslo. Pazite, v geslu so velike in male črke POMEMBNE." -#: templates/user/user.php:274 +#: templates/user/user.php:282 msgid "Faces" msgstr "Obrazi" -#: templates/user/user.php:274 +#: templates/user/user.php:282 msgid "Faces in user galleries" msgstr "Obrazi v galerijah uporabnika" -#: templates/user/user.php:113 templates/list/list.php:67 edit/edit.php:30 -#: lib/Forms/Search.php:20 +#: templates/user/user.php:121 templates/list/list.php:67 edit/edit.php:30 +#: lib/Forms/Search.php:21 msgid "Female" msgstr "Ženski" @@ -446,13 +455,13 @@ msgstr "Posreduj" msgid "Friend" msgstr "Prijatelj" -#: friends.php:21 templates/user/user.php:144 edit/tabs.php:25 +#: friends.php:21 templates/user/user.php:152 edit/tabs.php:25 #: edit/friends.php:19 lib/Folks.php:288 lib/Block/friends.php:3 -#: lib/Block/friends.php:23 +#: lib/Block/friends.php:22 msgid "Friends" msgstr "Prijatelji" -#: lib/api.php:311 +#: lib/api.php:307 msgid "Friends Birthdays" msgstr "Rojstni dnevi prijateljev" @@ -464,8 +473,8 @@ msgstr "Aktivnosti prijateljev" msgid "Gemini" msgstr "Dvojčka" -#: templates/user/user.php:112 templates/list/list.php:26 edit/edit.php:30 -#: lib/Forms/Search.php:20 +#: templates/user/user.php:120 templates/list/list.php:26 edit/edit.php:30 +#: lib/Forms/Search.php:21 msgid "Gender" msgstr "Spol" @@ -473,7 +482,11 @@ msgstr "Spol" msgid "Has no picture" msgstr "Nima slike" -#: templates/user/user.php:130 templates/list/list.php:32 edit/edit.php:34 +#: scripts/mail-filter.php:159 scripts/mail-filter.php:170 +msgid "Have no one to notify" +msgstr "" + +#: templates/user/user.php:138 templates/list/list.php:32 edit/edit.php:34 msgid "Homepage" msgstr "Domača stran" @@ -481,11 +494,11 @@ msgstr "Domača stran" msgid "How to preview users" msgstr "Kako naj pregledujem uporabnike" -#: templates/user/user.php:131 +#: templates/user/user.php:139 msgid "I don't have it" msgstr "Je nimam" -#: lib/Forms/Search.php:25 +#: lib/Forms/Search.php:26 msgid "Is online" msgstr "Je online" @@ -493,7 +506,7 @@ msgstr "Je online" msgid "Last activity" msgstr "Zadnja aktivnost" -#: lib/Block/my_comments.php:3 lib/Block/my_comments.php:32 +#: lib/Block/my_comments.php:3 lib/Block/my_comments.php:31 msgid "Last comments on my profile" msgstr "Zadnji komentarji na mojem profilu" @@ -509,7 +522,7 @@ msgstr "Lev" msgid "Libra" msgstr "Tehtnica" -#: lib/Block/random.php:33 lib/Block/new.php:33 lib/Block/recent.php:33 +#: lib/Block/random.php:32 lib/Block/new.php:32 lib/Block/recent.php:32 msgid "Limit" msgstr "Omeji" @@ -519,18 +532,18 @@ msgstr "Spisek" #: config/prefs.php.dist:99 msgid "Log account changes?" -msgstr "Zabeležim ko spremenim podatke v mojem profilu?" +msgstr "Beležim aktivnost sprememb profila?" #: config/prefs.php.dist:89 msgid "Log when we comment a user?" -msgstr "Zabeleži ko komentiramo uporabika?" +msgstr "Beležim aktivnost novih komentarjev?" #: scripts/mail.php:92 #, php-format msgid "Logged in successfully as \"%s\"." msgstr "" -#: account/tabs.php:22 lib/Forms/Login.php:19 +#: account/tabs.php:22 lib/Forms/Login.php:20 msgid "Login" msgstr "Prijava" @@ -539,7 +552,7 @@ msgid "Login is incorrect." msgstr "" #: login.php:54 -msgid "Login remainder" +msgid "Login reminder" msgstr "Opozorilo o prijavi prijatelja" #: login.php:124 @@ -551,8 +564,8 @@ msgstr "Prijava v %s" msgid "Look at this profile" msgstr "Poglej ta profil" -#: templates/user/user.php:113 templates/list/list.php:67 edit/edit.php:30 -#: lib/Forms/Search.php:20 +#: templates/user/user.php:121 templates/list/list.php:67 edit/edit.php:30 +#: lib/Forms/Search.php:21 msgid "Male" msgstr "Moški" @@ -561,7 +574,7 @@ msgid "" "Mandatory arguments to long options are mandatory for short options too." msgstr "" -#: lib/Forms/Search.php:24 +#: lib/Forms/Search.php:25 msgid "Mast have" msgstr "Mora imeti" @@ -571,7 +584,7 @@ msgstr "Moderiranje komentarjev - potrdil bom vsak komentar" #: config/prefs.php.dist:23 msgid "Modify account preferences" -msgstr "Spremeni nastavitve računa" +msgstr "Popravi nastavitve" #: templates/list/list.php:7 msgid "Most active users" @@ -589,19 +602,19 @@ msgstr "Moj profil" msgid "My queries" msgstr "Moja iskanja" -#: save_search.php:49 lib/Forms/Search.php:19 +#: save_search.php:49 lib/Forms/Search.php:20 msgid "Name" msgstr "Ime" #: new.php:17 templates/list/list.php:4 msgid "New" -msgstr "Novi" +msgstr "Novo" #: templates/list/list.php:4 msgid "New registered user" -msgstr "Novo registrirani uporabniki" +msgstr "Nov registriran uporabnik" -#: lib/Block/new.php:3 lib/Block/new.php:23 +#: lib/Block/new.php:3 lib/Block/new.php:22 msgid "New users" msgstr "Novi uporabniki" @@ -620,7 +633,7 @@ msgstr "Nihče" msgid "No users found under selected criteria" msgstr "Ni uporabnikov pod izbranimi kriteriji" -#: lib/Forms/Login.php:28 +#: lib/Forms/Login.php:29 msgid "No, only for this view" msgstr "Samo za to prijavo" @@ -632,7 +645,7 @@ msgstr "Obvesti prijatelje, da sem se prijavil" msgid "Notify online friends that I logged in" msgstr "Obvesti prijavljene prijatelje, da sem se prijavil" -#: lib/Block/my_comments.php:20 +#: lib/Block/my_comments.php:19 msgid "Number of comments to display" msgstr "Število komentarjev na vsaki strani" @@ -644,24 +657,24 @@ msgstr "Število uporabnikov na vsaki strani" msgid "Offensive content" msgstr "Neprimerna ali žaljiva vsebina" -#: templates/user/user.php:77 lib/Block/friends.php:38 +#: templates/user/user.php:77 lib/Block/friends.php:37 msgid "Offline" msgstr "Offline" #: online.php:17 templates/user/user.php:75 templates/list/list.php:3 -#: lib/Block/random.php:39 lib/Block/friends.php:37 +#: lib/Block/random.php:38 lib/Block/friends.php:36 msgid "Online" msgstr "Online" #: templates/friends/friends.php:68 msgid "Online friends" -msgstr "Prijatelji trenutno online" +msgstr "Prijatelji online" #: edit/privacy.php:34 msgid "Only authenticated users" -msgstr "Samo prijavljeni uporabniki" +msgstr "Samo overjeni uporabniki" -#: templates/user/user.php:402 templates/user/user.php:411 +#: templates/user/user.php:410 templates/user/user.php:419 msgid "Only authenticated users can post comments." msgstr "Samo prijavljeni uporabniki lahko vpisujejo komentarje." @@ -669,14 +682,14 @@ msgstr "Samo prijavljeni uporabniki lahko vpisujejo komentarje." msgid "Only my friedns" msgstr "Samo moji prijatelji" -#: templates/user/user.php:170 templates/user/user.php:195 -#: templates/user/user.php:220 templates/user/user.php:247 -#: templates/user/user.php:273 templates/user/user.php:301 -#: templates/user/user.php:327 +#: templates/user/user.php:178 templates/user/user.php:203 +#: templates/user/user.php:228 templates/user/user.php:255 +#: templates/user/user.php:281 templates/user/user.php:309 +#: templates/user/user.php:335 msgid "Others user content" msgstr "Ostala uporabniška vsebina" -#: edit/tabs.php:27 lib/Forms/Login.php:25 +#: edit/tabs.php:27 lib/Forms/Login.php:26 msgid "Password" msgstr "Geslo" @@ -684,7 +697,7 @@ msgstr "Geslo" msgid "Password changed." msgstr "Geslo je bilo spremenjeno." -#: templates/list/list.php:36 edit/edit.php:51 lib/Forms/Search.php:24 +#: templates/list/list.php:36 edit/edit.php:51 lib/Forms/Search.php:25 msgid "Picture" msgstr "Slika" @@ -692,7 +705,7 @@ msgstr "Slika" msgid "Pisces" msgstr "Ribi" -#: lib/Forms/Login.php:38 +#: lib/Forms/Login.php:39 msgid "Please enter the text above" msgstr "Prosimo pretipkajte zgornji tekst." @@ -700,18 +713,18 @@ msgstr "Prosimo pretipkajte zgornji tekst." msgid "Please respond to your security question: " msgstr "Prosimo odgovorite na varnostno vprašanje: " -#: popularity.php:17 templates/user/user.php:125 templates/list/list.php:6 +#: popularity.php:17 templates/user/user.php:133 templates/list/list.php:6 msgid "Popularity" msgstr "Priljubljenost" -#: lib/Forms/Activity.php:24 +#: lib/Forms/Activity.php:25 msgid "Post" -msgstr "Dodaj" +msgstr "Objavi" -#: templates/user/user.php:168 templates/user/user.php:193 -#: templates/user/user.php:218 templates/user/user.php:245 -#: templates/user/user.php:271 templates/user/user.php:299 -#: templates/user/user.php:325 templates/user/user.php:358 +#: templates/user/user.php:176 templates/user/user.php:201 +#: templates/user/user.php:226 templates/user/user.php:253 +#: templates/user/user.php:279 templates/user/user.php:307 +#: templates/user/user.php:333 templates/user/user.php:366 #: config/prefs.php.dist:15 msgid "Preview" msgstr "Pregled" @@ -736,19 +749,19 @@ msgstr "javno - samo registrirani uporabniki lahko vidijo moje osebne podatke" msgid "Public - only my friends can see my presonal data" msgstr "javno - samo moji prijatelji lahko vidijo moje osebne podatke" -#: lib/Block/random.php:3 lib/Block/random.php:23 +#: lib/Block/random.php:3 lib/Block/random.php:22 msgid "Random users" msgstr "Naključni uporabniki" -#: lib/Block/recent.php:3 lib/Block/recent.php:23 +#: lib/Block/recent.php:3 lib/Block/recent.php:22 msgid "Recent visitors" msgstr "Zadnji obiskovalci" #: templates/edit/friends.php:55 msgid "Reject" -msgstr "Zavrni" +msgstr "Zavni" -#: lib/Forms/Login.php:27 +#: lib/Forms/Login.php:28 msgid "Remember login?" msgstr "Si zapomnim prijavo?" @@ -813,11 +826,11 @@ msgstr "Shrani rezultate iskanja" msgid "Scorpio" msgstr "Škorpijon" -#: search.php:18 lib/Folks.php:291 lib/Forms/Search.php:26 +#: search.php:18 lib/Folks.php:291 lib/Forms/Search.php:27 msgid "Search" msgstr "Najdi" -#: lib/Forms/Search.php:19 +#: lib/Forms/Search.php:20 msgid "Search by" msgstr "Iskanje po" @@ -866,8 +879,8 @@ msgid "Set account action details" msgstr "Uredi uporabniške nastavitve" #: config/prefs.php.dist:31 -msgid "Set activity prefetences" -msgstr "Nastavite parametre dnevnika aktivnosti" +msgid "Set activity preferences" +msgstr "Nastavitve preferences" #: config/prefs.php.dist:17 msgid "Set users preview paramaters" @@ -877,7 +890,7 @@ msgstr "Nastavitev pregledovanja uporabnikov" msgid "Settings" msgstr "Nastavitve" -#: lib/Block/friends.php:33 +#: lib/Block/friends.php:32 msgid "Show friends that are" msgstr "Prikaži prijatelje, ki so" @@ -966,40 +979,40 @@ msgstr "V vaši črni listi ni nikogar." msgid "There are no users listed as your friend." msgstr "Nimate nobenega uporabnika kot prijatelja." -#: config/hooks.php.dist:184 +#: config/hooks.php.dist:312 msgid "There is already an user registered with this email" msgstr "Že obstaja uporabnik, ki koristi ta email naslov" -#: config/hooks.php.dist:182 +#: config/hooks.php.dist:310 msgid "There is already an user registered with this username" msgstr "To uporabniško ime je zasedno" #: templates/edit/activity.php:7 msgid "There is no activity logged for your account." -msgstr "Ni zabeleženih aktivnosti za vaše uporabniško ime." +msgstr "Ni zabeleženih aktivnosti." #: account/signup.php:50 account/signup.php:52 #, php-format msgid "There was a problem adding \"%s\" to the system: %s" msgstr "Prišlo je do napake pri dodajanju uporabnika \"%s\": %s" -#: config/hooks.php.dist:138 +#: config/hooks.php.dist:265 msgid "There was an error login into your mail account." -msgstr "Prišlo je do napake pri prijavi v vaš poštni predal." +msgstr "Prišlo je do napake prišiljanju selektronska sporočila." -#: login.php:184 +#: login.php:185 msgid "This account was deleted or is expired." msgstr "Vaše uporabnško ime je preteklo ali pa je v postopku izbrisa." -#: login.php:178 +#: login.php:179 msgid "" -"This account was still not activated. Check your inbox, we sendy you the " +"This account was still not activated. Check your inbox, we send you the " "activation code there." msgstr "" "Vaše uporabniško ime še ni aktivno. Preglejte vašo elektronsko pošto " "(email). Na vaš elektronski naslov smo poslali aktivacijsko kodo." -#: lib/Block/my_comments.php:57 +#: lib/Block/my_comments.php:56 msgid "Title" msgstr "Naslov" @@ -1009,11 +1022,11 @@ msgstr "Ni podprto" #: edit/edit.php:68 msgid "Updated his/her profile details." -msgstr "Spremenil podatke svojega profila." +msgstr "Je ažuriral svoje podatke." #: edit/edit.php:70 msgid "Updated his/her profile picture." -msgstr "Zamenjal sliko v svojem profilu." +msgstr "Je naložil novo sliko." #: edit/edit.php:45 msgid "Upload a new video" @@ -1024,26 +1037,26 @@ msgstr "Naloži nov posnetek" msgid "Usage: %s [OPTIONS]..." msgstr "" -#: report.php:55 lib/Block/my_comments.php:58 +#: report.php:55 lib/Block/my_comments.php:57 msgid "User" msgstr "Uporabnik" -#: lib/Driver.php:376 lib/Driver/sql.php:303 +#: lib/Driver.php:378 lib/Driver/sql.php:308 #, php-format msgid "User \"%s\" does not exists." msgstr "Uporabnik \"%s\" ne obstaja." -#: lib/Friends.php:185 lib/Friends.php:254 +#: lib/Friends.php:197 lib/Friends.php:266 #, php-format msgid "User \"%s\" does not exits" msgstr "Uporabnik \"%s\" ne obstaja" -#: lib/Friends.php:262 +#: lib/Friends.php:274 #, php-format msgid "User \"%s\" is already in fiend list" msgstr "Uporabnik \"%s\" je že v vašem spisku prijateljev." -#: lib/Friends.php:270 +#: lib/Friends.php:282 #, php-format msgid "" "User \"%s\" is already in fiend list, but we are waiting his/her approval." @@ -1060,7 +1073,7 @@ msgstr "Uporabnik \"%s\" ni v postopku izbrisa." msgid "User \"%s\" was added as your friend." msgstr "Uporabnik \"%s\" je sedaj vaš prijatelj." -#: edit/blacklist.php:41 +#: edit/blacklist.php:43 #, php-format msgid "User \"%s\" was added to your blacklist." msgstr "Uporabnik \"%s\" je sedaj v vaši črni listi." @@ -1080,7 +1093,7 @@ msgstr "Uporabnik \"%s\" je potrjen kot vaš prijatelj." msgid "User \"%s\" was rejected as a friend." msgstr "Uporabnik \"%s\" je zavrnjen kot vaš prijatelj." -#: edit/blacklist.php:34 +#: edit/blacklist.php:36 #, php-format msgid "User \"%s\" was removed from your blacklist." msgstr "Uporabnik \"%s\" je odstranjen z vaše črne liste." @@ -1112,7 +1125,7 @@ msgstr "" "Uporabnik %s vas je potrdil kot prijatelja na %s. \n" "Njegov profil: %s \n" -#: templates/user/user.php:391 +#: templates/user/user.php:399 #, php-format msgid "User %s does not wish to be commented." msgstr "Uporabnik %s ne želi prejemati komentarjev." @@ -1169,7 +1182,7 @@ msgstr "Uporabnik %s želi ostati anonimen." msgid "User Registration has been disabled for this site." msgstr "Registracija novih uporabnikv je začasno izklopljena." -#: lib/Block/random.php:36 +#: lib/Block/random.php:35 msgid "User is currently online?" msgstr "Je uporabnik trenutno online?." @@ -1191,22 +1204,21 @@ msgstr "Uporabnik je bil prijavljen." #: templates/friends/friends.php:16 templates/list/list.php:24 #: templates/edit/blacklist.php:12 templates/edit/friends.php:12 -#: account/resetpassword.php:43 lib/Forms/AddFriend.php:18 -#: lib/Forms/Login.php:21 config/prefs.php.dist:40 +#: account/resetpassword.php:43 lib/Forms/AddFriend.php:19 +#: lib/Forms/Login.php:22 config/prefs.php.dist:40 msgid "Username" msgstr "Uporabniško ime" -#: config/hooks.php.dist:169 +#: config/hooks.php.dist:297 msgid "" "Username can contain only alphanumeric characters, underscore and minus." msgstr "" -"Uporabniško ime lahko vsebuje le abecedo, ševila, podčrtaj in pomišljaj." #: templates/user/actions.php:29 msgid "Users" msgstr "Uporabniki" -#: lib/api.php:312 +#: lib/api.php:308 msgid "Users Birthdays" msgstr "Rojstni dnevi uporabnikov" @@ -1226,7 +1238,7 @@ msgstr "Uporabniki, ki me imajo za prijatelja" msgid "Users winting us to approve their friendship" msgstr "Uporabniki, ki čakajo potrditev." -#: templates/list/list.php:40 edit/edit.php:46 lib/Forms/Search.php:24 +#: templates/list/list.php:40 edit/edit.php:46 lib/Forms/Search.php:25 msgid "Video" msgstr "Video" @@ -1238,7 +1250,7 @@ msgstr "Preglej profil" msgid "Virgo" msgstr "Devica" -#: templates/user/user.php:131 +#: templates/user/user.php:139 msgid "Visit my homepage" msgstr "Obišči mojo domačo stran" @@ -1248,9 +1260,9 @@ msgstr "Uporabniki, na katere čakamo, da nas potrdijo kot prijatelja." #: user.php:48 friends.php:25 edit/activity.php:34 msgid "What are you doing right now?" -msgstr "Kaj delate trenutno?" +msgstr "Kaj ravnokar počneš?" -#: lib/Friends/sql.php:214 lib/Friends/letter.php:87 +#: lib/Friends/sql.php:200 lib/Friends/letter.php:87 msgid "Whitelist" msgstr "Želje" @@ -1260,13 +1272,13 @@ msgstr "Kdo lahko kometira vaš profil" #: edit/privacy.php:46 msgid "Who can see my acticity log on my profile" -msgstr "Kdo lahko v profilu vidi dnevnik mojih aktinovsti" +msgstr "Kdo lahko vidi aktivnost vašega profila" #: edit/privacy.php:43 msgid "Who can see when I was last time online" msgstr "Kdo lahko vidi kdaj sem bil zadnjič online" -#: lib/Forms/Search.php:18 +#: lib/Forms/Search.php:19 msgid "Word" msgstr "Beseda" @@ -1277,7 +1289,7 @@ msgstr "Beseda" msgid "Yes" msgstr "Da" -#: lib/Forms/Login.php:29 +#: lib/Forms/Login.php:30 msgid "Yes, remember me so the next time I don't neet to login" msgstr "Da, želim ostati prijavljen tudi ob naslednjem obisku." @@ -1289,7 +1301,7 @@ msgstr "Vaše uporabniško ime je bilo potrjeno. Sedaj se lahko prijavite." msgid "You are entering your data too fast!" msgstr "Prehitro vnašate podatke!" -#: templates/user/user.php:399 templates/user/user.php:419 +#: templates/user/user.php:407 templates/user/user.php:427 #, php-format msgid "You are on %s blacklist." msgstr "Ste na črni listi uporabnika %s." @@ -1299,26 +1311,26 @@ msgstr "Ste na črni listi uporabnika %s." msgid "You can still send a private message to user %s." msgstr "Še vedno mu lahko pošljete osebno sporočilo %s." -#: lib/Friends.php:190 +#: lib/Friends.php:202 #, php-format msgid "You cannot add \"%s\" to your blacklist." msgstr "Ne morete dodati \"%s\" na črno listo." -#: lib/Friends.php:248 +#: lib/Friends.php:260 msgid "You cannot add yourself as your own friend." msgstr "Sami sebe ne morete dodati kot prijatelja." -#: lib/Friends.php:179 +#: lib/Friends.php:191 msgid "You cannot add yourself to your blacklist." msgstr "Samega sebe ne morete dodati na črno listo." -#: lib/api.php:385 +#: lib/api.php:381 msgid "You cannot log activities for other users." -msgstr "Ne morete dodajati aktinosti za druge uporabnike." +msgstr "Ne moreš shranjevati aktivnosti drugih uporabnikov." -#: lib/Driver.php:748 lib/Forms/Activity.php:32 +#: lib/Driver.php:750 lib/Forms/Activity.php:33 msgid "You cannot post an empty activity message." -msgstr "Nimate nobene aktinosti" +msgstr "Ne moreš zapisati praznega sporočila o aktivnosti." #: account/approve.php:20 account/renew.php:20 msgid "You must supply a confirmation code." @@ -1331,12 +1343,16 @@ msgstr "Podati morate uporabiško ime." #: templates/friends/friends.php:38 msgid "Your activities" -msgstr "Vaše aktinosti" +msgstr "Tvoje aktivnosti" #: edit/comments.php:81 msgid "Your comments preference was sucessfuly saved." msgstr "Vaše nastaviteve komentarjev so bile uspešno shranjene." +#: edit/personal.php:25 +msgid "Your current time zone:" +msgstr "" + #: edit/edit.php:66 edit/privacy.php:65 msgid "Your data were successfully updated." msgstr "Vaši podatki so bili uspešno ažurirani." @@ -1345,6 +1361,10 @@ msgstr "Vaši podatki so bili uspešno ažurirani." msgid "Your email" msgstr "Vaš email" +#: edit/personal.php:22 +msgid "Your full name:" +msgstr "" + #: edit/edit.php:82 msgid "Your image was deleted successfully." msgstr "Vaša slika je bila uspešno izbrisana." @@ -1458,7 +1478,7 @@ msgstr "" "\n" " Zahteval ga je %s ob %s" -#: config/hooks.php.dist:231 +#: config/hooks.php.dist:358 #, php-format msgid "" "Your username on %s %s is: %s. \n" diff --git a/folks/report.php b/folks/report.php index a31b8ed9b..666d9f6a4 100644 --- a/folks/report.php +++ b/folks/report.php @@ -4,7 +4,7 @@ * * $Horde: folks/report.php,v 1.5 2008-08-03 18:32:29 mrubinsk Exp $ * - * Copyright 2007-2008 The Horde Project (http://www.horde.org/) + * Copyright 2007-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. -- 2.11.0