From 3c6de7711859c7868d3e9a7aa538ee279c3bca49 Mon Sep 17 00:00:00 2001
From: "Duck (Jakob Munih)" <duck@obala.net>
Date: Wed, 18 Feb 2009 19:54:11 +0100
Subject: [PATCH] Fix friends managment. Make invite mail body configurable.

---
 folks/config/invite.php.dist            |   27 +
 folks/edit/friends/add.php              |   72 ++
 folks/edit/friends/blacklist.php        |    4 +-
 folks/edit/friends/for.php              |    1 -
 folks/edit/friends/from.php             |    1 -
 folks/edit/friends/groups.php           |  135 ++-
 folks/edit/friends/index.php            |   38 -
 folks/edit/friends/invite.php           |   28 +-
 folks/edit/friends/of.php               |    1 -
 folks/edit/tabs.php                     |    2 +-
 folks/lib/Folks.php                     |    6 +-
 folks/lib/Forms/AddFriend.php           |    7 +-
 folks/locale/sl_SI/LC_MESSAGES/folks.mo |  Bin 25182 -> 27453 bytes
 folks/po/folks.pot                      | 1359 +++++++++++++++++++------------
 folks/po/sl_SI.po                       |  416 ++++++----
 folks/templates/edit/tabs.php           |    3 +-
 folks/templates/user/user.php           |    4 +-
 17 files changed, 1300 insertions(+), 804 deletions(-)
 create mode 100644 folks/config/invite.php.dist
 create mode 100644 folks/edit/friends/add.php

diff --git a/folks/config/invite.php.dist b/folks/config/invite.php.dist
new file mode 100644
index 000000000..5156d046a
--- /dev/null
+++ b/folks/config/invite.php.dist
@@ -0,0 +1,27 @@
+<?php
+/**
+ * $Id$
+ *
+ * Folks Hooks configuration file.
+ *
+ * THE HOOKS PROVIDED IN THIS FILE ARE EXAMPLES ONLY.  DO NOT ENABLE THEM
+ * BLINDLY IF YOU DO NOT KNOW WHAT YOU ARE DOING.  YOU HAVE TO CUSTOMIZE THEM
+ * TO MATCH YOUR SPECIFIC NEEDS AND SYSTEM ENVIRONMENT.
+ *
+ * For more information please see the horde/config/hooks.php.dist file.
+ */
+
+$body = '
+Hi!
+
+I would like to invite you to join %s
+
+My profile:
+%s
+
+Sign up at:
+%s
+
+Best Regards,
+%s
+';
\ No newline at end of file
diff --git a/folks/edit/friends/add.php b/folks/edit/friends/add.php
new file mode 100644
index 000000000..f90b3860d
--- /dev/null
+++ b/folks/edit/friends/add.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * $Id: friends.php 976 2008-10-07 21:24:47Z duck $
+ *
+ * Copyright Obala d.o.o. (www.obala.si)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author Duck <duck@obala.net>
+ * @package Folks
+ */
+
+require_once dirname(__FILE__) . '/../../lib/base.php';
+require_once FOLKS_BASE . '/lib/Forms/AddFriend.php';
+require_once FOLKS_BASE . '/edit/tabs.php';
+
+$title = _("Add friend");
+
+// Load driver
+require_once FOLKS_BASE . '/lib/Friends.php';
+$friends = Folks_Friends::singleton();
+
+// Perform action
+$user = Util::getFormData('user');
+if ($user) {
+    if ($friends->isFriend($user)) {
+        $result = $friends->removeFriend($user);
+        if ($result instanceof PEAR_Error) {
+            $notification->push($result);
+        } else {
+            $notification->push(sprintf(_("User \"%s\" was removed from your friend list."), $user), 'horde.success');
+            header('Location: ' . Horde::applicationUrl('edit/friends/index.php'));
+            exit;
+        }
+    } else {
+        $result = $friends->addFriend($user);
+        if ($result instanceof PEAR_Error) {
+            $notification->push($result);
+        } elseif ($friends->needsApproval($user)) {
+            $notification->push(sprintf(_("A confirmation was send to \"%s\"."), $user), 'horde.warning');
+            $title = sprintf(_("%s added you as a friend on %s"),
+                                        Auth::getAuth(),
+                                        $GLOBALS['registry']->get('name', 'horde'));
+            $body = sprintf(_("User %s added you to his firends list on %s. \nTo approve, go to: %s \nTo reject, go to: %s \nTo see to his profile, go to: %s \n"),
+                            Auth::getAuth(),
+                            $registry->get('name', 'horde'),
+                            Util::addParameter(Horde::applicationUrl('edit/friends/approve.php', true, -1), 'user', Auth::getAuth()),
+                            Util::addParameter(Horde::applicationUrl('edit/friends/reject.php', true, -1), 'user', Auth::getAuth()),
+                            Folks::getUrlFor('user', Auth::getAuth(), true, -1));
+            $friends->sendNotification($user, $title, $body);
+            header('Location: ' . Horde::applicationUrl('edit/friends/index.php'));
+            exit;
+        } else {
+            $notification->push(sprintf(_("User \"%s\" was added as your friend."), $user), 'horde.success');
+            header('Location: ' . Horde::applicationUrl('edit/friends/index.php'));
+            exit;
+        }
+    }
+}
+
+$friend_form = new Folks_AddFriend_Form($vars, _("Add or remove user"), 'blacklist');
+
+Horde::addScriptFile('tables.js', 'horde', true);
+
+require FOLKS_TEMPLATES . '/common-header.inc';
+require FOLKS_TEMPLATES . '/menu.inc';
+
+echo $tabs->render('blacklist');
+require FOLKS_TEMPLATES . '/edit/add.php';
+
+require $registry->get('templates', 'horde') . '/common-footer.inc';
\ No newline at end of file
diff --git a/folks/edit/friends/blacklist.php b/folks/edit/friends/blacklist.php
index b0e861fc3..ce5267a32 100644
--- a/folks/edit/friends/blacklist.php
+++ b/folks/edit/friends/blacklist.php
@@ -68,7 +68,7 @@ if ($groups instanceof PEAR_Error) {
     $groups = array();
 }
 
-$form = new Folks_AddFriend_Form($vars, _("Add or remove user"), 'blacklist');
+$friend_form = new Folks_AddFriend_Form($vars, _("Add or remove user"), 'blacklist');
 
 Horde::addScriptFile('tables.js', 'horde', true);
 
@@ -78,4 +78,6 @@ require FOLKS_TEMPLATES . '/menu.inc';
 echo $tabs->render('blacklist');
 require FOLKS_TEMPLATES . '/edit/friends.php';
 
+$friend_form->renderActive();
+
 require $registry->get('templates', 'horde') . '/common-footer.inc';
\ No newline at end of file
diff --git a/folks/edit/friends/for.php b/folks/edit/friends/for.php
index 3410d87d0..f6ee604a0 100644
--- a/folks/edit/friends/for.php
+++ b/folks/edit/friends/for.php
@@ -12,7 +12,6 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/base.php';
-require_once FOLKS_BASE . '/lib/Forms/AddFriend.php';
 require_once FOLKS_BASE . '/edit/tabs.php';
 
 $title = _("Users waiting our approval");
diff --git a/folks/edit/friends/from.php b/folks/edit/friends/from.php
index 1bc6b193c..5140ab336 100644
--- a/folks/edit/friends/from.php
+++ b/folks/edit/friends/from.php
@@ -12,7 +12,6 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/base.php';
-require_once FOLKS_BASE . '/lib/Forms/AddFriend.php';
 require_once FOLKS_BASE . '/edit/tabs.php';
 
 $title = _("Friends we are waiting approval from");
diff --git a/folks/edit/friends/groups.php b/folks/edit/friends/groups.php
index 4d91c0339..502ad57be 100644
--- a/folks/edit/friends/groups.php
+++ b/folks/edit/friends/groups.php
@@ -31,83 +31,82 @@ if ($groups instanceof PEAR_Error) {
 // Handle action
 $action = Util::getFormData('action');
 switch ($action) {
-
-    case 'delete':
-
-        $g = Util::getFormdata('g');
-        $result = $friends->removeGroup($g);
-        if ($result instanceof PEAR_Error) {
-            $notification->push($result);
-        } elseif ($result) {
-            $notification->push(sprintf(_("Group \"%s\" has been deleted."), $groups[$g]), 'horde.success');
-        }
-
+case 'delete':
+
+    $g = Util::getFormdata('g');
+    $result = $friends->removeGroup($g);
+    if ($result instanceof PEAR_Error) {
+        $notification->push($result);
+    } elseif ($result) {
+        $notification->push(sprintf(_("Group \"%s\" has been deleted."), $groups[$g]), 'horde.success');
+    }
+
+    header('Location: ' . Horde::applicationUrl('edit/groups.php'));
+    exit;
+
+break;
+
+case 'edit':
+
+    $g = Util::getFormdata('g');
+    $form = new Horde_Form($vars, _("Rename group"), 'editgroup');
+    $form->addHidden('action', 'action', 'text', 'edit');
+    $form->addHidden('g', 'g', 'text', 'edit');
+    $form->setButtons(array(_("Rename"), _("Cancel")), _("Reset"));
+    $v = $form->addVariable(_("Old name"), 'old_name', 'text', false, true);
+    $v->setDefault($groups[$g]);
+    $v = $form->addVariable(_("New name"), 'new_name', 'text', true);
+    $v->setDefault($groups[$g]);
+
+    if (Util::getFormData('submitbutton') == _("Cancel")) {
+        $notification->push(sprintf(_("Group \"%s\" has not been renamed."), $groups[$g]), 'horde.warning');
         header('Location: ' . Horde::applicationUrl('edit/groups.php'));
         exit;
-
-    break;
-
-    case 'edit':
-
-        $g = Util::getFormdata('g');
-        $form = new Horde_Form($vars, _("Rename group"), 'editgroup');
-        $form->addHidden('action', 'action', 'text', 'edit');
-        $form->addHidden('g', 'g', 'text', 'edit');
-        $form->setButtons(array(_("Rename"), _("Cancel")), _("Reset"));
-        $v = $form->addVariable(_("Old name"), 'old_name', 'text', false, true);
-        $v->setDefault($groups[$g]);
-        $v = $form->addVariable(_("New name"), 'new_name', 'text', true);
-        $v->setDefault($groups[$g]);
-
-        if (Util::getFormData('submitbutton') == _("Cancel")) {
-            $notification->push(sprintf(_("Group \"%s\" has not been renamed."), $groups[$g]), 'horde.warning');
+    } elseif (Util::getFormData('submitbutton') == _("Rename")) {
+        $new_name = Util::getFormData('new_name');
+        $result = $friends->renameGroup($g, $new_name);
+        if ($result instanceof PEAR_Error) {
+            $notification->push($result);
+        } else {
+            $notification->push(sprintf(_("Group \"%s\" has been renamed to \"%s\"."), $groups[$g], $new_name), 'horde.success');
             header('Location: ' . Horde::applicationUrl('edit/groups.php'));
             exit;
-        } elseif (Util::getFormData('submitbutton') == _("Rename")) {
-            $new_name = Util::getFormData('new_name');
-            $result = $friends->renameGroup($g, $new_name);
-            if ($result instanceof PEAR_Error) {
-                $notification->push($result);
-            } else {
-                $notification->push(sprintf(_("Group \"%s\" has been renamed to \"%s\"."), $groups[$g], $new_name), 'horde.success');
-                header('Location: ' . Horde::applicationUrl('edit/groups.php'));
-                exit;
-            }
         }
-
-    break;
-
-    default:
-
-        // Manage adding groups
-        $form = new Horde_Form($vars, _("Add group"), 'addgroup');
-        $translated = Horde::loadConfiguration('groups.php', 'groups', 'folks');
-        asort($translated);
-        $form->addHidden('action', 'action', 'text', 'add');
-        $form->addVariable(_("Name"), 'translated_name', 'radio', false, false, null, array($translated, true));
-        $form->addVariable(_("Name"), 'custom_name', 'text', false, false, _("Enter custom name"));
-
-        if ($form->validate()) {
-            $form->getInfo(null, $info);
+    }
+
+break;
+
+default:
+
+    // Manage adding groups
+    $form = new Horde_Form($vars, _("Add group"), 'addgroup');
+    $translated = Horde::loadConfiguration('groups.php', 'groups', 'folks');
+    asort($translated);
+    $form->addHidden('action', 'action', 'text', 'add');
+    $form->addVariable(_("Name"), 'translated_name', 'radio', false, false, null, array($translated, true));
+    $form->addVariable(_("Name"), 'custom_name', 'text', false, false, _("Enter custom name"));
+
+    if ($form->validate()) {
+        $form->getInfo(null, $info);
+        if (empty($info['custom_name'])) {
+            $name = $info['translated_name'];
+        } else {
+            $name = $info['custom_name'];
+        }
+        $result = $friends->addGroup($name);
+        if ($result instanceof PEAR_Error) {
+            $notification->push($result);
+        } else {
             if (empty($info['custom_name'])) {
-                $name = $info['translated_name'];
-            } else {
-                $name = $info['custom_name'];
-            }
-            $result = $friends->addGroup($name);
-            if ($result instanceof PEAR_Error) {
-                $notification->push($result);
-            } else {
-                if (empty($info['custom_name'])) {
-                    $name = $translated[$info['translated_name']];
-                }
-                $notification->push(sprintf(_("Group \"%s\" was success added."), $name), 'horde.success');
-                header('Location: ' . Horde::applicationUrl('edit/groups.php'));
-                exit;
+                $name = $translated[$info['translated_name']];
             }
+            $notification->push(sprintf(_("Group \"%s\" was success added."), $name), 'horde.success');
+            header('Location: ' . Horde::applicationUrl('edit/groups.php'));
+            exit;
         }
+    }
 
-    break;
+break;
 }
 
 $remove_url = Util::addParameter(Horde::applicationUrl('edit/friends/groups.php'), 'action', 'delete');
diff --git a/folks/edit/friends/index.php b/folks/edit/friends/index.php
index e018c6397..e6c258426 100644
--- a/folks/edit/friends/index.php
+++ b/folks/edit/friends/index.php
@@ -12,7 +12,6 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/base.php';
-require_once FOLKS_BASE . '/lib/Forms/AddFriend.php';
 require_once FOLKS_BASE . '/edit/tabs.php';
 
 $title = _("Friends");
@@ -29,41 +28,6 @@ if ($registry->hasInterface('letter')) {
 require_once FOLKS_BASE . '/lib/Friends.php';
 $friends = Folks_Friends::singleton();
 
-// Perform action
-$user = Util::getGet('user');
-if ($user) {
-    if ($friends->isFriend($user)) {
-        $result = $friends->removeFriend($user);
-        if ($result instanceof PEAR_Error) {
-            $notification->push($result);
-        } else {
-            $notification->push(sprintf(_("User \"%s\" was removed from your friend list."), $user), 'horde.success');
-        }
-    } else {
-        $result = $friends->addFriend($user);
-        if ($result instanceof PEAR_Error) {
-            $notification->push($result);
-        } elseif ($friends->needsApproval($user)) {
-            $notification->push(sprintf(_("A confirmation was send to \"%s\"."), $user), 'horde.warning');
-            $title = sprintf(_("%s added you as a friend on %s"),
-                                        Auth::getAuth(),
-                                        $GLOBALS['registry']->get('name', 'horde'));
-            $body = sprintf(_("User %s added you to his firends list on %s. \nTo approve, go to: %s \nTo reject, go to: %s \nTo see to his profile, go to: %s \n"),
-                            Auth::getAuth(),
-                            $registry->get('name', 'horde'),
-                            Util::addParameter(Horde::applicationUrl('edit/approve.php', true, -1), 'user', Auth::getAuth()),
-                            Util::addParameter(Horde::applicationUrl('edit/reject.php', true, -1), 'user', Auth::getAuth()),
-                            Folks::getUrlFor('user', Auth::getAuth(), true, -1));
-            $friends->sendNotification($user, $title, $body);
-        } else {
-            $notification->push(sprintf(_("User \"%s\" was added as your friend."), $user), 'horde.success');
-        }
-    }
-
-    header('Location: ' . Horde::applicationUrl('edit/friends.php'));
-    exit;
-}
-
 // Get friends
 $list = $friends->getFriends();
 if ($list instanceof PEAR_Error) {
@@ -71,8 +35,6 @@ if ($list instanceof PEAR_Error) {
     $list = array();
 }
 
-$form = new Folks_AddFriend_Form($vars, _("Add or remove user"), 'blacklist');
-
 Horde::addScriptFile('tables.js', 'horde', true);
 
 require FOLKS_TEMPLATES . '/common-header.inc';
diff --git a/folks/edit/friends/invite.php b/folks/edit/friends/invite.php
index 0239ea067..9a291f39b 100644
--- a/folks/edit/friends/invite.php
+++ b/folks/edit/friends/invite.php
@@ -26,22 +26,24 @@ $form = new Horde_Form($vars, $title, 'addgroup');
 $translated = Horde::loadConfiguration('groups.php', 'groups', 'folks');
 asort($translated);
 $form->addVariable(_("Friend's e-mail"), 'email', 'email', true);
-$form->addVariable(_("Subject"), 'subject', 'text', false);
-$form->addVariable(_("Body"), 'subject', 'longtext', false);
+
+$v = &$form->addVariable(_("Subject"), 'subject', 'text', true);
+$v->setDefault(sprintf(_("%s Invited to join %s."), ucfirst(Auth::getAuth()), $registry->get('name', 'horde')));
+
+$v = &$form->addVariable(_("Body"), 'body', 'longtext', true);
+$body = Horde::loadConfiguration('invite.php', 'body', 'folks');
+if ($body instanceof PEAR_Error) {
+    $body = $body->getMessage();
+} else {
+    $body = sprintf($body, $registry->get('name', 'horde'),
+                            Folks::getUrlFor('user', Auth::getAuth(), true),
+                            Horde::applicationUrl('account/signup.php', true),
+                            Auth::getAuth());
+}
+$v->setDefault($body);
 
 if ($form->validate()) {
     $form->getInfo(null, $info);
-
-    // Fix title
-    if (empty($info['subject'])) {
-        $info['subject'] = sprintf(_("%s Invited to join %s."), Auth::getAuth(), $registry->get('name', 'horde'));
-    }
-
-    // Add body
-    $info['body'] = sprintf(_("%s Invited to join %s."), Auth::getAuth(), $registry->get('name', 'horde'))
-                    . ' '
-                    . sprintf(_("Sign up at %s"), Horde::applicationUrl('account/signup.php', true));
-
     $result = Folks::sendMail($info['email'], $info['subject'], $info['body']);
     if ($result instanceof PEAR_Error) {
         $notification->push($result);
diff --git a/folks/edit/friends/of.php b/folks/edit/friends/of.php
index 8bf654001..ecebbc57c 100644
--- a/folks/edit/friends/of.php
+++ b/folks/edit/friends/of.php
@@ -12,7 +12,6 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/base.php';
-require_once FOLKS_BASE . '/lib/Forms/AddFriend.php';
 require_once FOLKS_BASE . '/edit/tabs.php';
 
 $title = _("We are friends of");
diff --git a/folks/edit/tabs.php b/folks/edit/tabs.php
index 6f406f221..8a892dfb2 100644
--- a/folks/edit/tabs.php
+++ b/folks/edit/tabs.php
@@ -19,7 +19,7 @@ require_once 'Horde/Variables.php';
 
 $vars = Variables::getDefaultVariables();
 $tabs = new Horde_UI_Tabs('what', $vars);
-$tabs->addTab(_("Edit my profile"), Horde::applicationUrl('edit.php'), 'edit');
+$tabs->addTab(_("Edit my profile"), Horde::applicationUrl('edit/edit.php'), 'edit');
 $tabs->addTab(_("Privacy"), Horde::applicationUrl('edit/privacy.php'), 'privacy');
 $tabs->addTab(_("Blacklist"), Horde::applicationUrl('edit/friends/blacklist.php'), 'blacklist');
 $tabs->addTab(_("Friends"),  Horde::applicationUrl('edit/friends/index.php'), 'friends');
diff --git a/folks/lib/Folks.php b/folks/lib/Folks.php
index ee0e116b5..11bd124ee 100644
--- a/folks/lib/Folks.php
+++ b/folks/lib/Folks.php
@@ -224,12 +224,12 @@ class Folks {
      */
     static public function sendMail($to, $subject, $body, $attaches = array())
     {
-        global $conf;
-
-        $mail = new Horde_Mime_Mail($subject, $body, $to, $conf['support'], NLS::getCharset());
+        $mail = new Horde_Mime_Mail($subject, $body, $to, $GLOBALS['conf']['support'], NLS::getCharset());
 
         require_once FOLKS_BASE . '/lib/version.php';
         $mail->addHeader('User-Agent', 'Folks ' . FOLKS_VERSION);
+        $mail->addHeader('X-Originating-IP', $_SERVER['REMOTE_ADDR']);
+        $mail->addHeader('X-Remote-Browser', $_SERVER['HTTP_USER_AGENT']);
 
         foreach ($attaches as $file) {
             if (file_exists($file)) {
diff --git a/folks/lib/Forms/AddFriend.php b/folks/lib/Forms/AddFriend.php
index 24b610cf5..b419f1e9d 100644
--- a/folks/lib/Forms/AddFriend.php
+++ b/folks/lib/Forms/AddFriend.php
@@ -1,14 +1,13 @@
 <?php
 /**
- * $Id: AddFriend.php 1247 2009-01-30 15:01:34Z duck $
+ * $Id: AddFriend.php 795 2008-08-25 12:00:21Z duck $
  *
- * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
+ * Copyright 2007 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.
  *
  * @author Duck <duck@obala.net>
- * @package Folks
  */
 class Folks_AddFriend_Form extends Horde_Form {
 
@@ -19,4 +18,4 @@ class Folks_AddFriend_Form extends Horde_Form {
         $this->addVariable(_("Username"), 'user', 'text', true, false, null, array('', 20, 32));
         $this->setButtons(_("Add / Remove"));
     }
-}
\ No newline at end of file
+}
diff --git a/folks/locale/sl_SI/LC_MESSAGES/folks.mo b/folks/locale/sl_SI/LC_MESSAGES/folks.mo
index 603a1280ebf930414c17e767504341eed5655229..9947ed8ab7f6c7f86d887c5c952c2945ad75ec9e 100644
GIT binary patch
delta 10682
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
ITOZ5&Unawm9{>OV

delta 8551
zcmb8!cYGC9-pBD1Acc-}5(q;Lfg~iMgAk;M6zL#>3KQ-?Cb_v2@4du^Ub}0F`Y`Ca
ziYv$?qKh@U=&E1=S#_;o0o$&P6?WHU)!hfn<Ma96nNa?G=H)N%bEcd*=XcJTgqP2~
zm+{H2jMOI`Tij+i#$*`N6TfI_%x22lI_a!2qjQbnKQo3O`M41KU?TK3Y(srJw!>X$
z;a<$b?=S~{MBUdS&zN3#3i7^`8A?I#nuXnQ1?t9&uq|GT9dSK&!27WnpF-L+Utt%_
zpta`M4fVo2R0sNp4hgT9BV#lpu?_Dx6DeeK;!JFfi*P>LxCEaFueYV!YPbt#Vm|8r
z{-^<zqB=SSb>CU27p*{bq&oC`oJjpb%;Wv$X$r&eUDN|D$#ZAygs0#jY=L936;_1T
zXP`Q=9Q9%c_2LVWKAS608T>7(oo%R$?LghPA5&c^d`6)NkK(;Juy>G=S5PT`8`Xi&
zP$M~rWZnD&HRr9YV9I)+GBOa=ZaEg<bZn33BafIXQ1wj~`PW=O7M|D<`UdL!C#Vq~
zMvdeMs=;4yDi*L3b-fn5VFJ~`8&PXwUFcTS6z>SHzZ}+I?~@8r^DZZp!h_)rKZIuV
z4Mv!QN?AA5)L5tyj6hA<R8$A&pfYnVDsva17Ud17j@}%)9+lBMQxw$TJ*Wqt2yb``
zmD=}EDg6?4-x1V<S^a_+x5iP_yP)RwOw?Rgp$2p@YRxo+-hq04Gd9Q6Rtj3Z+fXBU
z9-HB-s8qg=192Z}PJcv}iRsusIA4aWTeAc;1@)*7+>A>3MpQdnQ3HAewas_n5bgi>
zDJYfA2Lv7Igi3V*s-aR;Lz7Sq%|K;p9uCG@)Clju7PuL8|JKk)L!UxD|2&SxJy@pw
z-;CjDu?<Ic<TTWc^TPU)uwI3lV=t^<iW<??s0{ew^~X?CwlnlKoJswC%*1{L!9WYK
zHSag$DX8buQFA;SvvDP6VGU|(;;7WEMb@Xe4b|c8s7&p_V%(3K((FOO!17S-4nlQw
zJm%msOli?XD5&8S>cepd=HQd4ZL|ZkaUW{LABFY9sF8jfp8o}v$##W72l7z&4@K>U
z38)Uw3G2%X$-h!s#|e$}GK}CgVf_$lq(?A;otSW@&0L3^G7sS}d>=<*YgUvpFbT`B
z4omS~Bq?Suo`*l8rebLk`EN~OMN#luD;nB>+CC4Xrsf4yrd~#6>MzJnG(X@O*o(K0
zz*WcwF&mKSHqWDl2eCiqlmyp{kv^MwDGIb<*5al30G^2jLxTp^pkBNIHHX{7`k!zX
z^@BJYhcnF6@hVh?Ud3|!C-%U8q(je-$CfxBwVhMvP|!#dn1k1%QgaKo$J@}t`%n+O
zjC#SxsE#-1ExNxH+u+EsJ{eD;J{>hh%TSB&7E}iwLfT20?G!YZAEV|do4b|rq1YUU
zqrPyXQ7^1RrSfjnRJ@1`(tL<Yd7I(s4~rRwO7Zg08$zE%J^yFS)Bew7;xy7eNcK$`
z>V_5A3a<(4x8g+VPvSiMH>zW2u=2F{E)U&~6R7_KPs3tvnv5Q<#YUWnrK7n|`~Q3j
zI`Jq@!Xr2ahx0?9+8AnEHsE4>5VgoM_>AdA1MnP-pfdOZ>I?ZbYCxIe*fBU9`{J|s
zPKGg`VoD7^K0X-no2V3ihiWK~)-{Kdu^lc#H4s5f(RHY~yeaf{ROU9K=6W~wz|TW}
z#tziGRRrw~sv!TmaTF&y;UZ+G7#B6dU!xY+GnkDppr+)N(0!Oi{ZrIh`3lw1L#Qb|
z8lG=CF?g;mYAU+pLOf?;Drn#_PN<=$P$S!kYG@aB#l5IZ9726BehSTDf|Y^Js1D@g
zOzevqKn%4w*P#aR5~|(TLJy=UXoO#*w$C@%4Sx#HcV<B-g}JDa4@afA0(D;m^KmV9
z#=B74_)*kzPa_N6?8Qx(!|>IS2T>hKJx)O#cmeg`9<=bS@P;F(5t=DMW?Erys_l{e
zYlfmSvIsR&8#Tx4LN}v2_C#2J1vStE$a_=fAO)rP@5qiZEv5!vvT>*>xe~QTu1EF!
ze$-ld1U2%PP#yma)zQPKOnr~afIf?AKNodh8MeT&*h>4qf<jwP%s`E73F^iRQ4L;!
z8qtl|7dN05*G_DXZ=&wsi<$TlX5nYpAHT){*lt=dfZ?c)pNegGzgb2>FQ`I2coAv@
zmm?oFb0c=dov0DLgX-wtQ1`VtBS>jCREPSbMmPv{e=(}V)36zyg?i6YObw)9Q_u^3
zg{t3$e2vYEs1bZ0nmavsaRp{`emSb4)u`PO!|r%F@{u#YLCyW!n1^4XGSqBF@JlUc
z2Km>Cew<K`3sEU9L4E7zp;qZ-s24S$Uc4S#;)d}27F0VA;Z$tI@pu%w;3)Q_26!gw
zz7?pBt(r;xb0}QG3H9)5)C)F-^{uE>??QFt3v7+wq8j`KCt}B0L5CKgUU)95odl}m
zm!L9pCAPx5P#xKl3QugqKAhN&`U37py&#)E2Gn3KPQg;Na1HAE?Wj3^0M*f#P%r)*
zwQCNeR)5Rc!BkqP4ot;dOwFaB)mVdCBsZW&cqb}FTTs6vo<Ys=2cd^Te?m3XZccE$
z5LF+C>iA+*2BMh21Zt5UMD9zO!xV1kMAqD31b5?L>d#>r{uR~1+<CzijX`}U7U5XD
z2`g|9-h|ongBPyHbgEHPy9M>dd=WLU1K3jg{~HSG@ljMNJ1+=Ue+iO3W8(mP1Pkz8
zEW)2r9UHtbn6l|uLj3|P!!5{fSn~m1ik%k)AGUR<=l5g!-~U;QgT>Jo^@4GDI<CZJ
z_#m=#Ox9V!FO|7Cl6n%=f!|>#d=)$5C#Weq654J_@O>GA%E+mxflkBJ5DGR0HPnC_
z={D42d<V5kzr%L;18Oc?o*ksL15Th`gk7-)b^S_Id)MP2+=_b7+u`+}Q6HifOUeHz
z3fW78zkDiCQ*kA#19xLN?nHI$U#PXwowO*0lW{oKh2DpH;Q>?!n)7E-2keVua2V?O
zT2v<PIEVRH$~SX@Uv%a*<YQ;rpBpT$C80j518-m<euw%{<)0UvKMfPqSEF9=Ar8c>
z<w3m|)!`+m=dQtA+?t}Gk-mglY+s@l(XbUkMk=wI`h8f89qeF)6L2i`)p#r3i+b^}
zO8zdyTZoT|uZdhvoR2zI68}S}tqLMV96NY6{Wa{a7Q*9Z98df{tlx;exV{_r5>JHZ
z#o@5LA5RI(B*I)p{EE1Y=t<-ezYr|iRC;uysT|M=8ZIUr%6(B^G9BB9Hq@JrA(Y>z
zqB(3v3<|HkOPQ%RM~HtColkh?b?UDY`9zXXwr_75KhvH*Ch+rWLcd%tN}maSymvxb
z#p{T6G(IeRf#z1nMuNp{ZX;eJo+PxcbTsGQlhUn|I<bZ57&i0_<%2{|>RO08vMFDK
z1-Kkb@B!3{{)X5^yiN4xypBr((mP`W=Q<EChUbo=evdSS^^`s&_Yo6`d~RHU(}+J2
zZK<>4%>9HGn^w4v&4hM=jz@^!5nmEn+&>h%5IP1^Z#w!@xSl8@_%4}miFq3TgA`sS
z?jnZsz&b3%J!qZK!2eR$p)Xujy2L-R@cXbVhKBdY!gICAH_Kd0><G^_hFUlvgZ$5@
zP|AZph8M)?#45s5g<}ITgUIB*-{5xQQlfz9OSB+ri2ov*6Wzj&<WgQtG##f>$m7}~
ze2j3L7R0ku4iP%~1f2Bqqp<dsuG7FA>`k;L>Ioh15Tm%Z8vjD%P~L|(5aS3PK5-B6
zA@Kpx^nQx`=1Ttze(19~@Pv9-%I#^;#y=2m5Iv~>gnuKxAl@V<5ibxr%DFx$D5n1<
z+?9F;F`IMG5wGa|3&R^e!8^lpcl?wXK};vkCH_SWApV=Um*_`B5&WFkM64%tWCfh`
z^S9KZguaxcc}~Yp;y)VyOB7}iJ&2}bErr2N6^x%y9zwY+Y-Awzqy95-G0}p0J3J-4
zUQT%dF_X~o_W;u+y#AE(umANjlK3IKcsEWZ`g5)`K21DN=)>L(wh~vU&hc4*S%Y)K
z@*UWWd;b{L|BAm3%SD{m(GuUn)G&VBM3fSb6OR(@i8jRLL@RFmH})c$j!X(AL|fuQ
z;$fmS_dSGl#GeTr-vyW}ag@r|)QFq3>YRAOi`h}jjjd|$#cS=P>&47~gk?t}erd0s
z{@`9Ie^0Na{($`HjaTK@XJpmY#l3pR|4;8;{#a{F+sSrpr4u!2;*Aej@n-&!e)ayX
z{in6GS0>$hH|aY5(f%X+GY0hWFB$NLf9b%2w$q$iH|CmYPAuZY{YXJ++lUt{NLp2P
zy<@pae|Nz<{yl^4^d}V#@z)l<(J2;nV~&}V##$A3dCspJoa>)IctUZqiXm8Q5>DJ&
z>BW*xENSN2iNpn7JaVjHt*o+RtDQ(m<IEu)Gg?$TE0g}xqP)iIi@G*%ynkqB#&kRG
zSTQf%OoCik7kO*qR%O&)Src^=$r7`Ww>Z{Gcj<x?vFt=}bI`34e}C!F#(kw;M&rD4
zFLPG1%GR*b_gKfDu)|T9Mf5viUEs!&ZfrHLx00S^2Pw7~nHvvpOjNmb{=QMg<v}Md
zu*oYAB&*zD>?b{_z6agWV~s_lJ7+XHW3J9<b!<iw{^w&y_@(1Y8|%j1pVg|Ycvz`b
zHgarvd1IeR(Ttvp;tq?$vFh#Jn;gqaIF&KSs`Datvc~Zrp8T|b-IPLqz0*10oL0je
z$Gk+6zSlXsH<3fHvf8eXRy#4<KQv{TADOze?-U-bw${{nal10+*4P#ctj1&Y#ocN<
z=|rn-|I4Y>sf%r^hHBii60XG?ckghb>PE!25_HCkxE4*vTq{xMCY%~3te!W!CFZoc
zD6Ot^s~zkA+lGedR;eksyoyfMvViP(wNqbW=6cC^#5Ie(NX(9#IrUD=%(mm)zpKHn
z_I5QmX0Bg0zl+~z+K@JL;|?ojSA%Qj+l@C)Yn9QmX`m&I8_rmt;XgZLPB+)$$%IvJ
zl@GVp#2JTINxxlx`b@W%YuQbybWJ+{$Ft-3Z_VtJ>8*03w%>PFzjiS@5%ucVn8h(C
z!ESkbX(vB1>jVGhGl%3WA16FmZ>H3H)w>#MY_p)wi~5^qkIk9EN_T7RTEFj{_{3u`
zC8u$x)~T)J>GYc_%p@o3?B3zl9`9K?O($i^-#O=OzxUjYd7hc=)mw3AHM=72#_ibg
z>GluIE%dw0TalGs6^`%CTh}Sr%VuuV0w5QDoB2`y`T0HlFXs30+b*cd)H-tgwF_Qv
zv6NZ&r!BM^uUdF(v(|KU6}yq|PNK2bSqn27FI+M>WBTIsYE_DrS#34ekp8RjR@?Cs
zGn+B9mSSF|6LVJE$GgX(J9#N?JbQ8Xi|xwv=$#mg<5-g15`W&(9*x76j>#BC8tvUX
z)@ZCzD?yfz?T`|q6x&gc<VDkq)JibVUP<F0mVKN#zR0R^ty;cwwX7no*W<guENa>!
zZu%~kOO0--ORvNvi_(A69&^r#cg4az<7jQw*tK4fwhJpHe2Aw{9$tx=$zF_;QLo01
zbJwnh7#p|3?0$}o==i5r4lb^D*=ol|9ef5zS-3LH%!p@2?W!8j(vAM@m7D$ZR(_w_
zy~#>cG4pI5evKS|-nAm}HLJ<vu@8X9?wajbwO*VzlLEH0o~Vo47pLbYK^o{6>)qmW
xcx+#2OY#jOdwfWk%Nmc4D1qtp_&Xy-9Tui1;`k%}p-6>4)fw4%t+PGz{{Z1uQl9_-

diff --git a/folks/po/folks.pot b/folks/po/folks.pot
index 581813e5c..f4b22bf08 100644
--- a/folks/po/folks.pot
+++ b/folks/po/folks.pot
@@ -1,254 +1,334 @@
-# translation of folks_sl_SI.po to Slovene
-# FIRST AUTHOR <duck@obala.net>, 2007.
-# Marko Milost <marko.milost@obala.si>, 2008.
-# Usms translation.
-# Copyright (C) 2007 Horde Project
-# This file is distributed under the same license as the FOlks package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Horde Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: folks_sl_SI\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2008-09-27 19:37+0200\n"
-"PO-Revision-Date: 2008-02-05 13:07+0100\n"
-"Last-Translator: Marko Milost <marko.milost@obala.si>\n"
-"Language-Team: Slovene <sl@li.org>\n"
+"POT-Creation-Date: 2009-02-18 19:29+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3\n"
 
-#: edit/friends.php:49
+#: edit/friends/invite.php:31
+#, php-format
+msgid "%s Invited to join %s."
+msgstr ""
+
+#: edit/friends/add.php:42 edit/friends/friends.php:48
 #, php-format
 msgid "%s added you as a friend on %s"
-msgstr "%s vas je dodal kot prijetelja na %s"
+msgstr ""
 
-#: edit/approve.php:40
+#: edit/friends/approve.php:39
 #, php-format
 msgid "%s approved you as a friend on %s"
-msgstr "%s vas je potrdil kot prijetelja na %s"
+msgstr ""
 
-#: edit/reject.php:39
+#: edit/friends/reject.php:38
 #, php-format
 msgid "%s rejected you as a friend on %s"
-msgstr "%s vas je zavrnil kot prijetelja na %s"
+msgstr ""
 
-#: user.php:29
+#: user.php:63
 #, php-format
 msgid "%s's profile"
-msgstr "%s se predstavlja"
+msgstr ""
 
-#: edit/edit.php:43 edit/edit.php:59
+#: edit/edit.php:30 edit/edit.php:46 lib/Forms/AddFriend.php:29
 msgid "--- Select ---"
-msgstr "--- Izeberi ---"
+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 ""
 
-#: edit/friends.php:48
+#: scripts/mail.php:159
+msgid "-u, --username[=username]    Horde login username"
+msgstr ""
+
+#: edit/friends/add.php:41 edit/friends/friends.php:47
 #, php-format
 msgid "A confirmation was send to \"%s\"."
-msgstr "Potrditev je bila poslana na \"%s\"."
+msgstr ""
+
+#: lib/Friends/shared.php:83 lib/Friends/shared.php:158
+msgid "A group names cannot be empty"
+msgstr ""
 
-#: templates/edit/blacklist.php:13 templates/edit/friends.php:13
+#: templates/edit/groups.php:14 templates/edit/activity.php:19
+#: templates/edit/friends.php:18
 msgid "Action"
-msgstr "Ukaz"
+msgstr ""
 
-#: activity.php:17 templates/user/user.php:95 templates/list/list.php:6
+#: activity.php:17 templates/friends/friends.php:13
+#: templates/user/user.php:129 templates/user/user.php:368
+#: templates/list/list.php:7 templates/edit/activity.php:18 edit/tabs.php:27
+#: edit/activity.php:19 lib/Forms/Activity.php:20 lib/Forms/Activity.php:22
 msgid "Activity"
-msgstr "Aktivnost"
+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/edit/tabs.php:23
+msgid "Add"
+msgstr ""
 
-#: templates/user/actions.php:17 templates/user/user.php:116
+#: templates/user/actions.php:17 templates/user/user.php:150
 #, php-format
 msgid "Add %s as a friend?"
-msgstr "Dodamo %s kot prijatelja?"
+msgstr ""
 
 #: templates/user/actions.php:20
 #, php-format
 msgid "Add %s to you blacklist?"
-msgstr "Dodamo %s na črno listo?"
+msgstr ""
 
-#: lib/Forms/AddFriend.php:19
+#: lib/Forms/AddFriend.php:33
 msgid "Add / Remove"
-msgstr "Dodaj / Odstrani"
+msgstr ""
 
 #: templates/user/actions.php:14 templates/user/actions.php:15
 msgid "Add a comment"
-msgstr "Dodaj komentar"
+msgstr ""
+
+#: edit/friends/add.php:18
+msgid "Add friend"
+msgstr ""
+
+#: edit/friends/groups.php:82
+msgid "Add group"
+msgstr ""
 
-#: edit/blacklist.php:53 edit/friends.php:96
+#: edit/friends/add.php:62 edit/friends/blacklist.php:71
+#: edit/friends/friends.php:74
 msgid "Add or remove user"
-msgstr "Dodaj ali odstrani u porabnika"
+msgstr ""
 
-#: templates/user/user.php:141 templates/user/user.php:166
-#: templates/user/user.php:191 templates/user/user.php:218
-#: templates/user/user.php:244 templates/user/user.php:272
-#: templates/user/user.php:298
+#: 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"
+msgstr ""
 
 #: account/signup.php:38
 #, php-format
 msgid "Added \"%s\" to the system. You can log in now."
-msgstr "Uporabnik \"%s\" je bil oddan v sistem. Lahko se prijavite."
+msgstr ""
+
+#: edit/friends/approve.php:51
+#, php-format
+msgid "Added user %s as a friend."
+msgstr ""
 
 #: report.php:36
 msgid "Advertisement content"
-msgstr "Reklama vsebina"
+msgstr ""
 
-#: templates/user/user.php:82 templates/list/list.php:27
+#: templates/user/user.php:108 templates/list/list.php:28
 msgid "Age"
-msgstr "Starost"
+msgstr ""
 
-#: lib/Forms/Search.php:22
+#: lib/Forms/Search.php:23
 msgid "Age from"
-msgstr "Starost od"
+msgstr ""
 
-#: lib/Forms/Search.php:23
+#: lib/Forms/Search.php:24
 msgid "Age to"
-msgstr "Starost do"
+msgstr ""
 
-#: templates/list/list.php:37
+#: templates/list/list.php:38
 msgid "Albums"
-msgstr "Albumi"
+msgstr ""
 
-#: lib/Block/friends.php:36
+#: templates/edit/tabs.php:24 lib/Block/friends.php:35
 msgid "All"
-msgstr "Vsi"
+msgstr ""
 
-#: templates/list/list.php:9
+#: templates/list/list.php:10
 msgid "All users"
-msgstr "Vsi uporabniki"
+msgstr ""
 
-#: edit/edit.php:33
-msgid "All visitors can see when I was last time online"
-msgstr "Vsi lahko vidijo, kdaj sem bil nazadnje online"
+#: edit/privacy.php:33
+msgid "All visitors"
+msgstr ""
 
 #: edit/comments.php:28
 msgid "Any one"
-msgstr "Vsi"
+msgstr ""
 
-#: templates/edit/friends.php:53
-msgid "Approve"
-msgstr "Potrdi"
+#: 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 ""
 
 #: lib/Folks.php:131 lib/Folks.php:135
 msgid "Aquarius"
-msgstr "Vodnar"
+msgstr ""
 
 #: lib/Folks.php:139 lib/Folks.php:143
 msgid "Aries"
-msgstr "Oven"
+msgstr ""
 
-#: config/prefs.php.dist:43
+#: config/prefs.php.dist:50
 msgid "Ascesending"
-msgstr "Naraščajoče"
+msgstr ""
+
+#: perms.php:42
+msgid "Attempt to edit a non-existent share."
+msgstr ""
 
 #: edit/comments.php:29
 msgid "Authenticated users"
-msgstr "Prijavljeni uporabniki"
+msgstr ""
 
 #: services.php:16
 msgid "Available services"
-msgstr "Dostopne storitve"
+msgstr ""
 
-#: birthday.php:17 templates/list/list.php:8 edit/edit.php:42
+#: birthday.php:17 templates/list/list.php:9 edit/edit.php:29
 msgid "Birthday"
-msgstr "Rojstni dan"
+msgstr ""
 
-#: templates/user/actions.php:21 edit/tabs.php:23 edit/blacklist.php:19
-#: lib/Friends/sql.php:205 lib/Friends/letter.php:88
+#: templates/user/actions.php:21 templates/edit/tabs.php:34 edit/tabs.php:24
+#: edit/friends/blacklist.php:18
 msgid "Blacklist"
-msgstr "Črna lista"
+msgstr ""
 
-#: report.php:34
+#: edit/friends/invite.php:33
+msgid "Body"
+msgstr ""
+
+#: report.php:34 edit/friends/groups.php:55 edit/friends/groups.php:61
 msgid "Cancel"
-msgstr "Prekliči"
+msgstr ""
 
 #: lib/Folks.php:151 lib/Folks.php:155
 msgid "Cancer"
-msgstr "Rak"
+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 "Ne moremo resetirati gesla, kontaktirajte podporo uporabnikom."
+msgstr ""
 
-#: lib/Folks.php:272
+#: lib/Folks.php:274
 msgid "Cannot retrieve user email."
-msgstr "Ne morem prebrati email uporabnika"
+msgstr ""
 
 #: edit/password.php:20
 msgid "Cannot update password, contact your administrator."
-msgstr "Ne moremo nastaviti geslo, obrnite se na podporo."
+msgstr ""
 
 #: lib/Folks.php:131 lib/Folks.php:175
 msgid "Capricorn"
-msgstr "Kozorog"
+msgstr ""
 
 #: edit/password.php:25
 msgid "Change Your Password"
-msgstr "Spremeni geslo"
+msgstr ""
 
-#: edit/password.php:30 config/hooks.php.dist:240
+#: edit/password.php:30
 msgid "Choose a password"
-msgstr "Izberite geslo"
-
-#: config/hooks.php.dist:233
-msgid "Choose a username"
-msgstr "Izberite uporabniško ime"
-
-#: config/hooks.php.dist:236
-#, php-format
-msgid ""
-"Choose a username to be used as your nickname on %s. It can be up to %d long."
-msgstr "Izberite uporabniško ime za %s. Dolgo je lahko največ %d znakov."
+msgstr ""
 
-#: templates/user/user.php:90 templates/list/list.php:29 edit/edit.php:44
-#: 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"
+msgstr ""
 
 #: templates/user/private.php:9 templates/user/friends.php:9
 msgid "Click here"
-msgstr "Klikni tukaj"
+msgstr ""
 
 #: templates/user/authenticated.php:7 templates/user/authenticated.php:8
 msgid "Click here to login."
-msgstr "Klikni tukaj za prijavo"
+msgstr ""
 
 #: save_search.php:18 save_search.php:51
 msgid "Close"
-msgstr "Zapri"
+msgstr ""
 
-#: edit/tabs.php:29 edit/comments.php:18
+#: lib/api.php:154
+#, php-format
+msgid "Commented user %s."
+msgstr ""
+
+#: edit/tabs.php:32 edit/comments.php:18
 msgid "Comments"
-msgstr "Komentarji"
+msgstr ""
 
-#: edit/comments.php:53
+#: edit/comments.php:57
 msgid "Comments deleted successfuly"
-msgstr "Komentarji so bili uspešno izbrisani"
+msgstr ""
 
 #: account/approve.php:15
 msgid "Confirm email"
-msgstr "Potridtev poštnega predela"
+msgstr ""
 
-#: config/hooks.php.dist:224
+#: config/hooks.php.dist:364
 msgid "Confirmation code"
-msgstr "Potrditvena koda"
+msgstr ""
 
 #: lib/Report.php:98
 #, php-format
 msgid "Content abuse report in %s"
-msgstr "Prijava zlorabe vsebina v %s"
+msgstr ""
 
 #: account/resetpassword.php:28 edit/password.php:28 edit/password.php:190
 msgid "Continue"
-msgstr "Nadaljuj"
+msgstr ""
 
 #: report.php:39
 msgid "Copyright infringement"
-msgstr "Kršitev avtorskih pravic"
+msgstr ""
 
 #: account/username.php:30
 msgid "Could not find any username with this email."
-msgstr "Ne najdem uporabniškega imena s tem emailom."
+msgstr ""
 
 #: account/resetpassword.php:90
 msgid ""
@@ -256,539 +336,734 @@ msgid ""
 "details are not correct. Try again or contact your administrator if you need "
 "further help."
 msgstr ""
-"Ne morem resetirati gesla za tega uporabnika. Nekateri ali vsi podatki niso "
-"pravilni. Poskusite ponovno ali kontaktirajte podporo uporabnikom za dodatno "
-"pomoč."
 
-#: edit/edit.php:45
+#: scripts/mail.php:43
+msgid "Couldn't read command-line options."
+msgstr ""
+
+#: edit/edit.php:32
 msgid "Country"
-msgstr "Država"
+msgstr ""
 
 #: edit/password.php:29
 msgid "Current password"
-msgstr "Trenutno geslo"
+msgstr ""
+
+#: templates/friends/friends.php:12 templates/edit/activity.php:17
+msgid "Date"
+msgstr ""
 
-#: templates/list/search.php:14
+#: 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 ""
+
+#: templates/list/search.php:14 templates/edit/groups.php:27
+#: templates/edit/activity.php:31
 msgid "Delete"
-msgstr "Izbriši"
+msgstr ""
 
 #: edit/comments.php:40 edit/comments.php:47
 msgid "Delete all current comments"
-msgstr "Izbriši vse trenutne komentarje"
+msgstr ""
 
-#: edit/edit.php:65 edit/edit.php:85
+#: edit/edit.php:52 edit/edit.php:77
 msgid "Delete picture"
-msgstr "Izbriši sliko"
+msgstr ""
 
-#: config/prefs.php.dist:42
+#: config/prefs.php.dist:49
 msgid "Descesending"
-msgstr "Padajoče"
+msgstr ""
 
-#: templates/user/user.php:318 templates/list/list.php:33 edit/edit.php:63
-#: 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"
+msgstr ""
+
+#: edit/personal.php:28
+msgid "Display 24-hour times?"
+msgstr ""
+
+#: templates/edit/groups.php:27
+msgid "Do you really want to delete this group?"
+msgstr ""
 
 #: report.php:30
 msgid "Do you really want to report this user?"
-msgstr "Res želite prijavit tega uporabnika?"
+msgstr ""
 
-#: lib/Block/random.php:40
+#: lib/Block/random.php:39
 msgid "Does not metter"
-msgstr "Ni pomembno"
+msgstr ""
 
 #: account/tabs.php:25
 msgid "Don't have an account? Sign up."
-msgstr "Niste Å¡e prijavljeni?"
+msgstr ""
+
+#: perms.php:219
+msgid "Edit Permissions"
+msgstr ""
 
-#: templates/user/user.php:115
+#: perms.php:221
+#, php-format
+msgid "Edit Permissions for %s"
+msgstr ""
+
+#: templates/friends/friends.php:6
+msgid "Edit friends"
+msgstr ""
+
+#: templates/user/user.php:149
 msgid "Edit my firends"
-msgstr "Uredi prijatelje"
+msgstr ""
 
 #: edit/edit.php:18 edit/tabs.php:22
 msgid "Edit my profile"
-msgstr "Uredi moj profil"
+msgstr ""
+
+#: edit/personal.php:18
+msgid "Edit personal information"
+msgstr ""
 
-#: lib/Folks.php:288
+#: lib/Folks.php:291
 msgid "Edit profile"
-msgstr "Uredi profil"
+msgstr ""
 
-#: edit/edit.php:39 config/hooks.php.dist:246
+#: edit/edit.php:28
 msgid "Email"
-msgstr "Email"
+msgstr ""
 
-#: config/hooks.php.dist:250
-msgid ""
-"Email will be used only for admistration reasons and it won't be published "
-"or passed to third parties."
+#: scripts/mail-filter.php:175
+msgid "Email problem"
+msgstr ""
+
+#: edit/friends/groups.php:87
+msgid "Enter custom name"
 msgstr ""
-"Vnesite naslov vaše elektronske pošte. Naslov ne bo nikoli posredovan "
-"tretjim osebam."
 
-#: lib/Forms/Login.php:22
+#: lib/Forms/Login.php:23
 #, php-format
 msgid "Enter the username you registered to %s"
-msgstr "Unesite uporabnško ime s katerega se se prijavili na %s"
+msgstr ""
 
-#: 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. Gelo loči med velikimi in malimi črkami."
+msgstr ""
 
-#: templates/user/user.php:248
+#: templates/user/user.php:282
 msgid "Faces"
-msgstr "Obrazi"
+msgstr ""
 
-#: templates/user/user.php:248
+#: templates/user/user.php:282
 msgid "Faces in user galleries"
-msgstr "Orazi v galerijah uporabnika"
+msgstr ""
 
-#: templates/user/user.php:87 templates/list/list.php:66 edit/edit.php:43
-#: 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"
+msgstr ""
 
 #: account/tabs.php:29
 msgid "Forgot your password?"
-msgstr "Ste pozabili geslo?"
+msgstr ""
 
 #: account/username.php:17 account/tabs.php:32
 msgid "Forgot your username?"
-msgstr "Ste pozabili uporabniško ime?"
+msgstr ""
 
 #: templates/user/actions.php:10
 msgid "Forward"
-msgstr "Posreduj"
+msgstr ""
 
 #: templates/user/actions.php:18
 msgid "Friend"
-msgstr "Prijatelj"
+msgstr ""
 
-#: templates/user/user.php:118 edit/tabs.php:24 edit/friends.php:19
-#: lib/Block/friends.php:3 lib/Block/friends.php:23
+#: edit/friends/invite.php:52
+#, php-format
+msgid "Friend \"%s\" was invited to join %s."
+msgstr ""
+
+#: edit/friends/invite.php:28
+msgid "Friend's e-mail"
+msgstr ""
+
+#: friends.php:21 templates/user/user.php:152 templates/edit/tabs.php:1
+#: edit/tabs.php:25 edit/friends/index.php:17 edit/friends/friends.php:18
+#: lib/Folks.php:290 lib/Block/friends.php:3 lib/Block/friends.php:22
 msgid "Friends"
-msgstr "Prijatelji"
+msgstr ""
 
-#: lib/api.php:275
+#: lib/api.php:307
 msgid "Friends Birthdays"
-msgstr "Rojstni dnevi prijateljev"
+msgstr ""
+
+#: templates/friends/friends.php:7
+msgid "Friends activities"
+msgstr ""
+
+#: edit/friends/from.php:17
+msgid "Friends we are waiting approval from"
+msgstr ""
 
 #: lib/Folks.php:147 lib/Folks.php:151
 msgid "Gemini"
-msgstr "Dvojčka"
+msgstr ""
 
-#: templates/user/user.php:86 templates/list/list.php:25 edit/edit.php:43
-#: 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"
+msgstr ""
+
+#: templates/edit/groups.php:12 lib/Forms/AddFriend.php:29
+msgid "Group"
+msgstr ""
+
+#: edit/friends/groups.php:41
+#, php-format
+msgid "Group \"%s\" has been deleted."
+msgstr ""
+
+#: edit/friends/groups.php:71
+#, php-format
+msgid "Group \"%s\" has been renamed to \"%s\"."
+msgstr ""
+
+#: edit/friends/groups.php:62
+#, php-format
+msgid "Group \"%s\" has not been renamed."
+msgstr ""
+
+#: edit/friends/groups.php:103
+#, php-format
+msgid "Group \"%s\" was success added."
+msgstr ""
 
-#: templates/user/user.php:50
+#: edit/tabs.php:26 edit/friends/groups.php:18
+msgid "Groups"
+msgstr ""
+
+#: templates/user/user.php:56
 msgid "Has no picture"
-msgstr "Ima sliko"
+msgstr ""
+
+#: scripts/mail-filter.php:159 scripts/mail-filter.php:170
+msgid "Have no one to notify"
+msgstr ""
 
-#: templates/user/user.php:104 templates/list/list.php:31 edit/edit.php:47
+#: templates/user/user.php:138 templates/list/list.php:32 edit/edit.php:34
 msgid "Homepage"
-msgstr "Domača stran"
+msgstr ""
 
 #: config/prefs.php.dist:16
 msgid "How to preview users"
-msgstr "Kako naj pregledujem uporabnike"
+msgstr ""
+
+#: templates/edit/tabs.php:33
+msgid "I am friend of"
+msgstr ""
 
-#: templates/user/user.php:105
+#: templates/user/user.php:139
 msgid "I don't have it"
-msgstr "Je nimam"
+msgstr ""
 
-#: lib/Forms/Search.php:25
+#: templates/edit/tabs.php:25
+msgid "Invite"
+msgstr ""
+
+#: edit/friends/invite.php:18
+msgid "Invite friend"
+msgstr ""
+
+#: lib/Forms/Search.php:26
 msgid "Is online"
-msgstr "Je online"
+msgstr ""
 
-#: lib/Block/my_comments.php:3 lib/Block/my_comments.php:32
+#: templates/user/user.php:102
+msgid "Last activity"
+msgstr ""
+
+#: lib/Block/my_comments.php:3 lib/Block/my_comments.php:31
 msgid "Last comments on my profile"
-msgstr "Zadnji komentarji na moj profil"
+msgstr ""
 
-#: templates/user/user.php:75 edit/edit.php:41
+#: templates/user/user.php:84
 msgid "Last time online"
-msgstr "Zadnjič online"
+msgstr ""
 
 #: lib/Folks.php:155 lib/Folks.php:159
 msgid "Leo"
-msgstr "lev"
+msgstr ""
 
 #: lib/Folks.php:163 lib/Folks.php:167
 msgid "Libra"
-msgstr "Tehtnica"
+msgstr ""
 
-#: 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"
+msgstr ""
 
-#: list.php:17 templates/list/list.php:9 lib/Folks.php:291
+#: list.php:17 templates/list/list.php:10 lib/Folks.php:294
 msgid "List"
-msgstr "Spisek"
+msgstr ""
 
-#: account/tabs.php:22 lib/Forms/Login.php:19
+#: 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:20
 msgid "Login"
-msgstr "Prijava"
+msgstr ""
+
+#: scripts/mail.php:88
+msgid "Login is incorrect."
+msgstr ""
 
 #: login.php:54
-msgid "Login remainder"
-msgstr "Opozorilo o prijavi prijatela"
+msgid "Login reminder"
+msgstr ""
 
 #: login.php:124
 #, php-format
 msgid "Login to %s"
-msgstr "Prijava v %s"
+msgstr ""
 
 #: templates/user/actions.php:9
 msgid "Look at this profile"
-msgstr "Poglej ta profil"
+msgstr ""
 
-#: templates/user/user.php:87 templates/list/list.php:66 edit/edit.php:43
-#: 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"
+msgstr ""
 
-#: lib/Forms/Search.php:24
+#: scripts/mail.php:154
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too."
+msgstr ""
+
+#: lib/Forms/Search.php:25
 msgid "Mast have"
-msgstr "Mora imeti"
+msgstr ""
+
+#: templates/edit/groups.php:24
+msgid "Members"
+msgstr ""
 
 #: edit/comments.php:30
 msgid "Moderate comments - I will approve every single comment"
-msgstr "Moderiranje komentarjev - potrdil bom vsak kometar"
+msgstr ""
 
 #: config/prefs.php.dist:23
 msgid "Modify account preferences"
-msgstr "Popravi nastavitve"
+msgstr ""
 
-#: templates/list/list.php:6
+#: templates/list/list.php:7
 msgid "Most active users"
-msgstr "Najbolj aktvni uporabniki"
+msgstr ""
 
-#: templates/list/list.php:5
+#: templates/list/list.php:6
 msgid "Most popular users"
-msgstr "Najbolj priljubljeni uporabniki"
+msgstr ""
 
-#: lib/Folks.php:287
+#: lib/Folks.php:289
 msgid "My profile"
-msgstr "Moj profil"
+msgstr ""
 
 #: templates/list/search.php:11
 msgid "My queries"
-msgstr "Moja iskanja"
+msgstr ""
 
-#: save_search.php:49 lib/Forms/Search.php:19
+#: save_search.php:49 edit/friends/groups.php:86 edit/friends/groups.php:87
+#: lib/Forms/Search.php:20
 msgid "Name"
-msgstr "Ime"
+msgstr ""
+
+#: new.php:17 templates/list/list.php:4
+msgid "New"
+msgstr ""
+
+#: edit/friends/groups.php:58
+msgid "New name"
+msgstr ""
+
+#: templates/list/list.php:4
+msgid "New registered user"
+msgstr ""
 
-#: 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"
+msgstr ""
 
-#: templates/list/list.php:74 templates/list/list.php:75
-#: templates/list/list.php:76 templates/list/list.php:77
-#: templates/list/list.php:78 config/prefs.php.dist:60
-#: config/prefs.php.dist:70
+#: 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 "Ne"
+msgstr ""
 
-#: edit/comments.php:27
+#: edit/privacy.php:36 edit/comments.php:27
 msgid "No one"
-msgstr "Nihče"
+msgstr ""
 
-#: edit/edit.php:36
-msgid "No one can see when I was last time online"
-msgstr "Nihče ne sme videti kdaj sem bil zadnjič online"
+#: templates/edit/friends.php:8
+msgid "No user listed"
+msgstr ""
 
-#: templates/list/list.php:15
+#: templates/list/list.php:16
 msgid "No users found under selected criteria"
-msgstr "Ni uporabnikov pod izbranimi kriteriji"
+msgstr ""
 
-#: lib/Forms/Login.php:28
+#: lib/Forms/Login.php:29
 msgid "No, only for this view"
-msgstr "Samo za to prijavo."
+msgstr ""
 
-#: config/prefs.php.dist:62
+#: config/prefs.php.dist:69
 msgid "Notify friends that I loged in"
-msgstr "Javi prijateljem, da sem se prijavil"
+msgstr ""
 
-#: lib/Block/my_comments.php:20
+#: edit/privacy.php:49
+msgid "Notify online friends that I logged in"
+msgstr ""
+
+#: lib/Block/my_comments.php:19
 msgid "Number of comments to display"
-msgstr "Å tevilo komentarjev za prikaz"
+msgstr ""
 
-#: config/prefs.php.dist:52
+#: config/prefs.php.dist:59
 msgid "Number of users perpage"
-msgstr "Å tevilo uporabnikov na stran"
+msgstr ""
 
 #: report.php:38
 msgid "Offensive content"
-msgstr "Neprimerna ali žaljiva vsebina"
+msgstr ""
 
-#: templates/user/user.php:71 lib/Block/friends.php:38
+#: templates/user/user.php:77 templates/edit/friends.php:32
+#: lib/Block/friends.php:37
 msgid "Offline"
-msgstr "Offline"
+msgstr ""
+
+#: edit/friends/groups.php:56
+msgid "Old name"
+msgstr ""
 
-#: online.php:17 templates/user/user.php:69 templates/list/list.php:3
-#: lib/Block/random.php:39 lib/Block/friends.php:37
+#: online.php:17 templates/user/user.php:75 templates/list/list.php:3
+#: templates/edit/friends.php:30 lib/Block/random.php:38
+#: lib/Block/friends.php:36
 msgid "Online"
-msgstr "Online"
+msgstr ""
+
+#: edit/privacy.php:34
+msgid "Only authenticated users"
+msgstr ""
 
-#: templates/user/user.php:359 templates/user/user.php:368
+#: templates/user/user.php:410 templates/user/user.php:419
 msgid "Only authenticated users can post comments."
-msgstr "Samo prijavljeni uporabniki lahko vpisujejo komentarje."
+msgstr ""
 
-#: edit/edit.php:34
-msgid "Only authenticated users can see when I as last time online"
-msgstr "Samo prijavljeni uporabniki lahko vidiijo kdaj sem bil zanjič online"
+#: edit/privacy.php:35
+msgid "Only my friedns"
+msgstr ""
 
-#: edit/edit.php:35
-msgid "Only my friedns can see when I as last time online"
-msgstr "Samo prijatelji lahko vidijo kdaj sem bil zadnjič online"
+#: perms.php:54
+msgid ""
+"Only the owner or system administrator may change ownership or owner "
+"permissions for a share"
+msgstr ""
 
-#: templates/user/user.php:144 templates/user/user.php:169
-#: templates/user/user.php:194 templates/user/user.php:221
-#: templates/user/user.php:247 templates/user/user.php:275
-#: templates/user/user.php:301
+#: 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"
+msgstr ""
+
+#: templates/edit/groups.php:13
+msgid "Owner"
+msgstr ""
 
-#: edit/tabs.php:25 lib/Forms/Login.php:25
+#: edit/tabs.php:28 lib/Forms/Login.php:26
 msgid "Password"
-msgstr "Geslo"
+msgstr ""
 
 #: edit/password.php:159
 msgid "Password changed."
-msgstr "Geslo je bilo spremenjeno."
+msgstr ""
+
+#: templates/edit/groups.php:28
+msgid "Permissions"
+msgstr ""
 
-#: templates/list/list.php:35 edit/edit.php:64 lib/Forms/Search.php:24
+#: templates/list/list.php:36 edit/edit.php:51 lib/Forms/Search.php:25
 msgid "Picture"
-msgstr "Slika"
+msgstr ""
 
 #: lib/Folks.php:135 lib/Folks.php:139
 msgid "Pisces"
-msgstr "Riba"
+msgstr ""
 
-#: lib/Forms/Login.php:38
+#: lib/Forms/Login.php:39
 msgid "Please enter the text above"
-msgstr "Prosimo vnesite zgodnji tekst."
+msgstr ""
 
 #: account/resetpassword.php:47
 msgid "Please respond to your security question: "
-msgstr "Prosimo odgovorite na varnostno vprašanje: "
+msgstr ""
 
-#: popularity.php:17 templates/user/user.php:99 templates/list/list.php:5
+#: popularity.php:17 templates/user/user.php:133 templates/list/list.php:6
 msgid "Popularity"
-msgstr "Priljubljenost"
+msgstr ""
+
+#: lib/Forms/Activity.php:25
+msgid "Post"
+msgstr ""
 
-#: templates/user/user.php:142 templates/user/user.php:167
-#: templates/user/user.php:192 templates/user/user.php:219
-#: templates/user/user.php:245 templates/user/user.php:273
-#: templates/user/user.php:299 config/prefs.php.dist:15
+#: 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"
+msgstr ""
+
+#: edit/privacy.php:18 edit/tabs.php:23
+msgid "Privacy"
+msgstr ""
 
-#: edit/edit.php:31
+#: edit/privacy.php:31
 msgid "Private"
-msgstr "Osebno"
+msgstr ""
 
-#: edit/edit.php:27
+#: edit/privacy.php:27
 msgid "Public"
-msgstr "Javno"
+msgstr ""
 
-#: edit/edit.php:28
+#: edit/privacy.php:28
 msgid "Public - only authenticated users can see my personal data"
-msgstr "javno - samo registrirani uporabniki lahko vidijo moje osebne podatke"
+msgstr ""
 
-#: edit/edit.php:30
+#: edit/privacy.php:30
 msgid "Public - only my friends can see my presonal data"
-msgstr "javno - samo moji prijatelji lahko vidijo moje osebne podatke"
+msgstr ""
 
-#: lib/Block/random.php:3 lib/Block/random.php:23
+#: lib/Block/random.php:3 lib/Block/random.php:22
 msgid "Random users"
-msgstr "Nakjučni uporabniki"
+msgstr ""
 
-#: 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"
+msgstr ""
 
-#: lib/Forms/Login.php:27
+#: lib/Forms/Login.php:28
 msgid "Remember login?"
-msgstr "Si zapomnim prijavo?"
+msgstr ""
 
-#: templates/edit/blacklist.php:20 templates/edit/friends.php:21
+#: templates/edit/friends.php:41
 msgid "Remove"
-msgstr "Odstrani"
+msgstr ""
+
+#: templates/edit/groups.php:26 edit/friends/groups.php:55
+#: edit/friends/groups.php:65
+msgid "Rename"
+msgstr ""
+
+#: edit/friends/groups.php:52
+msgid "Rename group"
+msgstr ""
 
 #: account/renew.php:15
 msgid "Renew account"
-msgstr "Obnovi uporabniški račun."
+msgstr ""
 
 #: report.php:34 report.php:51 templates/user/actions.php:25
 msgid "Report"
-msgstr "Prijavi"
+msgstr ""
 
 #: lib/Report.php:109
 msgid "Report by user"
-msgstr "Prjava s strani uporabnika"
+msgstr ""
 
 #: lib/Report.php:40
 msgid "Report driver does not exist."
-msgstr "Gonilnike za prijavo ne bostaja."
+msgstr ""
 
 #: report.php:46 report.php:57
 msgid "Report reason"
-msgstr "Razlog prijave"
+msgstr ""
 
 #: report.php:45 report.php:56
 msgid "Report type"
-msgstr "Tip prijave"
+msgstr ""
 
 #: templates/user/actions.php:24
 msgid "Report user"
-msgstr "Prijavi uporabnika"
+msgstr ""
 
-#: config/prefs.php.dist:72
+#: config/prefs.php.dist:79
 msgid ""
 "Require my confirmation if someone would like to add me to his freidn list."
-msgstr "Zahtevja mojo potrditev če me želi kdo dodati kot prijatelja."
+msgstr ""
 
-#: edit/password.php:190
+#: edit/password.php:190 edit/friends/groups.php:55
 msgid "Reset"
-msgstr "Ponastavi"
+msgstr ""
 
 #: account/resetpassword.php:26
 msgid "Reset Your Password"
-msgstr "Ponastavi svoje geslo"
+msgstr ""
 
 #: lib/Folks.php:171 lib/Folks.php:175
 msgid "Sagittarius"
-msgstr "Strelec"
+msgstr ""
 
-#: save_search.php:51 edit/edit.php:65 edit/edit.php:70 edit/comments.php:40
+#: save_search.php:51 edit/edit.php:52 edit/edit.php:57 edit/comments.php:40
 msgid "Save"
-msgstr "Shrani"
+msgstr ""
 
 #: templates/list/search.php:3
 msgid "Save search criteria"
-msgstr "Shrani rezultate iskanja"
+msgstr ""
 
 #: lib/Folks.php:167 lib/Folks.php:171
 msgid "Scorpio"
-msgstr "Å korpijon"
+msgstr ""
 
-#: search.php:18 lib/Folks.php:290 lib/Forms/Search.php:26
+#: search.php:18 lib/Folks.php:293 lib/Forms/Search.php:27
 msgid "Search"
-msgstr "Najdi"
+msgstr ""
 
-#: lib/Forms/Search.php:19
+#: lib/Forms/Search.php:20
 msgid "Search by"
-msgstr "Išči po"
+msgstr ""
 
 #: save_search.php:39
 msgid "Search criteria deleted."
-msgstr "Stranjeno iskanje je bilo zbrisano"
+msgstr ""
 
 #: save_search.php:28
 msgid "Search criteria saved successfuly"
-msgstr "Stranjeno iskanje je bilo uspešno shranjeno"
+msgstr ""
 
 #: account/resetpassword.php:49 edit/password.php:195
 msgid "Security answer"
-msgstr "Varnostni odgovor"
+msgstr ""
 
 #: edit/password.php:192
 msgid "Security question"
-msgstr "Varnostno vprašanje"
+msgstr ""
 
 #: edit/password.php:189
 msgid "Security question used when reseting password"
-msgstr "Varnostno vprašanje, ki ga bomo uporabili pri resetiranju gesla"
+msgstr ""
 
 #: account/username.php:19
 msgid "Send me my username"
-msgstr "Pošlji mi uporabniško ime"
+msgstr ""
 
-#: templates/user/actions.php:7 templates/edit/friends.php:24
+#: templates/user/actions.php:7 templates/edit/friends.php:46
 msgid "Send message"
-msgstr "Pošlji sporočilo"
+msgstr ""
 
 #: templates/user/actions.php:6
 msgid "Send private message"
-msgstr "Pošlji osebno sporočilo"
+msgstr ""
 
 #: templates/user/actions.php:9
 msgid "Send this profile to a friend"
-msgstr "Povej prijatelju za ta profil"
+msgstr ""
 
-#: lib/Folks.php:289
+#: lib/Folks.php:292
 msgid "Services"
-msgstr "Servisi"
+msgstr ""
 
 #: config/prefs.php.dist:24
 msgid "Set account action details"
-msgstr "Nastavite ukazne parametre"
+msgstr ""
+
+#: config/prefs.php.dist:31
+msgid "Set activity preferences"
+msgstr ""
 
 #: config/prefs.php.dist:17
 msgid "Set users preview paramaters"
-msgstr "Nastavitev pregledovanja uporabnikov"
+msgstr ""
 
-#: config/prefs.php.dist:22
+#: config/prefs.php.dist:22 config/prefs.php.dist:29
 msgid "Settings"
-msgstr "Nastavitve"
+msgstr ""
 
-#: lib/Block/friends.php:33
+#: lib/Block/friends.php:32
 msgid "Show friends that are"
-msgstr "Prikaži prijatelje, ki so"
+msgstr ""
 
 #: account/signup.php:61
 msgid "Sign up"
-msgstr "Prijava novega uporabnika"
+msgstr ""
 
-#: templates/list/list.php:19 templates/list/list.php:42
+#: templates/list/list.php:20 templates/list/list.php:43
 msgid "Sort Direction"
-msgstr "Smer razvrščanja"
+msgstr ""
 
-#: config/prefs.php.dist:34 config/prefs.php.dist:44
+#: config/prefs.php.dist:41 config/prefs.php.dist:51
 msgid "Sort by"
-msgstr "Razvrsti po"
+msgstr ""
 
-#: templates/list/list.php:26
+#: templates/list/list.php:27
 msgid "Sort by Age"
-msgstr "Razvrsti po starost"
+msgstr ""
 
-#: templates/list/list.php:36
+#: templates/list/list.php:37
 msgid "Sort by Albums"
-msgstr "Razvrsti po Å¡ptevilu albumov"
+msgstr ""
 
-#: templates/list/list.php:28
+#: templates/list/list.php:29
 msgid "Sort by City"
-msgstr "Razvrsti po mestu"
+msgstr ""
 
-#: templates/list/list.php:32
+#: templates/list/list.php:33
 msgid "Sort by Description"
-msgstr "Razvrsti po opisu"
+msgstr ""
 
-#: templates/list/list.php:24
+#: templates/list/list.php:25
 msgid "Sort by Gender"
-msgstr "Razvrsti po spolu"
+msgstr ""
 
-#: templates/list/list.php:30
+#: templates/list/list.php:31
 msgid "Sort by Homepage"
-msgstr "Razvrsti po domačio strani"
+msgstr ""
 
-#: templates/list/list.php:34
+#: templates/list/list.php:35
 msgid "Sort by Picture"
-msgstr "Razvrsti po sliki"
+msgstr ""
 
-#: templates/list/list.php:22
+#: templates/list/list.php:23
 msgid "Sort by Username"
-msgstr "Ste po uporabniškem imenu"
+msgstr ""
 
-#: templates/list/list.php:38
+#: templates/list/list.php:39
 msgid "Sort by Video"
-msgstr "Razvrsti po posnetkih"
+msgstr ""
 
-#: templates/user/user.php:65 edit/edit.php:40
+#: templates/user/user.php:71 templates/edit/friends.php:17
+#: edit/privacy.php:40
 msgid "Status"
-msgstr "Status"
+msgstr ""
+
+#: edit/friends/invite.php:30
+msgid "Subject"
+msgstr ""
 
 #: account/signup.php:44
 #, php-format
@@ -796,141 +1071,151 @@ msgid ""
 "Submitted request to add \"%s\" to the system. You cannot log in until your "
 "request has been approved."
 msgstr ""
-"Poslana je bila zahteva za prijavo \"%s\" v sistem. Ne morete se prijaviti, "
-"dokler vaša zahteva ne bo potrjena."
 
 #: lib/Folks.php:143 lib/Folks.php:147
 msgid "Taurus"
-msgstr "Bik"
+msgstr ""
 
 #: report.php:37
 msgid "Terms and conditions infringement"
-msgstr "Kršenje pravil obnašanja"
+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 ""
-"Koda ni pravilna. Morda ste jo narobe prenesli s vašega poštnega predala."
-
-#: templates/edit/blacklist.php:4
-msgid "There are no users in your blacklist."
-msgstr "V vaši črni listi ni nikogar."
-
-#: templates/edit/friends.php:4
-msgid "There are no users listed as your friend."
-msgstr "Nimate nobenega uporabnika označenega kot prijatelja."
 
-#: config/hooks.php.dist:176
+#: config/hooks.php.dist:312
 msgid "There is already an user registered with this email"
-msgstr "Elektronska pošta je že v uporabi."
+msgstr ""
 
-#: config/hooks.php.dist:174
+#: config/hooks.php.dist:310
 msgid "There is already an user registered with this username"
-msgstr "Uporabniško ime je že zasedno."
+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 "Prišlo je do napake pri dodaju uporabnika \"%s\": %s"
+msgstr ""
 
-#: 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 praijavi v vaš poštni predal."
+msgstr ""
 
-#: login.php:184
+#: login.php:185
 msgid "This account was deleted or is expired."
-msgstr "Vaše uporabnško ime je preteklo ali je v postopku izbrisa."
+msgstr ""
 
-#: 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 ni še aktivno. Preglejte vašo elektronsko pošto. Nanjo "
-"smo poslali aktivacijsko kodo."
 
-#: lib/Block/my_comments.php:57
+#: lib/Block/my_comments.php:56
 msgid "Title"
-msgstr "Naslov"
+msgstr ""
 
-#: lib/Report.php:122
+#: lib/Report.php:122 lib/Friends/application.php:25
+#: lib/Friends/application.php:40 lib/Friends/application.php:55
+#: lib/Friends/application.php:70 lib/Friends/application.php:85
+#: lib/Friends/application.php:100
 msgid "Unsupported"
-msgstr "Nepodprto."
+msgstr ""
+
+#: perms.php:211
+#, php-format
+msgid "Updated \"%s\"."
+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:58
+#: edit/edit.php:45
 msgid "Upload a new video"
-msgstr "Naloži nov posnetek"
+msgstr ""
 
-#: report.php:55 lib/Block/my_comments.php:58
+#: scripts/mail.php:152
+#, php-format
+msgid "Usage: %s [OPTIONS]..."
+msgstr ""
+
+#: report.php:55 lib/Block/my_comments.php:57
 msgid "User"
-msgstr "Uporabnik"
+msgstr ""
 
-#: lib/Driver.php:372 lib/Driver/sql.php:303
+#: lib/Driver.php:381 lib/Driver/sql.php:308
 #, php-format
 msgid "User \"%s\" does not exists."
-msgstr "Uporabnik \"%s\" ne obstaja."
+msgstr ""
 
-#: lib/Friends.php:185 lib/Friends.php:254
+#: lib/Friends.php:214 lib/Friends.php:283
 #, php-format
 msgid "User \"%s\" does not exits"
-msgstr "Uporabnik \"%s\" ne obstaja."
+msgstr ""
 
-#: lib/Friends.php:262
+#: lib/Friends.php:291
 #, php-format
 msgid "User \"%s\" is already in fiend list"
-msgstr "Uporabnik \"%s\" je že med bašimi prijatelji."
+msgstr ""
 
-#: lib/Friends.php:270
+#: lib/Friends.php:299
 #, php-format
 msgid ""
 "User \"%s\" is already in fiend list, but we are waiting his/her approval."
 msgstr ""
-"Uporabnik \"%s\" je že na spisku vaših prijateljev vendar čakamo da vas "
-"potrdi."
 
 #: account/renew.php:43
 #, php-format
 msgid "User \"%s\" is not market to be in the removal process."
-msgstr "Uporabnik \"%s\" ni v postopku izbisa."
+msgstr ""
 
-#: edit/friends.php:60
+#: edit/friends/add.php:55 edit/friends/friends.php:59
 #, php-format
 msgid "User \"%s\" was added as your friend."
-msgstr "Uporabnik \"%s\" je bil dodan kot vaš prijatelj."
+msgstr ""
 
-#: edit/blacklist.php:41
+#: edit/friends/blacklist.php:44
 #, php-format
 msgid "User \"%s\" was added to your blacklist."
-msgstr "Uporabnik \"%s\" je bil dodan v vašo črno listo."
+msgstr ""
 
 #: account/approve.php:43
 #, php-format
 msgid "User \"%s\" was already activated."
-msgstr "Uporabnik \"%s\" je že potrjen."
+msgstr ""
 
-#: edit/approve.php:38
+#: edit/friends/approve.php:37
 #, php-format
 msgid "User \"%s\" was confirmed as a friend."
-msgstr "Uporabnik \"%s\" je bil potrjen kot vaš prijatelj."
+msgstr ""
 
-#: edit/reject.php:37
+#: edit/friends/reject.php:36
 #, php-format
 msgid "User \"%s\" was rejected as a friend."
-msgstr "Uporabnik \"%s\" je bil zavrnjen kot vaš prijatelj."
+msgstr ""
 
-#: edit/blacklist.php:34
+#: edit/friends/blacklist.php:35
 #, php-format
 msgid "User \"%s\" was removed from your blacklist."
-msgstr "Uporabnik \"%s\" je bil odstranjen z vaše črne liste."
+msgstr ""
 
-#: edit/friends.php:41
+#: edit/friends/add.php:32 edit/friends/friends.php:40
 #, php-format
 msgid "User \"%s\" was removed from your friend list."
-msgstr "Uporabnik \"%s\" je bil odstranjen z vaše liste uporabnikov."
+msgstr ""
 
-#: edit/friends.php:52
+#: edit/friends/add.php:45 edit/friends/friends.php:51
 #, php-format
 msgid ""
 "User %s added you to his firends list on %s. \n"
@@ -938,34 +1223,28 @@ msgid ""
 "To reject, go to: %s \n"
 "To see to his profile, go to: %s \n"
 msgstr ""
-"Uporabnik %s vas je izbral za prijatelja na %s. \n"
-"Za potditev: %s \n"
-"Za zavrnitev: %s \n"
-"Njegov profil: %s \n"
 
-#: edit/approve.php:44
+#: edit/friends/approve.php:43
 #, php-format
 msgid ""
 "User %s confirmed you as a friend on %s.. \n"
 "To see to his profile, go to: %s \n"
 msgstr ""
-"Uporabnik %s vas je potrdil za prijatelja na %s. \n"
-"Njegov profil: %s \n"
 
-#: templates/user/user.php:348
+#: templates/user/user.php:399
 #, php-format
 msgid "User %s does not wish to be commented."
-msgstr "Uporabnik %s ne želi biti kometiran."
+msgstr ""
 
 #: templates/user/deleted.php:4
 #, php-format
 msgid "User %s has been disabled."
-msgstr "Uporabnik %s je bil izklopljen."
+msgstr ""
 
 #: templates/user/inactive.php:4
 #, php-format
 msgid "User %s is inactive."
-msgstr "Uporabnik %s ni aktiven."
+msgstr ""
 
 #: login.php:52
 #, php-format
@@ -973,17 +1252,13 @@ msgid ""
 "User %s just logged in.\n"
 "%s"
 msgstr ""
-"Uporabnik %s se je pravkar prijavil.\n"
-"%s"
 
-#: edit/reject.php:43
+#: edit/friends/reject.php:42
 #, php-format
 msgid ""
 "User %s rejected you as a friend on %s.. \n"
 "To see to his profile, go to: %s \n"
 msgstr ""
-"Uporabnik %s vas je zavrnil kot prijatelja na %s. \n"
-"Njegov profil: %s \n"
 
 #: templates/user/authenticated.php:4
 #, php-format
@@ -991,170 +1266,211 @@ msgid ""
 "User %s would like to his profile remains visible only to authenticated "
 "users."
 msgstr ""
-"Uporabnik %s želi da njegov profil ogledujejo le prijavljeni uporabniki."
 
 #: templates/user/friends.php:4
 #, php-format
 msgid "User %s would like to his profile remains visible only to his friends."
-msgstr "Uporabnik %s želi da njegov profil ogledujejo le njegovi prijatelji."
+msgstr ""
 
 #: templates/user/private.php:4
 #, php-format
 msgid "User %s would like to remain private."
-msgstr "Uporabnik %s želi ostati anonimen"
+msgstr ""
 
 #: account/signup.php:21
 msgid "User Registration has been disabled for this site."
-msgstr "Registracija novih uporabnikv je začasno izklopljena."
+msgstr ""
 
-#: lib/Block/random.php:36
+#: lib/Block/random.php:35
 msgid "User is currently online?"
-msgstr "Je uporabnik trenutno online?."
+msgstr ""
 
 #: report.php:25
 msgid "User is not selected"
-msgstr "Uporabnik ni izbran"
+msgstr ""
 
 #: templates/user/actions.php:28
 msgid "User list"
-msgstr "Spiske uporabnikov"
+msgstr ""
 
 #: report.php:62 report.php:68
 msgid "User was not reported."
-msgstr "Uporabnik ni bil prijavljen."
+msgstr ""
 
 #: report.php:65
 msgid "User was reported."
-msgstr "Uporabnik ni bil prijavljen."
+msgstr ""
 
-#: templates/list/list.php:23 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:33
+#: templates/friends/friends.php:11 templates/list/list.php:24
+#: templates/edit/friends.php:16 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"
+msgstr ""
+
+#: config/hooks.php.dist:297
+msgid ""
+"Username can contain only alphanumeric characters, underscore and minus."
+msgstr ""
 
 #: templates/user/actions.php:29
 msgid "Users"
-msgstr "Uporabniki"
+msgstr ""
 
-#: lib/api.php:276
+#: lib/api.php:308
 msgid "Users Birthdays"
-msgstr "Rojstni dnevi uporabnikov"
+msgstr ""
 
-#: templates/list/list.php:8
+#: templates/list/list.php:9
 msgid "Users celebrating birthday today"
-msgstr "Uporabniki, ki danes praznujejo rojstni dan"
+msgstr ""
 
 #: templates/list/list.php:3
 msgid "Users currently online"
-msgstr "Uporabniki trenutno na strani."
-
-#: templates/edit/friends.php:59
-msgid "Users that has you listed as a friend"
-msgstr "Uporabniki, ki nas imajo mene za prijatelje."
+msgstr ""
 
-#: templates/edit/friends.php:48
-msgid "Users winting us to approve their friendship"
-msgstr "Uporabnki ki čakajo na našo potditev."
+#: edit/friends/for.php:17
+msgid "Users waiting our approval"
+msgstr ""
 
-#: templates/list/list.php:39 edit/edit.php:59 lib/Forms/Search.php:24
+#: templates/list/list.php:40 edit/edit.php:46 lib/Forms/Search.php:25
 msgid "Video"
-msgstr "Video"
+msgstr ""
 
-#: templates/edit/friends.php:22
+#: templates/edit/friends.php:37
 msgid "View profile"
-msgstr "Preglej profil"
+msgstr ""
 
 #: lib/Folks.php:159 lib/Folks.php:163
 msgid "Virgo"
-msgstr "Devica"
+msgstr ""
 
-#: templates/user/user.php:105
+#: templates/user/user.php:139
 msgid "Visit my homepage"
-msgstr "Obišči mojo domačo stran"
+msgstr ""
+
+#: templates/edit/tabs.php:31
+msgid "Wainting for"
+msgstr ""
+
+#: templates/edit/tabs.php:32
+msgid "Wainting from"
+msgstr ""
 
-#: templates/edit/friends.php:39
-msgid "We are waiting this users to approve our friendship"
-msgstr "Uporabnke na katere čakamo da nas potrdijo kot uporabniki."
+#: edit/friends/of.php:17
+msgid "We are friends of"
+msgstr ""
+
+#: user.php:48 friends.php:25 edit/activity.php:34
+msgid "What are you doing right now?"
+msgstr ""
 
-#: lib/Friends/sql.php:204 lib/Friends/letter.php:87
+#: lib/Friends/prefs.php:164 lib/Friends/sql.php:192
 msgid "Whitelist"
-msgstr "Želje"
+msgstr ""
 
 #: edit/comments.php:38
 msgid "Who can post comments to your profile"
-msgstr "Kdo lahko kometira vaš profil"
+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
+#: lib/Forms/Search.php:19
 msgid "Word"
-msgstr "Beseda"
+msgstr ""
 
-#: templates/list/list.php:74 templates/list/list.php:75
-#: templates/list/list.php:76 templates/list/list.php:77
-#: templates/list/list.php:78 config/prefs.php.dist:61
-#: config/prefs.php.dist:71
+#: 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 "Da"
+msgstr ""
 
-#: 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 da si zapomnim prijavo za naslednji obisk."
+msgstr ""
 
 #: account/approve.php:62 account/renew.php:62
 msgid "You account is activated, you can login now."
-msgstr "Vaše uporabniško ime je bilo potrjeno. Sedaj se lahko prijavite."
+msgstr ""
+
+#: lib/Friends/shared.php:163
+#, php-format
+msgid "You already have a group named \"%s\"."
+msgstr ""
 
 #: login.php:135
 msgid "You are entering your data too fast!"
-msgstr "Podatke vnašate prehitro."
+msgstr ""
 
-#: templates/user/user.php:356 templates/user/user.php:376
+#: 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."
+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 "Še vedno mu lahko pošljete osebno sporočilo %s."
+msgstr ""
 
-#: lib/Friends.php:190
+#: lib/Friends.php:219
 #, php-format
 msgid "You cannot add \"%s\" to your blacklist."
-msgstr "Ne morete dodati \"%s\" na črno listo."
+msgstr ""
 
-#: lib/Friends.php:248
+#: lib/Friends.php:277
 msgid "You cannot add yourself as your own friend."
-msgstr "Sami sebe ne morete dati kot prijatelja"
+msgstr ""
 
-#: lib/Friends.php:179
+#: lib/Friends.php:208
 msgid "You cannot add yourself to your blacklist."
-msgstr "Ne morete dodati samega sebe na črno listo."
+msgstr ""
+
+#: lib/api.php:381
+msgid "You cannot log activities for other users."
+msgstr ""
+
+#: lib/Driver.php:753 lib/Forms/Activity.php:33
+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 "Podati morate kodo za potrditev računa."
+msgstr ""
 
-#: account/approve.php:28 account/renew.php:28 edit/approve.php:24
-#: edit/reject.php:24
+#: account/approve.php:28 account/renew.php:28 edit/friends/approve.php:23
+#: edit/friends/reject.php:23
 msgid "You must supply a username."
-msgstr "Podati morate uporabiško ime"
+msgstr ""
 
-#: edit/comments.php:76
+#: edit/comments.php:81
 msgid "Your comments preference was sucessfuly saved."
-msgstr "Vaše nastaviteve komentarjev so bile uspešno shranjene."
+msgstr ""
 
-#: edit/edit.php:79
+#: 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."
+msgstr ""
 
 #: account/username.php:20
 msgid "Your email"
-msgstr "Vaš email"
+msgstr ""
 
-#: edit/edit.php:90
+#: 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."
+msgstr ""
 
 #: account/resetpassword.php:76
 #, php-format
@@ -1163,43 +1479,40 @@ msgid ""
 "\n"
 " It was requested by %s on %s"
 msgstr ""
-"Vaše novo geslo za %s je %s. \n"
-"\n"
-"Zahtevano je bilo s strani %s ob %s"
 
 #: edit/password.php:66
 #, php-format
 msgid ""
 "Your new password is too long; passwords may not be more than %d characters "
 "long!"
-msgstr "Vaše geslo je predlogo. Gesla ne morejo biti daljša od %d znakov!"
+msgstr ""
 
 #: edit/password.php:145
 msgid "Your new password is too simple to guess!  Not changed!"
-msgstr "Geslo je preveč preposto. Ni bilo spremenjeno!"
+msgstr ""
 
 #: edit/password.php:136
 msgid "Your new password is too simple to guess. Not changed!"
-msgstr "Geslo je preveč preposto. Ni spremenjeno!"
+msgstr ""
 
 #: edit/password.php:61
 #, php-format
 msgid "Your new password must be at least %d characters long!"
-msgstr "Geslo mora biti vsaj %d znakov dolgo!"
+msgstr ""
 
 #: edit/password.php:44
 msgid "Your new password must be different from your current password"
-msgstr "Novo geslo mora biti drugaćno od starega"
+msgstr ""
 
 #: edit/password.php:106
 #, php-format
 msgid "Your new password must contain at least %d alphabetic characters."
-msgstr "Geslo mora vsebovati vsaj %d črk."
+msgstr ""
 
 #: edit/password.php:111
 #, php-format
 msgid "Your new password must contain at least %d alphanumeric characters."
-msgstr "Geslo mora vsebovati vsaj %d Å¡tevil."
+msgstr ""
 
 #: edit/password.php:116
 #, php-format
@@ -1207,40 +1520,38 @@ msgid ""
 "Your new password must contain at least %d different types of characters. "
 "The types are: lower, upper, numeric, and symbols."
 msgstr ""
-"Gelo mora vsebovati vsaj %d različnih tipov znakov. Tipi znakov: majhne "
-"črke, velike črke, številke in simboli."
 
 #: edit/password.php:96
 #, php-format
 msgid "Your new password must contain at least %d lowercase characters."
-msgstr "Geslo mora vsebovati vsaj %d majhnih črk."
+msgstr ""
 
 #: edit/password.php:101
 #, php-format
 msgid "Your new password must contain at least %d numeric characters."
-msgstr "Geslo mora vsebovati vsaj %d Å¡tevilk."
+msgstr ""
 
 #: edit/password.php:91
 #, php-format
 msgid "Your new password must contain at least %d uppercase characters."
-msgstr "Geslo mora vsebovati vsaj %d velikih črk."
+msgstr ""
 
 #: edit/password.php:122
 #, php-format
 msgid "Your new password must contain less than %d whitespace characters."
-msgstr "Geslo mora vsebovati manj kot %d presledkov."
+msgstr ""
 
 #: edit/password.php:124
 msgid "Your new password must not contain whitespace characters."
-msgstr "Geslo ne sme vsebovati presledkov."
+msgstr ""
 
 #: edit/password.php:50
 msgid "Your old password didn't match"
-msgstr "Vaše staro gelso se ne ujema"
+msgstr ""
 
 #: account/resetpassword.php:82
 msgid "Your password has been reset"
-msgstr "Vaše geslo je bilo resetirano"
+msgstr ""
 
 #: account/resetpassword.php:84
 #, php-format
@@ -1248,11 +1559,10 @@ msgid ""
 "Your password has been reset, check your email (%s) and log in with your new "
 "password."
 msgstr ""
-"Vaše geslo je bilo resetirano, novo geslo smo poslali na vaš email (%s)."
 
 #: edit/password.php:185
 msgid "Your securiy questions was updated."
-msgstr "Vaše varnostno vprašanje je bilo ažurirano."
+msgstr ""
 
 #: account/username.php:34
 #, php-format
@@ -1261,11 +1571,8 @@ msgid ""
 "\n"
 " It was requested by %s on %s"
 msgstr ""
-"Vaše uporabniško ime na %s %s je: %s. \n"
-"\n"
-" Zahteval ga je %s ob %s"
 
-#: config/hooks.php.dist:218
+#: config/hooks.php.dist:358
 #, php-format
 msgid ""
 "Your username on %s %s is: %s. \n"
@@ -1273,23 +1580,19 @@ msgid ""
 " Please confirm the registration by going to this link \n"
 " %s"
 msgstr ""
-"Vaše uporabniško ime na %s %s je: %s. \n"
-"\n"
-" Prosimo potrdite prijevo na spodnji povezavu\n"
-" %s"
 
 #: login.php:156
 msgid "Your username or password is incorrect."
-msgstr "Vaše uporabniško ime ali geslo je napačno."
+msgstr ""
 
 #: account/username.php:41
 msgid "Your username was requested"
-msgstr "Zahtevano je bilo vaše uporabniško ime"
+msgstr ""
 
 #: account/username.php:43
 #, php-format
 msgid "Your username was sent, check your email (%s)."
-msgstr "Vaše uporabniško ime je bilo poslano na vaš emali (%s)."
+msgstr ""
 
 #: login.php:172
 #, php-format
@@ -1297,9 +1600,7 @@ msgid ""
 "Your username was temporary deacirvated. For any additional information "
 "please write to %s, and don't forgot to incluide your username."
 msgstr ""
-"Vaše uporabniško ime je bilo začasno deaktivirano. Za dodatne informacije se "
-"obrnite na %s. Ne pozabite navesti vašega uporabniškega imena."
 
-#: edit/password.php:30 config/hooks.php.dist:243
+#: edit/password.php:30
 msgid "type the password twice to confirm"
-msgstr "Prosim, vnesite geslo dvakrat za potrditev"
+msgstr ""
diff --git a/folks/po/sl_SI.po b/folks/po/sl_SI.po
index 518039d2b..a206f1ef6 100644
--- a/folks/po/sl_SI.po
+++ b/folks/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl_SI\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2009-01-30 16:22+0100\n"
+"POT-Creation-Date: 2009-02-18 19:29+0100\n"
 "PO-Revision-Date: 2008-12-29 00:24+0100\n"
 "Last-Translator: Marko Milost <marko.milost@obala.si>\n"
 "Language-Team: Slovene <sl@li.org>\n"
@@ -21,21 +21,22 @@ msgstr ""
 "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/invite.php:31
+#, php-format
+msgid "%s Invited to join %s."
+msgstr "%s vas vabi da se prijavite na %s"
 
-#: edit/friends.php:49
+#: edit/friends/add.php:42 edit/friends/friends.php:48
 #, php-format
 msgid "%s added you as a friend on %s"
 msgstr "%s vas je dodal kot prijatelja na %s"
 
-#: edit/approve.php:40
+#: edit/friends/approve.php:39
 #, php-format
 msgid "%s approved you as a friend on %s"
 msgstr "%s vas je potrdil kot prijatelja na %s"
 
-#: edit/reject.php:39
+#: edit/friends/reject.php:38
 #, php-format
 msgid "%s rejected you as a friend on %s"
 msgstr "%s je zavrnil vaše prijateljstvo na %s"
@@ -45,7 +46,7 @@ msgstr "%s je zavrnil vaše prijateljstvo na %s"
 msgid "%s's profile"
 msgstr "%s se predstavlja"
 
-#: edit/edit.php:30 edit/edit.php:46
+#: edit/edit.php:30 edit/edit.php:46 lib/Forms/AddFriend.php:29
 msgid "--- Select ---"
 msgstr "--- Izberi ---"
 
@@ -69,21 +70,24 @@ msgstr ""
 msgid "-u, --username[=username]    Horde login username"
 msgstr ""
 
-#: edit/friends.php:48
+#: edit/friends/add.php:41 edit/friends/friends.php:47
 #, php-format
 msgid "A confirmation was send to \"%s\"."
 msgstr "Potrditev je bila poslana na \"%s\"."
 
-#: templates/edit/activity.php:19 templates/edit/blacklist.php:13
-#: templates/edit/friends.php:13
+#: lib/Friends/shared.php:83 lib/Friends/shared.php:158
+msgid "A group names cannot be empty"
+msgstr "Ime skupine ne more biti prazno"
+
+#: templates/edit/groups.php:14 templates/edit/activity.php:19
+#: templates/edit/friends.php:18
 msgid "Action"
 msgstr "Ukaz"
 
-#: activity.php:17 templates/friends/friends.php:18
-#: 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:20 lib/Forms/Activity.php:22
+#: activity.php:17 templates/friends/friends.php:13
+#: templates/user/user.php:129 templates/user/user.php:368
+#: templates/list/list.php:7 templates/edit/activity.php:18 edit/tabs.php:27
+#: edit/activity.php:19 lib/Forms/Activity.php:20 lib/Forms/Activity.php:22
 msgid "Activity"
 msgstr "Aktivnost"
 
@@ -93,11 +97,15 @@ msgstr "Aktivnost"
 
 #: edit/activity.php:28
 msgid "Activity successfully deleted"
-msgstr "Aktivnost je bila uspešno izbrisana"
+msgstr "Aktivnost je bil uspešno izbisana"
 
 #: user.php:54 friends.php:31 edit/activity.php:40
 msgid "Activity successfully posted"
-msgstr "Aktivnost uspešno objavljena"
+msgstr "Aktivnost je bila uspešno dodana"
+
+#: templates/edit/tabs.php:23
+msgid "Add"
+msgstr "Dodaj"
 
 #: templates/user/actions.php:17 templates/user/user.php:150
 #, php-format
@@ -109,7 +117,7 @@ msgstr "Dodamo %s kot prijatelja?"
 msgid "Add %s to you blacklist?"
 msgstr "Dodamo %s na črno listo?"
 
-#: lib/Forms/AddFriend.php:20
+#: lib/Forms/AddFriend.php:33
 msgid "Add / Remove"
 msgstr "Dodaj / Odstrani"
 
@@ -117,7 +125,16 @@ msgstr "Dodaj / Odstrani"
 msgid "Add a comment"
 msgstr "Dodaj komentar"
 
-#: edit/blacklist.php:55 edit/friends.php:96
+#: edit/friends/add.php:18
+msgid "Add friend"
+msgstr "Dodaj prijatelja"
+
+#: edit/friends/groups.php:82
+msgid "Add group"
+msgstr "Dodaj skupino"
+
+#: edit/friends/add.php:62 edit/friends/blacklist.php:71
+#: edit/friends/friends.php:74
 msgid "Add or remove user"
 msgstr "Dodaj ali odstrani uporabnika"
 
@@ -133,10 +150,10 @@ msgstr "Dodaj svojo vsebino"
 msgid "Added \"%s\" to the system. You can log in now."
 msgstr "Dodali smo \"%s\" v sistem. Lahko se prijavite."
 
-#: edit/approve.php:52
+#: edit/friends/approve.php:51
 #, php-format
 msgid "Added user %s as a friend."
-msgstr "Dodaj uporabnika %s kot prijatelja."
+msgstr "Uporabnik %s je bil dodan kot prijatelj."
 
 #: report.php:36
 msgid "Advertisement content"
@@ -158,7 +175,7 @@ msgstr "Starost do"
 msgid "Albums"
 msgstr "Albumi"
 
-#: lib/Block/friends.php:35
+#: templates/edit/tabs.php:24 lib/Block/friends.php:35
 msgid "All"
 msgstr "Vsi"
 
@@ -174,7 +191,7 @@ msgstr "Vsi obiskovalci"
 msgid "Any one"
 msgstr "Vsi"
 
-#: templates/friends/friends.php:43 templates/edit/activity.php:16
+#: templates/edit/activity.php:16
 msgid "Application"
 msgstr "Aplikacija"
 
@@ -182,19 +199,13 @@ msgstr "Aplikacija"
 msgid ""
 "Application you would like NOT to log activitiy when you post a new PUBLIC "
 "COMMENT"
-msgstr ""
-"Aplikacije za katero si ne želite da se vodi javni spisek novosti."
+msgstr "Aplikacije katerih ne beležim JAVNEGA pregleda novih komentarjev"
 
 #: 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 katero si ne želite da se vodi javni spisek vaših novih komentarjev."
-
-#: templates/edit/friends.php:53
-msgid "Approve"
-msgstr "Potrdi"
+msgstr "Aplikacije katerih ne beležim JAVNEGA pregleda mojih aktivnosti"
 
 #: lib/Folks.php:131 lib/Folks.php:135
 msgid "Aquarius"
@@ -208,6 +219,10 @@ msgstr "Oven"
 msgid "Ascesending"
 msgstr "Naraščajoče"
 
+#: perms.php:42
+msgid "Attempt to edit a non-existent share."
+msgstr "Poskušate urejati ne obstoječo skupino"
+
 #: edit/comments.php:29
 msgid "Authenticated users"
 msgstr "Prijavljeni uporabniki"
@@ -220,12 +235,16 @@ msgstr "Dostopne storitve"
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: templates/user/actions.php:21 edit/tabs.php:24 edit/blacklist.php:19
-#: lib/Friends/sql.php:201 lib/Friends/letter.php:88
+#: templates/user/actions.php:21 templates/edit/tabs.php:34 edit/tabs.php:24
+#: edit/friends/blacklist.php:18
 msgid "Blacklist"
 msgstr "Črna lista"
 
-#: report.php:34
+#: edit/friends/invite.php:33
+msgid "Body"
+msgstr "Telo sporočila"
+
+#: report.php:34 edit/friends/groups.php:55 edit/friends/groups.php:61
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -235,14 +254,14 @@ msgstr "Rak"
 
 #: scripts/mail-filter.php:120
 msgid "Cannot authenticate at mail server:"
-msgstr ""
+msgstr "Ne morem se prijaviti na strežnik"
 
 #: account/resetpassword.php:19
 msgid "Cannot reset password automatically, contact your administrator."
 msgstr ""
 "Ne da se avtomatično ponastaviti gesla, kontaktirajte podporo uporabnikom."
 
-#: lib/Folks.php:272
+#: lib/Folks.php:274
 msgid "Cannot retrieve user email."
 msgstr "Ne morem prebrati email uporabnika."
 
@@ -282,9 +301,9 @@ msgstr "Zapri"
 #: lib/api.php:154
 #, php-format
 msgid "Commented user %s."
-msgstr "Komentarji uporabnika %s."
+msgstr "Komentarji uporanika %s"
 
-#: edit/tabs.php:31 edit/comments.php:18
+#: edit/tabs.php:32 edit/comments.php:18
 msgid "Comments"
 msgstr "Komentarji"
 
@@ -339,8 +358,7 @@ msgstr "Država"
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: templates/friends/friends.php:17 templates/friends/friends.php:44
-#: templates/edit/activity.php:17
+#: templates/friends/friends.php:12 templates/edit/activity.php:17
 msgid "Date"
 msgstr "Datum"
 
@@ -351,8 +369,11 @@ msgid ""
 "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 ""
+"Pozdravljeni %s, poskušali smo vam poslati sporočilo. Vendar neuspešno."
+"Prosimo, da ažurirate vaše nastavitve epoštnega naslova na %s."
 
-#: templates/list/search.php:14 templates/edit/activity.php:31
+#: templates/list/search.php:14 templates/edit/groups.php:27
+#: templates/edit/activity.php:31
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -375,7 +396,11 @@ msgstr "Opis"
 
 #: edit/personal.php:28
 msgid "Display 24-hour times?"
-msgstr "Prikaži čas v 24 urni obliki?"
+msgstr "Prikažem datum v 24 urni obliki?"
+
+#: templates/edit/groups.php:27
+msgid "Do you really want to delete this group?"
+msgstr "Resnično želite izbrisati skupino?"
 
 #: report.php:30
 msgid "Do you really want to report this user?"
@@ -389,13 +414,18 @@ msgstr "Ni pomembno"
 msgid "Don't have an account? Sign up."
 msgstr "Nimate še uporabniškega računa? Prijavite se!"
 
-#: templates/friends/friends.php:37
-msgid "Edit activities"
-msgstr "Uredi aktivnosti"
+#: perms.php:219
+msgid "Edit Permissions"
+msgstr "Uredni pravice"
 
-#: templates/friends/friends.php:11
+#: perms.php:221
+#, php-format
+msgid "Edit Permissions for %s"
+msgstr "Uredi pravice za %s"
+
+#: templates/friends/friends.php:6
 msgid "Edit friends"
-msgstr "Uredi prijatelje"
+msgstr "Urejanje prijateljev"
 
 #: templates/user/user.php:149
 msgid "Edit my firends"
@@ -405,7 +435,11 @@ msgstr "Urejanje prijateljev"
 msgid "Edit my profile"
 msgstr "Urejanje profila"
 
-#: lib/Folks.php:289
+#: edit/personal.php:18
+msgid "Edit personal information"
+msgstr "Uredite osebne podatke"
+
+#: lib/Folks.php:291
 msgid "Edit profile"
 msgstr "Uredi profil"
 
@@ -415,7 +449,11 @@ msgstr "Email"
 
 #: scripts/mail-filter.php:175
 msgid "Email problem"
-msgstr "Napaka v email naslovu"
+msgstr "Napaka v email sporočilu"
+
+#: edit/friends/groups.php:87
+msgid "Enter custom name"
+msgstr "Svoje ime"
 
 #: lib/Forms/Login.php:23
 #, php-format
@@ -455,9 +493,18 @@ msgstr "Posreduj"
 msgid "Friend"
 msgstr "Prijatelj"
 
-#: 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:22
+#: edit/friends/invite.php:52
+#, php-format
+msgid "Friend \"%s\" was invited to join %s."
+msgstr "Uporabnik \"%s\" je bil povabljen da obišče %s"
+
+#: edit/friends/invite.php:28
+msgid "Friend's e-mail"
+msgstr "Perijateljev e-mail"
+
+#: friends.php:21 templates/user/user.php:152 templates/edit/tabs.php:1
+#: edit/tabs.php:25 edit/friends/index.php:17 edit/friends/friends.php:18
+#: lib/Folks.php:290 lib/Block/friends.php:3 lib/Block/friends.php:22
 msgid "Friends"
 msgstr "Prijatelji"
 
@@ -465,9 +512,13 @@ msgstr "Prijatelji"
 msgid "Friends Birthdays"
 msgstr "Rojstni dnevi prijateljev"
 
-#: templates/friends/friends.php:12
+#: templates/friends/friends.php:7
 msgid "Friends activities"
-msgstr "Aktivnosti prijateljev"
+msgstr "Aktivnisti prijateljev"
+
+#: edit/friends/from.php:17
+msgid "Friends we are waiting approval from"
+msgstr "Uporabniki na katere čakamo da nas potrdijo"
 
 #: lib/Folks.php:147 lib/Folks.php:151
 msgid "Gemini"
@@ -478,6 +529,34 @@ msgstr "Dvojčka"
 msgid "Gender"
 msgstr "Spol"
 
+#: templates/edit/groups.php:12 lib/Forms/AddFriend.php:29
+msgid "Group"
+msgstr "Skupina"
+
+#: edit/friends/groups.php:41
+#, php-format
+msgid "Group \"%s\" has been deleted."
+msgstr "Skupina \"%s\" je bila dodana."
+
+#: edit/friends/groups.php:71
+#, php-format
+msgid "Group \"%s\" has been renamed to \"%s\"."
+msgstr "Skupina \"%s\" je bila preimenovana v \"%s\"."
+
+#: edit/friends/groups.php:62
+#, php-format
+msgid "Group \"%s\" has not been renamed."
+msgstr "Skupina \"%s\" ni bila preimenovana."
+
+#: edit/friends/groups.php:103
+#, php-format
+msgid "Group \"%s\" was success added."
+msgstr "Skupina \"%s\" je bil uspešno dodana."
+
+#: edit/tabs.php:26 edit/friends/groups.php:18
+msgid "Groups"
+msgstr "Skupine"
+
 #: templates/user/user.php:56
 msgid "Has no picture"
 msgstr "Nima slike"
@@ -494,10 +573,22 @@ msgstr "Domača stran"
 msgid "How to preview users"
 msgstr "Kako naj pregledujem uporabnike"
 
+#: templates/edit/tabs.php:33
+msgid "I am friend of"
+msgstr "Mi smo prijatelji od"
+
 #: templates/user/user.php:139
 msgid "I don't have it"
 msgstr "Je nimam"
 
+#: templates/edit/tabs.php:25
+msgid "Invite"
+msgstr "Povabite prijatelja"
+
+#: edit/friends/invite.php:18
+msgid "Invite friend"
+msgstr "Povabite prijatelja"
+
 #: lib/Forms/Search.php:26
 msgid "Is online"
 msgstr "Je online"
@@ -526,17 +617,17 @@ msgstr "Tehtnica"
 msgid "Limit"
 msgstr "Omeji"
 
-#: list.php:17 templates/list/list.php:10 lib/Folks.php:292
+#: list.php:17 templates/list/list.php:10 lib/Folks.php:294
 msgid "List"
 msgstr "Spisek"
 
 #: config/prefs.php.dist:99
 msgid "Log account changes?"
-msgstr "Beležim aktivnost sprememb profila?"
+msgstr "Beležim spremembe profila?"
 
 #: config/prefs.php.dist:89
 msgid "Log when we comment a user?"
-msgstr "Beležim aktivnost novih komentarjev?"
+msgstr "Beležim nove komentarje?"
 
 #: scripts/mail.php:92
 #, php-format
@@ -578,6 +669,10 @@ msgstr ""
 msgid "Mast have"
 msgstr "Mora imeti"
 
+#: templates/edit/groups.php:24
+msgid "Members"
+msgstr "Člani"
+
 #: edit/comments.php:30
 msgid "Moderate comments - I will approve every single comment"
 msgstr "Moderiranje komentarjev - potrdil bom vsak komentar"
@@ -594,7 +689,7 @@ msgstr "Najbolj aktvni uporabniki"
 msgid "Most popular users"
 msgstr "Najbolj priljubljeni uporabniki"
 
-#: lib/Folks.php:287
+#: lib/Folks.php:289
 msgid "My profile"
 msgstr "Moj profil"
 
@@ -602,17 +697,22 @@ msgstr "Moj profil"
 msgid "My queries"
 msgstr "Moja iskanja"
 
-#: save_search.php:49 lib/Forms/Search.php:20
+#: save_search.php:49 edit/friends/groups.php:86 edit/friends/groups.php:87
+#: lib/Forms/Search.php:20
 msgid "Name"
 msgstr "Ime"
 
 #: new.php:17 templates/list/list.php:4
 msgid "New"
-msgstr "Novo"
+msgstr "Nov"
+
+#: edit/friends/groups.php:58
+msgid "New name"
+msgstr "Novoa ime"
 
 #: templates/list/list.php:4
 msgid "New registered user"
-msgstr "Nov registriran uporabnik"
+msgstr "Novo prijavljeni"
 
 #: lib/Block/new.php:3 lib/Block/new.php:22
 msgid "New users"
@@ -629,6 +729,10 @@ msgstr "Ne"
 msgid "No one"
 msgstr "Nihče"
 
+#: templates/edit/friends.php:8
+msgid "No user listed"
+msgstr "Ni uporabnikov..."
+
 #: templates/list/list.php:16
 msgid "No users found under selected criteria"
 msgstr "Ni uporabnikov pod izbranimi kriteriji"
@@ -643,7 +747,7 @@ msgstr "Obvesti prijatelje, da sem se prijavil"
 
 #: edit/privacy.php:49
 msgid "Notify online friends that I logged in"
-msgstr "Obvesti prijavljene prijatelje, da sem se prijavil"
+msgstr "Obvesti prijatelje, da sem se prijavil"
 
 #: lib/Block/my_comments.php:19
 msgid "Number of comments to display"
@@ -657,19 +761,21 @@ msgstr "Å tevilo uporabnikov na vsaki strani"
 msgid "Offensive content"
 msgstr "Neprimerna ali žaljiva vsebina"
 
-#: templates/user/user.php:77 lib/Block/friends.php:37
+#: templates/user/user.php:77 templates/edit/friends.php:32
+#: lib/Block/friends.php:37
 msgid "Offline"
 msgstr "Offline"
 
+#: edit/friends/groups.php:56
+msgid "Old name"
+msgstr "Staro ime"
+
 #: online.php:17 templates/user/user.php:75 templates/list/list.php:3
-#: lib/Block/random.php:38 lib/Block/friends.php:36
+#: templates/edit/friends.php:30 lib/Block/random.php:38
+#: lib/Block/friends.php:36
 msgid "Online"
 msgstr "Online"
 
-#: templates/friends/friends.php:68
-msgid "Online friends"
-msgstr "Prijatelji online"
-
 #: edit/privacy.php:34
 msgid "Only authenticated users"
 msgstr "Samo overjeni uporabniki"
@@ -682,6 +788,12 @@ msgstr "Samo prijavljeni uporabniki lahko vpisujejo komentarje."
 msgid "Only my friedns"
 msgstr "Samo moji prijatelji"
 
+#: perms.php:54
+msgid ""
+"Only the owner or system administrator may change ownership or owner "
+"permissions for a share"
+msgstr "Samo lastniki ali administratorji lahko spreminjajo lastništvo skupine"
+
 #: 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
@@ -689,7 +801,11 @@ msgstr "Samo moji prijatelji"
 msgid "Others user content"
 msgstr "Ostala uporabniška vsebina"
 
-#: edit/tabs.php:27 lib/Forms/Login.php:26
+#: templates/edit/groups.php:13
+msgid "Owner"
+msgstr "Lastnik"
+
+#: edit/tabs.php:28 lib/Forms/Login.php:26
 msgid "Password"
 msgstr "Geslo"
 
@@ -697,6 +813,10 @@ msgstr "Geslo"
 msgid "Password changed."
 msgstr "Geslo je bilo spremenjeno."
 
+#: templates/edit/groups.php:28
+msgid "Permissions"
+msgstr "Pravice"
+
 #: templates/list/list.php:36 edit/edit.php:51 lib/Forms/Search.php:25
 msgid "Picture"
 msgstr "Slika"
@@ -719,7 +839,7 @@ msgstr "Priljubljenost"
 
 #: lib/Forms/Activity.php:25
 msgid "Post"
-msgstr "Objavi"
+msgstr "Oddaj"
 
 #: templates/user/user.php:176 templates/user/user.php:201
 #: templates/user/user.php:226 templates/user/user.php:253
@@ -757,18 +877,23 @@ msgstr "Naključni uporabniki"
 msgid "Recent visitors"
 msgstr "Zadnji obiskovalci"
 
-#: templates/edit/friends.php:55
-msgid "Reject"
-msgstr "Zavni"
-
 #: lib/Forms/Login.php:28
 msgid "Remember login?"
 msgstr "Si zapomnim prijavo?"
 
-#: templates/edit/blacklist.php:20 templates/edit/friends.php:21
+#: templates/edit/friends.php:41
 msgid "Remove"
 msgstr "Odstrani"
 
+#: templates/edit/groups.php:26 edit/friends/groups.php:55
+#: edit/friends/groups.php:65
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: edit/friends/groups.php:52
+msgid "Rename group"
+msgstr "Preimenuj skupino"
+
 #: account/renew.php:15
 msgid "Renew account"
 msgstr "Obnovi uporabniški račun."
@@ -802,7 +927,7 @@ msgid ""
 "Require my confirmation if someone would like to add me to his freidn list."
 msgstr "Zahtevaj mojo potrditev, če me kdo želi dodati kot prijatelja."
 
-#: edit/password.php:190
+#: edit/password.php:190 edit/friends/groups.php:55
 msgid "Reset"
 msgstr "Ponastavi"
 
@@ -826,7 +951,7 @@ msgstr "Shrani rezultate iskanja"
 msgid "Scorpio"
 msgstr "Å korpijon"
 
-#: search.php:18 lib/Folks.php:291 lib/Forms/Search.php:27
+#: search.php:18 lib/Folks.php:293 lib/Forms/Search.php:27
 msgid "Search"
 msgstr "Najdi"
 
@@ -858,7 +983,7 @@ msgstr "Zaščitno vprašanje, ki ga bomo uporabili pri ponastavljanju gesla"
 msgid "Send me my username"
 msgstr "Pošlji mi moje uporabniško ime"
 
-#: templates/user/actions.php:7 templates/edit/friends.php:24
+#: templates/user/actions.php:7 templates/edit/friends.php:46
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
@@ -870,7 +995,7 @@ msgstr "Pošlji osebno sporočilo"
 msgid "Send this profile to a friend"
 msgstr "Obvesti prijatelja za ta profil"
 
-#: lib/Folks.php:290
+#: lib/Folks.php:292
 msgid "Services"
 msgstr "Servisi"
 
@@ -880,7 +1005,7 @@ msgstr "Uredi uporabniške nastavitve"
 
 #: config/prefs.php.dist:31
 msgid "Set activity preferences"
-msgstr "Nastavitve preferences"
+msgstr "Nastavitve aktivnosti"
 
 #: config/prefs.php.dist:17
 msgid "Set users preview paramaters"
@@ -942,10 +1067,15 @@ msgstr "Ste po uporabniškem imenu"
 msgid "Sort by Video"
 msgstr "Razvrsti po posnetkih"
 
-#: templates/user/user.php:71 edit/privacy.php:40
+#: templates/user/user.php:71 templates/edit/friends.php:17
+#: edit/privacy.php:40
 msgid "Status"
 msgstr "Status"
 
+#: edit/friends/invite.php:30
+msgid "Subject"
+msgstr "Naslov"
+
 #: account/signup.php:44
 #, php-format
 msgid ""
@@ -971,14 +1101,6 @@ msgstr ""
 "Koda ni pravilna. Morda ste jo narobe prenesli iz elektronskega sporočila, "
 "ki ste ga dobili na vaš email. Preglejte, da ste skopirali kodo v celoti."
 
-#: templates/edit/blacklist.php:4
-msgid "There are no users in your blacklist."
-msgstr "V vaši črni listi ni nikogar."
-
-#: templates/edit/friends.php:4
-msgid "There are no users listed as your friend."
-msgstr "Nimate nobenega uporabnika kot prijatelja."
-
 #: config/hooks.php.dist:312
 msgid "There is already an user registered with this email"
 msgstr "Že obstaja uporabnik, ki koristi ta email naslov"
@@ -989,7 +1111,7 @@ 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."
+msgstr "Ni aktinvsoti s strani tega uporabnika."
 
 #: account/signup.php:50 account/signup.php:52
 #, php-format
@@ -1016,17 +1138,25 @@ msgstr ""
 msgid "Title"
 msgstr "Naslov"
 
-#: lib/Report.php:122
+#: lib/Report.php:122 lib/Friends/application.php:25
+#: lib/Friends/application.php:40 lib/Friends/application.php:55
+#: lib/Friends/application.php:70 lib/Friends/application.php:85
+#: lib/Friends/application.php:100
 msgid "Unsupported"
 msgstr "Ni podprto"
 
+#: perms.php:211
+#, php-format
+msgid "Updated \"%s\"."
+msgstr "Ažurirana \"%s\"."
+
 #: edit/edit.php:68
 msgid "Updated his/her profile details."
-msgstr "Je ažuriral svoje podatke."
+msgstr "Je ažuriral svoj profil."
 
 #: edit/edit.php:70
 msgid "Updated his/her profile picture."
-msgstr "Je naložil novo sliko."
+msgstr "Je spremenil sliko v svojem profilu"
 
 #: edit/edit.php:45
 msgid "Upload a new video"
@@ -1041,22 +1171,22 @@ msgstr ""
 msgid "User"
 msgstr "Uporabnik"
 
-#: lib/Driver.php:378 lib/Driver/sql.php:308
+#: lib/Driver.php:381 lib/Driver/sql.php:308
 #, php-format
 msgid "User \"%s\" does not exists."
 msgstr "Uporabnik \"%s\" ne obstaja."
 
-#: lib/Friends.php:197 lib/Friends.php:266
+#: lib/Friends.php:214 lib/Friends.php:283
 #, php-format
 msgid "User \"%s\" does not exits"
 msgstr "Uporabnik \"%s\" ne obstaja"
 
-#: lib/Friends.php:274
+#: lib/Friends.php:291
 #, php-format
 msgid "User \"%s\" is already in fiend list"
 msgstr "Uporabnik \"%s\" je že v vašem spisku prijateljev."
 
-#: lib/Friends.php:282
+#: lib/Friends.php:299
 #, php-format
 msgid ""
 "User \"%s\" is already in fiend list, but we are waiting his/her approval."
@@ -1068,12 +1198,12 @@ msgstr ""
 msgid "User \"%s\" is not market to be in the removal process."
 msgstr "Uporabnik \"%s\" ni v postopku izbrisa."
 
-#: edit/friends.php:60
+#: edit/friends/add.php:55 edit/friends/friends.php:59
 #, php-format
 msgid "User \"%s\" was added as your friend."
 msgstr "Uporabnik \"%s\" je sedaj vaš prijatelj."
 
-#: edit/blacklist.php:43
+#: edit/friends/blacklist.php:44
 #, php-format
 msgid "User \"%s\" was added to your blacklist."
 msgstr "Uporabnik \"%s\" je sedaj v vaši črni listi."
@@ -1083,27 +1213,27 @@ msgstr "Uporabnik \"%s\" je sedaj v vaši črni listi."
 msgid "User \"%s\" was already activated."
 msgstr "Uporabnik \"%s\" je že potrjen."
 
-#: edit/approve.php:38
+#: edit/friends/approve.php:37
 #, php-format
 msgid "User \"%s\" was confirmed as a friend."
 msgstr "Uporabnik \"%s\" je potrjen kot vaš prijatelj."
 
-#: edit/reject.php:37
+#: edit/friends/reject.php:36
 #, php-format
 msgid "User \"%s\" was rejected as a friend."
 msgstr "Uporabnik \"%s\" je zavrnjen kot vaš prijatelj."
 
-#: edit/blacklist.php:36
+#: edit/friends/blacklist.php:35
 #, php-format
 msgid "User \"%s\" was removed from your blacklist."
 msgstr "Uporabnik \"%s\" je odstranjen z vaše črne liste."
 
-#: edit/friends.php:41
+#: edit/friends/add.php:32 edit/friends/friends.php:40
 #, php-format
 msgid "User \"%s\" was removed from your friend list."
 msgstr "Uporabnik \"%s\" je  odstranjen z vašega spiska prijateljev."
 
-#: edit/friends.php:52
+#: edit/friends/add.php:45 edit/friends/friends.php:51
 #, php-format
 msgid ""
 "User %s added you to his firends list on %s. \n"
@@ -1116,7 +1246,7 @@ msgstr ""
 "Klik za zavrnitev: %s \n"
 "Prikaz njegovega profila: %s \n"
 
-#: edit/approve.php:44
+#: edit/friends/approve.php:43
 #, php-format
 msgid ""
 "User %s confirmed you as a friend on %s.. \n"
@@ -1149,7 +1279,7 @@ msgstr ""
 "Uporabnik %s se je pravkar prijavil.\n"
 "%s"
 
-#: edit/reject.php:43
+#: edit/friends/reject.php:42
 #, php-format
 msgid ""
 "User %s rejected you as a friend on %s.. \n"
@@ -1202,10 +1332,9 @@ msgstr "Uporabnik ni bil prijavljen."
 msgid "User was reported."
 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:19
-#: lib/Forms/Login.php:22 config/prefs.php.dist:40
+#: templates/friends/friends.php:11 templates/list/list.php:24
+#: templates/edit/friends.php:16 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"
 
@@ -1230,19 +1359,15 @@ msgstr "Uporabniki, ki danes praznujejo rojstni dan"
 msgid "Users currently online"
 msgstr "Uporabniki trenutno na strani."
 
-#: templates/edit/friends.php:61
-msgid "Users that has you listed as a friend"
-msgstr "Uporabniki, ki me imajo za prijatelja"
-
-#: templates/edit/friends.php:48
-msgid "Users winting us to approve their friendship"
-msgstr "Uporabniki, ki čakajo potrditev."
+#: edit/friends/for.php:17
+msgid "Users waiting our approval"
+msgstr "Uporabniki ki čakajo na našo potrditev"
 
 #: templates/list/list.php:40 edit/edit.php:46 lib/Forms/Search.php:25
 msgid "Video"
 msgstr "Video"
 
-#: templates/edit/friends.php:22
+#: templates/edit/friends.php:37
 msgid "View profile"
 msgstr "Preglej profil"
 
@@ -1254,17 +1379,25 @@ msgstr "Devica"
 msgid "Visit my homepage"
 msgstr "Obišči mojo domačo stran"
 
-#: templates/edit/friends.php:39
-msgid "We are waiting this users to approve our friendship"
-msgstr "Uporabniki, na katere čakamo, da nas potrdijo kot prijatelja."
+#: templates/edit/tabs.php:31
+msgid "Wainting for"
+msgstr "Čakajo na nas"
+
+#: templates/edit/tabs.php:32
+msgid "Wainting from"
+msgstr "Čakamo na"
+
+#: edit/friends/of.php:17
+msgid "We are friends of"
+msgstr "Mi smo prijatelji od"
 
 #: user.php:48 friends.php:25 edit/activity.php:34
 msgid "What are you doing right now?"
-msgstr "Kaj ravnokar počneš?"
+msgstr "Kaj delate trenutno?"
 
-#: lib/Friends/sql.php:200 lib/Friends/letter.php:87
+#: lib/Friends/prefs.php:164 lib/Friends/sql.php:192
 msgid "Whitelist"
-msgstr "Želje"
+msgstr "Prijatelji"
 
 #: edit/comments.php:38
 msgid "Who can post comments to your profile"
@@ -1272,11 +1405,11 @@ msgstr "Kdo lahko kometira vaš profil"
 
 #: edit/privacy.php:46
 msgid "Who can see my acticity log on my profile"
-msgstr "Kdo lahko vidi aktivnost vašega profila"
+msgstr "Kdo lahko pregleduje moje aktivnosti?"
 
 #: edit/privacy.php:43
 msgid "Who can see when I was last time online"
-msgstr "Kdo lahko vidi kdaj sem bil zadnjič online"
+msgstr "Kdo lahko pregleduje kdaj sem bil zadnjič online"
 
 #: lib/Forms/Search.php:19
 msgid "Word"
@@ -1297,6 +1430,11 @@ msgstr "Da, želim ostati prijavljen tudi ob naslednjem obisku."
 msgid "You account is activated, you can login now."
 msgstr "Vaše uporabniško ime je bilo potrjeno. Sedaj se lahko prijavite."
 
+#: lib/Friends/shared.php:163
+#, php-format
+msgid "You already have a group named \"%s\"."
+msgstr "Že imate skupino poimenovano  \"%s\"."
+
 #: login.php:135
 msgid "You are entering your data too fast!"
 msgstr "Prehitro vnašate podatke!"
@@ -1311,47 +1449,43 @@ 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:202
+#: lib/Friends.php:219
 #, php-format
 msgid "You cannot add \"%s\" to your blacklist."
 msgstr "Ne morete dodati \"%s\" na črno listo."
 
-#: lib/Friends.php:260
+#: lib/Friends.php:277
 msgid "You cannot add yourself as your own friend."
 msgstr "Sami sebe ne morete dodati kot prijatelja."
 
-#: lib/Friends.php:191
+#: lib/Friends.php:208
 msgid "You cannot add yourself to your blacklist."
 msgstr "Samega sebe ne morete dodati na črno listo."
 
 #: lib/api.php:381
 msgid "You cannot log activities for other users."
-msgstr "Ne moreš shranjevati aktivnosti drugih uporabnikov."
+msgstr "Ne morete beležiti aktivnosti za druge uporabnike."
 
-#: lib/Driver.php:750 lib/Forms/Activity.php:33
+#: lib/Driver.php:753 lib/Forms/Activity.php:33
 msgid "You cannot post an empty activity message."
-msgstr "Ne moreš zapisati praznega sporočila o aktivnosti."
+msgstr "Ne morete javiti prazne aktivnosti"
 
 #: account/approve.php:20 account/renew.php:20
 msgid "You must supply a confirmation code."
 msgstr "Podati morate kodo za potrditev računa."
 
-#: account/approve.php:28 account/renew.php:28 edit/approve.php:24
-#: edit/reject.php:24
+#: account/approve.php:28 account/renew.php:28 edit/friends/approve.php:23
+#: edit/friends/reject.php:23
 msgid "You must supply a username."
 msgstr "Podati morate uporabiško ime."
 
-#: templates/friends/friends.php:38
-msgid "Your activities"
-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 ""
+msgstr "Vaš trenutni časovni pas:"
 
 #: edit/edit.php:66 edit/privacy.php:65
 msgid "Your data were successfully updated."
@@ -1363,7 +1497,7 @@ msgstr "Vaš email"
 
 #: edit/personal.php:22
 msgid "Your full name:"
-msgstr ""
+msgstr "Vaše ime:"
 
 #: edit/edit.php:82
 msgid "Your image was deleted successfully."
diff --git a/folks/templates/edit/tabs.php b/folks/templates/edit/tabs.php
index 3af326a2e..b471414e1 100644
--- a/folks/templates/edit/tabs.php
+++ b/folks/templates/edit/tabs.php
@@ -20,6 +20,7 @@ if ($groups instanceof PEAR_Error) {
 $vars = Variables::getDefaultVariables();
 $ftabs = new Horde_UI_Tabs('ftab', $vars);
 
+$ftabs->addTab(_("Add"), Horde::applicationUrl('edit/friends/add.php'), 'add');
 $ftabs->addTab(_("All"), Horde::applicationUrl('edit/friends/index.php'), 'all');
 $ftabs->addTab(_("Invite"), Horde::applicationUrl('edit/friends/invite.php'), 'invite');
 
@@ -30,6 +31,6 @@ foreach ($groups as $group_id => $group_name) {
 $ftabs->addTab(_("Wainting for"), Horde::applicationUrl('edit/friends/for.php'), 'for');
 $ftabs->addTab(_("Wainting from"), Horde::applicationUrl('edit/friends/from.php'), 'from');
 $ftabs->addTab(_("I am friend of"), Horde::applicationUrl('edit/friends/of.php'), 'of');
+$ftabs->addTab(_("Blacklist"), Horde::applicationUrl('edit/friends/blacklist.php'), 'blacklist');
 
 echo $ftabs->render();
-
diff --git a/folks/templates/user/user.php b/folks/templates/user/user.php
index 378205d30..ba0720234 100644
--- a/folks/templates/user/user.php
+++ b/folks/templates/user/user.php
@@ -402,7 +402,7 @@ case 'never':
 case 'authenticated':
     $allow_comments = Auth::isAuthenticated();
     if ($allow_comments) {
-        if ($folks_driver->isBlacklisted($user,  Auth::getAuth())) {
+        if ($folks_driver->isBlacklisted($user, Auth::getAuth())) {
             $allow_comments = false;
             $comments_reason = sprintf(_("You are on %s blacklist."), $user);
         }
@@ -445,4 +445,4 @@ if ($allow_comments) {
     }
 } else {
     echo $comments_reason;
-}
\ No newline at end of file
+}
-- 
2.11.0