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/subscriptions_option/localization/cs_CZ.inc | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/plugins/subscriptions_option/localization/cs_CZ.inc b/plugins/subscriptions_option/localization/cs_CZ.inc index 0d9c1fc..052255f 100644 --- a/plugins/subscriptions_option/localization/cs_CZ.inc +++ b/plugins/subscriptions_option/localization/cs_CZ.inc @@ -1,20 +1,19 @@ <?php /* + +-----------------------------------------------------------------------+ + | plugins/subscriptions_option/localization/<lang>.inc | + | | + | Localization file of the Roundcube Webmail Subscriptions 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. | + | | + +-----------------------------------------------------------------------+ -+-----------------------------------------------------------------------+ -| language/cs_CZ/labels.inc | -| | -| Language file of the Roundcube subscriptions option plugin | -| Copyright (C) 2005-2009, The Roundcube Dev Team | -| Licensed under the GNU GPL | -| | -+-----------------------------------------------------------------------+ -| Author: Milan Kozak <hodza@hodza.net> | -+-----------------------------------------------------------------------+ - -@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $ - + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/ */ $labels = array(); -- Gitblit v1.9.1