From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 plugins/password/localization/sl_SI.inc |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/password/localization/sl_SI.inc b/plugins/password/localization/sl_SI.inc
index df17583..27a0942 100644
--- a/plugins/password/localization/sl_SI.inc
+++ b/plugins/password/localization/sl_SI.inc
@@ -1,11 +1,27 @@
 <?php
-	
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
+*/
+
 $labels = array();
 $labels['changepasswd']  = 'Spremeni geslo';
 $labels['curpasswd']  = 'Obstoječe geslo:';
 $labels['newpasswd']  = 'Novo geslo:';
 $labels['confpasswd']  = 'Potrdi novo geslo:';
-	
+
 $messages = array();
 $messages['nopassword'] = 'Vnesite novo geslo.';
 $messages['nocurpassword'] = 'Vnesite obstoječe geslo.';
@@ -14,5 +30,8 @@
 $messages['crypterror'] = 'Novega gesla ni bilo mogoče shraniti. Prišlo je do napake pri šifriranju.';
 $messages['connecterror'] = 'Novega gesla ni bilo mogoče shraniti. Prišlo je do napake v povezavi.';
 $messages['internalerror'] = 'Novega gesla ni bilo mogoče shraniti.';
+$messages['passwordshort'] = 'Geslo mora vsebovati vsaj $length znakov';
+$messages['passwordweak'] = 'Geslo mora vključevati vsaj eno številko in ločilo.';
+$messages['passwordforbidden'] = 'Geslo vsebuje neveljavne znake.';
 
 ?>

--
Gitblit v1.9.1