commit roundcubemail for openSUSE:Factory

12 Nov 2012

Hello community,

here is the log from the commit of package roundcubemail for openSUSE:Factory checked in at 2012-11-12 07:05:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old)
 and      /work/SRC/openSUSE:Factory/.roundcubemail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "roundcubemail", Maintainer is ""

Changes:
--------

--- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes	2012-11-02 17:31:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.roundcubemail.new/roundcubemail.changes	2012-11-12 07:05:59.000000000 +0100
@@ -1,0 +2,9 @@
+Sat Nov 10 21:12:16 UTC 2012 - wr@rosenauer.org
+
+- Update to version 0.8.3
+  * This update adds small bug fixes and improvements to the 0.8
+    stable series. It also fixes a possible, although unintended,
+    DoS to the webserver running Roundcube. See the included
+    CHANGELOG file for details.
+
+-------------------------------------------------------------------

Old:
----
  roundcubemail-0.8.2.tar.gz

New:
----
  roundcubemail-0.8.3.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ roundcubemail.spec ++++++
--- /var/tmp/diff_new_pack.spZQdP/_old	2012-11-12 07:06:01.000000000 +0100
+++ /var/tmp/diff_new_pack.spZQdP/_new	2012-11-12 07:06:01.000000000 +0100
@@ -21,7 +21,7 @@
 License:        GPL-3.0+ and GPL-2.0 and BSD-3-Clause
 Group:          Productivity/Networking/Email/Clients
 Url:            http://www.roundcube.net/
-Version:        0.8.2
+Version:        0.8.3
 Release:        0
 BuildRequires:  apache2-devel
 BuildRequires:  fdupes

++++++ roundcubemail-0.8.2.tar.gz -> roundcubemail-0.8.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/CHANGELOG new/roundcubemail-0.8.3/CHANGELOG
--- old/roundcubemail-0.8.2/CHANGELOG	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/CHANGELOG	2012-11-10 15:15:21.000000000 +0100
@@ -1,6 +1,21 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+RELEASE 0.8.3
+-------------
+- Fix AREA links handling (#1488792)
+- Fix possible HTTP DoS on error in keep-alive requests (#1488782)
+- Fix compatybility with MDB2 2.5.0b4 (#1488779)
+- Fix a bug where saving a message in INBOX wasn't possible
+- Fix HTML part detection in messages with attachments (#1488769)
+- Fix bug where wrong words were highlighted on spell-before-send check
+- Fix scrolling quirk in email preview frame using Opera 12 (#1488763)
+- Fix displaying of multipart/alternative messages with empty parts (#1488750)
+- Fix Warning: htmlspecialchars(): charset `RCMAIL_CHARSET' not supported warning in Installer (#1488744)
+- Fix threaded list sorting on PHP < 5.2.9 (#1488748)
+
+RELEASE 0.8.2
+-------------
 - Fix XSS vulnerability from HTTP User-Agent header (#1488737)
 - Force fonts in compose fields to be all the same (#1488690)
 - Add full headers view in message preview window (#1488538)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/index.php new/roundcubemail-0.8.3/index.php
--- old/roundcubemail-0.8.2/index.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/index.php	2012-11-10 15:15:21.000000000 +0100
@@ -2,7 +2,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 0.8.2                                                           |
+ | Version 0.8.3                                                           |
  |                                                                         |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                         |
  |                                                                         |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/installer/index.php new/roundcubemail-0.8.3/installer/index.php
--- old/roundcubemail-0.8.2/installer/index.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/installer/index.php	2012-11-10 15:15:21.000000000 +0100
@@ -44,6 +44,7 @@
 
 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
 define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+define('RCMAIL_CHARSET', 'UTF-8');
 
 $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
 $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/installer/rcube_install.php new/roundcubemail-0.8.3/installer/rcube_install.php
--- old/roundcubemail-0.8.2/installer/rcube_install.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/installer/rcube_install.php	2012-11-10 15:15:21.000000000 +0100
@@ -524,7 +524,7 @@
         '0.5-beta', '0.5', '0.5.1',
         '0.6-beta', '0.6',
         '0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3',
-        '0.8-beta', '0.8-rc', '0.8.0', '0.8.1',
+        '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2',
     ));
     return $select;
   }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/Changelog new/roundcubemail-0.8.3/plugins/managesieve/Changelog
--- old/roundcubemail-0.8.2/plugins/managesieve/Changelog	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/Changelog	2012-11-10 15:15:21.000000000 +0100
@@ -1,3 +1,4 @@
+- Fixed filter activation/deactivation confirmation message (#1488765)
 - Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)
 
 * version 5.2 [2012-07-24]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/bs_BA.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/bs_BA.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/bs_BA.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/bs_BA.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Set filtera je uspješno kreiran.';
 $labels['activateerror'] = 'Nije moguće omogućiti označene filtere. Desila se serverska greška.';
 $labels['deactivateerror'] = 'Nije moguće onemogućiti označene filtere. Desila se serverska greška.';
-$labels['activated'] = 'Filteri su uspješno onemogućeni.';
-$labels['deactivated'] = 'Filteri su uspješno omogućeni.';
+$labels['deactivated'] = 'Filteri su uspješno onemogućeni.';
+$labels['activated'] = 'Filteri su uspješno omogućeni.';
 $labels['moved'] = 'Filteri su uspješno premješteni.';
 $labels['moveerror'] = 'Nije moguće premjestiti označeni filter. Desila se serverska greška.';
 $labels['nametoolong'] = 'Ime je predugo.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ca_ES.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ca_ES.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/ca_ES.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ca_ES.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'S\'ha creat correctament el conjunt de filtres.';
 $labels['activateerror'] = 'No s\'ha pogut habilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
 $labels['deactivateerror'] = 'No s\'ha pogut deshabilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
-$labels['activated'] = 'Filtre(s) deshabilitat(s) correctament.';
-$labels['deactivated'] = 'Filtre(s) habilitat(s) correctament.';
+$labels['deactivated'] = 'Filtre(s) deshabilitat(s) correctament.';
+$labels['activated'] = 'Filtre(s) habilitat(s) correctament.';
 $labels['moved'] = 'S\'ha mogut correctament el filtre.';
 $labels['moveerror'] = 'No s\'ha pogut moure el filtre seleccionat. Hi ha hagut un error al servidor.';
 $labels['nametoolong'] = 'El nom és massa llarg.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/cs_CZ.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/cs_CZ.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/cs_CZ.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/cs_CZ.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Sada filtrů úspěšně vytvořena.';
 $labels['activateerror'] = 'Nelze zapnout vybrané filtr/y. Došlo k chybě serveru.';
 $labels['deactivateerror'] = 'Nelze vypnout vybrané filtr/y. Došlo k chybě serveru.';
-$labels['activated'] = 'Filtr/y úspěšne vypnuty.';
-$labels['deactivated'] = 'Filtr/y úspěšně zapnuty.';
+$labels['deactivated'] = 'Filtr/y úspěšne vypnuty.';
+$labels['activated'] = 'Filtr/y úspěšně zapnuty.';
 $labels['moved'] = 'Filtr byl úspěšně přesunut.';
 $labels['moveerror'] = 'Nelze přesunout vybraný filtr. Došlo k chybě na serveru.';
 $labels['nametoolong'] = 'Příliš dlouhý název.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/cy_GB.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/cy_GB.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/cy_GB.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/cy_GB.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Crëuwyd y set hidlydd yn llwyddiannus.';
 $labels['activateerror'] = 'Methwyd galluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
 $labels['deactivateerror'] = 'Methwyd analluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
-$labels['activated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.';
-$labels['deactivated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.';
+$labels['deactivated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.';
+$labels['activated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.';
 $labels['moved'] = 'Symudwyd y hidlydd yn llwyddiannus.';
 $labels['moveerror'] = 'Methwyd symud y hidlydd dewiswyd. Cafwyd gwall gweinydd.';
 $labels['nametoolong'] = 'Enw yn rhy hir.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/da_DK.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/da_DK.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/da_DK.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/da_DK.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Filter sæt oprettet.';
 $labels['activateerror'] = 'Kan ikek aktivere valgt filter sæt. Server fejl.';
 $labels['deactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
-$labels['activated'] = 'Filter(filtre) deaktiveret.';
-$labels['deactivated'] = 'Filter(filtre) aktiveret.';
+$labels['deactivated'] = 'Filter(filtre) deaktiveret.';
+$labels['activated'] = 'Filter(filtre) aktiveret.';
 $labels['moved'] = 'Filter flyttet.';
 $labels['moveerror'] = 'Kan ikke flytte valgt filter. Server fejl.';
 $labels['nametoolong'] = 'Navn er for langt.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/de_CH.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/de_CH.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/de_CH.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/de_CH.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Filter erfolgreich erstellt.';
 $labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
 $labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
-$labels['activated'] = 'Filter erfolgreich deaktiviert.';
-$labels['deactivated'] = 'Filter erfolgreich aktiviert.';
+$labels['deactivated'] = 'Filter erfolgreich deaktiviert.';
+$labels['activated'] = 'Filter erfolgreich aktiviert.';
 $labels['moved'] = 'Filter erfolgreich verschoben.';
 $labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
 $labels['nametoolong'] = 'Filtersatz kann nicht erstellt werden. Name zu lang.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/en_US.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/en_US.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/en_US.inc	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/en_US.inc	2012-11-10 15:15:21.000000000 +0100
@@ -136,8 +136,8 @@
 $messages['setcreated'] = 'Filters set created successfully.';
 $messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
 $messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['activated'] = 'Filter(s) disabled successfully.';
-$messages['deactivated'] = 'Filter(s) enabled successfully.';
+$messages['deactivated'] = 'Filter(s) disabled successfully.';
+$messages['activated'] = 'Filter(s) enabled successfully.';
 $messages['moved'] = 'Filter moved successfully.';
 $messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
 $messages['nametoolong'] = 'Name too long.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/es_ES.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/es_ES.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/es_ES.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/es_ES.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Conjunto de filtros creado satisfactoriamente';
 $labels['activateerror'] = 'No se ha podido habilitar el filtro(s) seleccionado. Se ha producido un error de servidor.';
 $labels['deactivateerror'] = 'No se ha podido deshabilitar el filtro(s) seleccionado. Se ha producido un error de servidor.';
-$labels['activated'] = 'Filtro(s) deshabilitado(s) correctamente.';
-$labels['deactivated'] = 'Filtro(s) habilitado(s) correctamente.';
+$labels['deactivated'] = 'Filtro(s) deshabilitado(s) correctamente.';
+$labels['activated'] = 'Filtro(s) habilitado(s) correctamente.';
 $labels['moved'] = 'Filtro movido correctamente';
 $labels['moveerror'] = 'No se ha podido mover el filtro seleccionado. Ha ocurrido un error de servidor.';
 $labels['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/et_EE.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/et_EE.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/et_EE.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/et_EE.inc	2012-11-10 15:15:20.000000000 +0100
@@ -130,8 +130,8 @@
 $labels['ruleexist'] = 'Määratud nimega filter on juba olemas';
 $labels['activateerror'] = 'Valitud filtrite lubamine nurjus. Ilmnes serveri tõrge.';
 $labels['deactivateerror'] = 'Valitud filtrite keelamine nurjus. Ilmnes serveri tõrge.';
-$labels['activated'] = 'Filter edukalt keelatud.';
-$labels['deactivated'] = 'Filter edukalt lubatud.';
+$labels['deactivated'] = 'Filter edukalt keelatud.';
+$labels['activated'] = 'Filter edukalt lubatud.';
 $labels['moved'] = 'Filter edukalt liigutatud.';
 $labels['moveerror'] = 'Valitud filtri liigutamine nurjus. Ilmnes serveri tõrge.';
 $labels['nametoolong'] = 'Nimi on liiga pikk.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/fa_IR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/fa_IR.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/fa_IR.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/fa_IR.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'مجموعه صافی‌ها با موفقیت ایجاد شد.';
 $labels['activateerror'] = 'ناتوانی در فعال کردن صافی(های) انتخاب شده. خطای سرور رخ داد.';
 $labels['deactivateerror'] = 'ناتوانی در غیرفعال کردن صافی(های) انتخاب شده. خطای سرور رخ داد.';
-$labels['activated'] = 'صافی(ها) با موفقیت غیرفعال شدند.';
-$labels['deactivated'] = 'صافی(ها) با موفقیت فعال شدند.';
+$labels['deactivated'] = 'صافی(ها) با موفقیت غیرفعال شدند.';
+$labels['activated'] = 'صافی(ها) با موفقیت فعال شدند.';
 $labels['moved'] = 'صافی با موفقیت منتقل شد.';
 $labels['moveerror'] = 'ناتوانی در انتقال صافی انتخاب شده. خطای سرور رخ داد.';
 $labels['nametoolong'] = 'نام خیلی بلند.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/fi_FI.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/fi_FI.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/fi_FI.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/fi_FI.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Suodatinlistan luonti onnistui.';
 $labels['activateerror'] = 'Suodatinlistan päälle kytkeminen epäonnistui. Palvelin virhe.';
 $labels['deactivateerror'] = 'Suodatinlistan pois päältä kytkeminen epäonnistui. Palvelin virhe.';
-$labels['activated'] = 'Suodatinlista(t) kytketty pois päältä onnistuneesti.';
-$labels['deactivated'] = 'Suodatinlista(t) kytketty päälle onnistuneesti.';
+$labels['deactivated'] = 'Suodatinlista(t) kytketty pois päältä onnistuneesti.';
+$labels['activated'] = 'Suodatinlista(t) kytketty päälle onnistuneesti.';
 $labels['moved'] = 'Suodatin siirretty onnistuneesti.';
 $labels['moveerror'] = 'Valitun suodattimen siirto epäonnistui palvelinvirheen vuoksi.';
 $labels['nametoolong'] = 'Nimi on liian pitkä.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/fr_FR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/fr_FR.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/fr_FR.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/fr_FR.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Le groupe de filtres a bien été créé.';
 $labels['activateerror'] = 'Impossible d\'activer le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.';
 $labels['deactivateerror'] = 'Impossible de désactiver le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.';
-$labels['activated'] = 'Filtre(s) désactivé(s) avec succès';
-$labels['deactivated'] = 'Filtre(s) activé(s) avec succès';
+$labels['deactivated'] = 'Filtre(s) désactivé(s) avec succès';
+$labels['activated'] = 'Filtre(s) activé(s) avec succès';
 $labels['moved'] = 'Filtre déplacé avec succès.';
 $labels['moveerror'] = 'Déplacement du filtre sélectionné impossible. Le serveur a renvoyé une erreur.';
 $labels['nametoolong'] = 'Nom trop long.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/he_IL.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/he_IL.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/he_IL.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/he_IL.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'ערכת המסננים נוצרה בהצלחה.';
 $labels['activateerror'] = 'לא ניתן להפעיל את המסננים הנבחרים. אירעה שגיאה בצד השרת.';
 $labels['deactivateerror'] = 'לא ניתן לנטרל את המסננים הנבחרים. אירעה שגיאה בצד השרת.';
-$labels['activated'] = 'המסננים נוטרלו בהצלחה.';
-$labels['deactivated'] = 'המסננים הופעלו בהצלחה.';
+$labels['deactivated'] = 'המסננים נוטרלו בהצלחה.';
+$labels['activated'] = 'המסננים הופעלו בהצלחה.';
 $labels['moved'] = 'המסנן הועבר בהצלחה.';
 $labels['moveerror'] = 'לא ניתן להעביר את המסנן הנבחר. אירעה שגיאה בצד השרת.';
 $labels['nametoolong'] = 'השם ארוך מדי.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/hr_HR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/hr_HR.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/hr_HR.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/hr_HR.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Grupa filtera je uspješno stvorena';
 $labels['activateerror'] = 'Nije moguće omogućiti odabrani filter(e). Greška poslužitelja.';
 $labels['deactivateerror'] = 'Nije moguće onemogučiti odabrane filter(e). Greška poslužitelja.';
-$labels['activated'] = 'Filter(i) onemogućen(i) uspješno.';
-$labels['deactivated'] = 'Filter(i) omogućen(i) uspješno.';
+$labels['deactivated'] = 'Filter(i) onemogućen(i) uspješno.';
+$labels['activated'] = 'Filter(i) omogućen(i) uspješno.';
 $labels['moved'] = 'Filter uspješno premješten.';
 $labels['moveerror'] = 'Nije moguće premjestiti odabrani filter. Greška poslužitelja.';
 $labels['nametoolong'] = 'Nemoguće napraviti grupu filtera. Naziv je predugačak';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/hu_HU.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/hu_HU.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/hu_HU.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/hu_HU.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'A szűrő készlet sikeresen létrejött.';
 $labels['activateerror'] = 'Nem sikerült engedélyezni a kiválasztott szűrö(k)et. Szerver hiba történt.';
 $labels['deactivateerror'] = 'Nem sikerült kikapcsolni a kiválasztott szűrő(ke)t. Szerver hiba történt.';
-$labels['activated'] = 'Szűrő(k) sikeresen kikapcsolva.';
-$labels['deactivated'] = 'Szűrő(k) sikeresen bekapcsolva.';
+$labels['deactivated'] = 'Szűrő(k) sikeresen kikapcsolva.';
+$labels['activated'] = 'Szűrő(k) sikeresen bekapcsolva.';
 $labels['moved'] = 'A szűrő sikeresen áthelyezve.';
 $labels['moveerror'] = 'Az áthelyezés nem sikerült. Szerver hiba történt.';
 $labels['nametoolong'] = 'Túll hosszu név';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/hy_AM.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/hy_AM.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/hy_AM.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/hy_AM.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Զտիչների համալիրը ստեղծված է։';
 $labels['activateerror'] = 'Սերվերի սխալ։ Նշված զտիչի միացման ձախողում։';
 $labels['deactivateerror'] = 'Սերվերի սխալ։ Նշված զտիչի անջատման ձախողում։';
-$labels['activated'] = 'Զտիչի անջատված է։';
-$labels['deactivated'] = 'Զտիչի միացված է։';
+$labels['deactivated'] = 'Զտիչի անջատված է։';
+$labels['activated'] = 'Զտիչի միացված է։';
 $labels['moved'] = 'Զտիչի տեղափոխված է։';
 $labels['moveerror'] = 'Սերվերի սխալ։ Նշված զտիչի տեղափոխման ձախողում։';
 $labels['nametoolong'] = 'Անունը չափազանց երկար է։';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/id_ID.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/id_ID.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/id_ID.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/id_ID.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Kumpulan penyaringan berhasul dibuat.';
 $labels['activateerror'] = 'Tidak bisa menghidupkan penyaringan terpilih. terjadi galat pada server.';
 $labels['deactivateerror'] = 'Tidak bisa mematikan penyaringan terpilih. Terjadi galat pada server.';
-$labels['activated'] = 'Berhasil mematikan penyaringan.';
-$labels['deactivated'] = 'Berhasil menghidupkan penyaringan.';
+$labels['deactivated'] = 'Berhasil mematikan penyaringan.';
+$labels['activated'] = 'Berhasil menghidupkan penyaringan.';
 $labels['moved'] = 'Berhasil memindahkan penyaringan.';
 $labels['moveerror'] = 'Tidak bisa memindahkan penyaringan terpilih. Terjadi galat pada server.';
 $labels['nametoolong'] = 'Kepanjangan nama.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/it_IT.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/it_IT.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/it_IT.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/it_IT.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Gruppo di filtri creato';
 $labels['activateerror'] = 'impossibile selezionare il filtro (server error)';
 $labels['deactivateerror'] = 'impossibile disabilitare il filtro (server error)';
-$labels['activated'] = 'filtro disabilitato';
-$labels['deactivated'] = 'filtro abilitato';
+$labels['deactivated'] = 'filtro disabilitato';
+$labels['activated'] = 'filtro abilitato';
 $labels['moved'] = 'filtro spostato';
 $labels['moveerror'] = 'impossibile spostare il filtro (server error)';
 $labels['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ja_JP.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ja_JP.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/ja_JP.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ja_JP.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'フィルターセットを作成しました。';
 $labels['activateerror'] = '選択したフィルターを有効にできませんでした。サーバーでエラーが発生しました。';
 $labels['deactivateerror'] = '選択したフィルターを無効にできませんでした。サーバーでエラーが発生しました。';
-$labels['activated'] = 'フィルターを無効にしました。';
-$labels['deactivated'] = 'フィルターを有効にしました。';
+$labels['deactivated'] = 'フィルターを無効にしました。';
+$labels['activated'] = 'フィルターを有効にしました。';
 $labels['moved'] = 'フィルターを移動しました。';
 $labels['moveerror'] = '選択したフィルターを移動できませんでした。サーバーでエラーが発生しました。';
 $labels['nametoolong'] = '名前が長すぎます。';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ko_KR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ko_KR.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/ko_KR.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ko_KR.inc	2012-11-10 15:15:20.000000000 +0100
@@ -120,8 +120,8 @@
 $labels['setcreated'] = '필터 묶음을 성공적으로 생성 함.';
 $labels['activateerror'] = '선택한 필터(들)을 동작하게 할 수 없음. 서버 에러 발생 함.';
 $labels['deactivateerror'] = '선택한 필터(들)을 동작하지 않게 할 수 없음. 서버 에러 발생 함.';
-$labels['activated'] = '필터(들)을 동작하지 않게 하는데 성공하였음.';
-$labels['deactivated'] = '필터(들)을 동작하게 하는데 성공하였음.';
+$labels['deactivated'] = '필터(들)을 동작하지 않게 하는데 성공하였음.';
+$labels['activated'] = '필터(들)을 동작하게 하는데 성공하였음.';
 $labels['moved'] = '필터를 이동하는 데 성공하였음.';
 $labels['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 에러 발생 함.';
 $labels['nametoolong'] = '이름이 너무 김.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ml_IN.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ml_IN.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/ml_IN.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ml_IN.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി നിര്‍മ്മിച്ചു.';
 $labels['activateerror'] = 'അരിപ്പ (കള്‍) പ്രവര്‍ത്തനസജ്ജം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!';
 $labels['deactivateerror'] = 'അരിപ്പ (കള്‍) നിര്‍വീര്യം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!';
-$labels['activated'] = 'അരിപ്പകള്‍ നിര്‍വീര്യം ആക്കപ്പെട്ടിരിക്കുന്നു';
-$labels['deactivated'] = 'അരിപ്പ വിജകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.';
+$labels['deactivated'] = 'അരിപ്പകള്‍ നിര്‍വീര്യം ആക്കപ്പെട്ടിരിക്കുന്നു';
+$labels['activated'] = 'അരിപ്പ വിജകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.';
 $labels['moved'] = 'അരിപ്പ വിജകരമായി മാറ്റി.';
 $labels['moveerror'] = 'തെരഞ്ഞെടുത്ത അരിപ്പ മാറ്റാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
 $labels['nametoolong'] = 'പേരിന് നീളം കൂടുതല്‍.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/nb_NO.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/nb_NO.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/nb_NO.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/nb_NO.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Filtersett opprettet.';
 $labels['activateerror'] = 'Kunne ikke skru på valgte filter. Det oppsto en tjenerfeil.';
 $labels['deactivateerror'] = 'Kunne ikke skru av valgte filter. Det oppsto en tjenerfeil.';
-$labels['activated'] = 'Filter skrudd av.';
-$labels['deactivated'] = 'Filter ble skrudd på.';
+$labels['deactivated'] = 'Filter skrudd av.';
+$labels['activated'] = 'Filter ble skrudd på.';
 $labels['moved'] = 'Filter ble flyttet.';
 $labels['moveerror'] = 'Kunne ikke flytte valgte filter. Det oppsto en tjenerfeil.';
 $labels['nametoolong'] = 'Navnet er for langt.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/nl_NL.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/nl_NL.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/nl_NL.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/nl_NL.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Filterverzameling succesvol aangemaakt.';
 $labels['activateerror'] = 'Geselecteerde filter(s) konden niet ingeschakeld worden. Er trad een serverfout op.';
 $labels['deactivateerror'] = 'Geselecteerde filter(s) konden niet uitgeschakeld worden. Er trad een serverfout op.';
-$labels['activated'] = 'Filter(s) succesvol uitgeschakeld.';
-$labels['deactivated'] = 'Filter(s) succesvol ingeschakeld.';
+$labels['deactivated'] = 'Filter(s) succesvol uitgeschakeld.';
+$labels['activated'] = 'Filter(s) succesvol ingeschakeld.';
 $labels['moved'] = 'Filter succesvol verplaatst.';
 $labels['moveerror'] = 'Geselecteerde filter(s) konden niet verplaatst worden. Er trad een serverfout op.';
 $labels['nametoolong'] = 'Naam is te lang.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/pl_PL.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/pl_PL.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/pl_PL.inc	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/pl_PL.inc	2012-11-10 15:15:21.000000000 +0100
@@ -149,8 +149,8 @@
 $labels['setcreated'] = 'Zbiór filtrów został utworzony pomyślnie.';
 $labels['activateerror'] = 'Nie można włączyć wybranych filtrów. Błąd serwera.';
 $labels['deactivateerror'] = 'Nie można wyłączyć wybranych filtrów. Błąd serwera.';
-$labels['activated'] = 'Filtr(y) wyłączono pomyślnie.';
-$labels['deactivated'] = 'Filtr(y) włączono pomyślnie.';
+$labels['deactivated'] = 'Filtr(y) wyłączono pomyślnie.';
+$labels['activated'] = 'Filtr(y) włączono pomyślnie.';
 $labels['moved'] = 'Filter został przeniesiony pomyślnie.';
 $labels['moveerror'] = 'Nie można przenieść wybranego filtra. Błąd serwera.';
 $labels['nametoolong'] = 'Zbyt długa nazwa.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/pt_BR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/pt_BR.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/pt_BR.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/pt_BR.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Conjunto de filtros criado com sucesso.';
 $labels['activateerror'] = 'Não foi possível habilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
 $labels['deactivateerror'] = 'Não foi possível desabilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
-$labels['activated'] = 'Filtro(s) desabilitado(s) com sucesso.';
-$labels['deactivated'] = 'Filtro(s) habilitado(s) com sucesso.';
+$labels['deactivated'] = 'Filtro(s) desabilitado(s) com sucesso.';
+$labels['activated'] = 'Filtro(s) habilitado(s) com sucesso.';
 $labels['moved'] = 'Filtro movido com sucesso.';
 $labels['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
 $labels['nametoolong'] = 'Nome muito longo.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/pt_PT.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/pt_PT.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/pt_PT.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/pt_PT.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Conjunto de filtros criado com sucesso.';
 $labels['activateerror'] = 'Não foi possível ativar os filtros selecionados. Ocorreu um erro no servidor.';
 $labels['deactivateerror'] = 'Não foi possível desativar os filtros selecionados. Ocorreu um erro no servidor.';
-$labels['activated'] = 'Filtro(s) desativado(s) com sucesso.';
-$labels['deactivated'] = 'Filtro(s) ativado(s) com sucesso.';
+$labels['deactivated'] = 'Filtro(s) desativado(s) com sucesso.';
+$labels['activated'] = 'Filtro(s) ativado(s) com sucesso.';
 $labels['moved'] = 'Filtro movido com sucesso.';
 $labels['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
 $labels['nametoolong'] = 'Nome demasiado longo.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ro_RO.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ro_RO.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/ro_RO.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ro_RO.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Setul de filtre creat cu succes.';
 $labels['activateerror'] = 'Nu am putut activa filtrele selectate. S-a produs o eroare la server.';
 $labels['deactivateerror'] = 'Nu am putut dezactiva filtrele selectate. S-a produs o eroare la server.';
-$labels['activated'] = 'Filtrele au fost dezactivate cu succes.';
-$labels['deactivated'] = 'Filtrele au fost activate cu succes.';
+$labels['deactivated'] = 'Filtrele au fost dezactivate cu succes.';
+$labels['activated'] = 'Filtrele au fost activate cu succes.';
 $labels['moved'] = 'Filtrele au fost mutate cu succes.';
 $labels['moveerror'] = 'Nu am putut muta filtreele selectate. S-a produs o eroare la server.';
 $labels['nametoolong'] = 'Numele este prea lung.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ru_RU.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ru_RU.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/ru_RU.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ru_RU.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Набор фильтров успешно создан.';
 $labels['activateerror'] = 'Невозможно включить выбранный(е) фильтр(ы). Ошибка сервера.';
 $labels['deactivateerror'] = 'Невозможно выключить выбранный(е) фильтр(ы). Ошибка сервера.';
-$labels['activated'] = 'Фильтр(ы) успешно отключен(ы).';
-$labels['deactivated'] = 'Фильтр(ы) успешно включен(ы).';
+$labels['deactivated'] = 'Фильтр(ы) успешно отключен(ы).';
+$labels['activated'] = 'Фильтр(ы) успешно включен(ы).';
 $labels['moved'] = 'Фильтр успешно перемещён.';
 $labels['moveerror'] = 'Невозможно переместить фильтр. Ошибка сервера.';
 $labels['nametoolong'] = 'Невозможно создать набор фильтров. Название слишком длинное.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/sk_SK.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/sk_SK.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/sk_SK.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/sk_SK.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Sada filtrov bola vytvorená';
 $labels['activateerror'] = 'Nepodarilo sa povoliť vybraný filter(e). Chyba servera.';
 $labels['deactivateerror'] = 'Nepodarilo sa vypnúť vybraný filter(e). Chyba servera.';
-$labels['activated'] = 'Filter(e) úspešne vypnutý.';
-$labels['deactivated'] = 'Filter(e) povolený.';
+$labels['deactivated'] = 'Filter(e) úspešne vypnutý.';
+$labels['activated'] = 'Filter(e) povolený.';
 $labels['moved'] = 'Filter presunutý.';
 $labels['moveerror'] = 'Nemôžem presunúť zvolený filter. Chyba servera.';
 $labels['nametoolong'] = 'Názov sady filtrov je príliš dlhý';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/sl_SI.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/sl_SI.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/sl_SI.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/sl_SI.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Filter je bil uspešno ustvarjen.';
 $labels['activateerror'] = 'Izbranega/ih filtra/ov ni bilo mogoče vključiti. Prišlo je do napake na strežniku.';
 $labels['deactivateerror'] = 'Izbranega/ih fitra/ov ni bilo mogoče izključiti. Prišlo je do napake na strežniku.';
-$labels['activated'] = 'Filtri so bili uspešno onemogočeni.';
-$labels['deactivated'] = 'Filtri so bili uspešno omogočeni.';
+$labels['deactivated'] = 'Filtri so bili uspešno onemogočeni.';
+$labels['activated'] = 'Filtri so bili uspešno omogočeni.';
 $labels['moved'] = 'Filter je bil uspešno premaknjen.';
 $labels['moveerror'] = 'Izbranega filtra ni bilo mogoče premakniti. Prišlo je do napake na strežniku.';
 $labels['nametoolong'] = 'Ime je predolgo.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/sv_SE.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/sv_SE.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/sv_SE.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/sv_SE.inc	2012-11-10 15:15:20.000000000 +0100
@@ -139,8 +139,8 @@
 $labels['setcreated'] = 'Filtergruppen har lagts till';
 $labels['activateerror'] = 'Kunde inte aktivera filter på grund av serverfel.';
 $labels['deactivateerror'] = 'Kunde inte deaktivera filter på grund av serverfel.';
-$labels['activated'] = 'Filter deaktiverat.';
-$labels['deactivated'] = 'Filter aktiverat.';
+$labels['deactivated'] = 'Filter deaktiverat.';
+$labels['activated'] = 'Filter aktiverat.';
 $labels['moved'] = 'Filter flyttat.';
 $labels['moveerror'] = 'Kunde inte flytta filter på grund av serverfel.';
 $labels['nametoolong'] = 'Filtergruppen kan inte läggas till med för långt namn';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/tr_TR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/tr_TR.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/tr_TR.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/tr_TR.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Filtre setleri başarıyla oluşturuldu.';
 $labels['activateerror'] = 'Seçilen filtre(ler) etkinleştirilemedi. Sunucuda hata oluştu.';
 $labels['deactivateerror'] = 'Seçilen filtre(ler) pasifleştirilemedi. Sunucuda hata oluştu.';
-$labels['activated'] = 'Filtre(ler) başarıyla iptal edildi.';
-$labels['deactivated'] = 'Filtre(ler) başarıyla etkinleştirildi.';
+$labels['deactivated'] = 'Filtre(ler) başarıyla iptal edildi.';
+$labels['activated'] = 'Filtre(ler) başarıyla etkinleştirildi.';
 $labels['moved'] = 'Filtre başarıyla taşındı.';
 $labels['moveerror'] = 'Seçilen filtre(ler) taşınamadı. Sunucuda hata oluştu.';
 $labels['nametoolong'] = 'İsim çok uzun.';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/vi_VN.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/vi_VN.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/vi_VN.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/vi_VN.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = 'Thiết lập bộ lọc được tạo thành công';
 $labels['activateerror'] = 'Không thể khởi động bộ lọc được chọn. Có lỗi xuất hiện ở máy chủ';
 $labels['deactivateerror'] = 'Không thể tắt bộ lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
-$labels['activated'] = 'Bộ lọc được tắt thành công';
-$labels['deactivated'] = 'Bộ lọc được khởi động thành công';
+$labels['deactivated'] = 'Bộ lọc được tắt thành công';
+$labels['activated'] = 'Bộ lọc được khởi động thành công';
 $labels['moved'] = 'Bộ lọc được chuyển đi thành công';
 $labels['moveerror'] = 'Không thể chuyển bộc lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
 $labels['nametoolong'] = 'Tên quá dài';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/zh_CN.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/zh_CN.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/zh_CN.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/zh_CN.inc	2012-11-10 15:15:20.000000000 +0100
@@ -138,8 +138,8 @@
 $labels['setcreated'] = '过滤器成功创建。';
 $labels['activateerror'] = '无法启用选中的过滤器，因为服务器发生错误。';
 $labels['deactivateerror'] = '无法禁用选中的过滤器，因为服务器发生错误。';
-$labels['activated'] = '禁用过滤器成功。';
-$labels['deactivated'] = '启用过滤器成功。';
+$labels['deactivated'] = '禁用过滤器成功。';
+$labels['activated'] = '启用过滤器成功。';
 $labels['moved'] = '过滤器移动成功。';
 $labels['moveerror'] = '无法移动选中的过滤器，因为服务器发生错误。';
 $labels['nametoolong'] = '名称太长。';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/zh_TW.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/zh_TW.inc
--- old/roundcubemail-0.8.2/plugins/managesieve/localization/zh_TW.inc	2012-10-05 19:14:21.000000000 +0200
+++ new/roundcubemail-0.8.3/plugins/managesieve/localization/zh_TW.inc	2012-11-10 15:15:20.000000000 +0100
@@ -126,8 +126,8 @@
 $labels['setcreated'] = '篩選器集合成功建立';
 $labels['activateerror'] = '無法啟用選擇的篩選器。伺服器錯誤';
 $labels['deactivateerror'] = '無法停用選擇的篩選器。伺服器錯誤';
-$labels['activated'] = '篩選器已停用';
-$labels['deactivated'] = '篩選器已啟用';
+$labels['deactivated'] = '篩選器已停用';
+$labels['activated'] = '篩選器已啟用';
 $labels['moved'] = '篩選器已移動';
 $labels['moveerror'] = '無法移動選擇的篩選器。伺服器錯誤';
 $labels['nametoolong'] = '無法建立篩選器集合。 名稱太長';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/iniset.php new/roundcubemail-0.8.3/program/include/iniset.php
--- old/roundcubemail-0.8.2/program/include/iniset.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/include/iniset.php	2012-11-10 15:15:21.000000000 +0100
@@ -42,7 +42,7 @@
 }
 
 // application constants
-define('RCMAIL_VERSION', '0.8.2');
+define('RCMAIL_VERSION', '0.8.3');
 define('RCMAIL_CHARSET', 'UTF-8');
 define('JS_OBJECT_NAME', 'rcmail');
 define('RCMAIL_START', microtime(true));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_imap.php new/roundcubemail-0.8.3/program/include/rcube_imap.php
--- old/roundcubemail-0.8.2/program/include/rcube_imap.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/include/rcube_imap.php	2012-11-10 15:15:21.000000000 +0100
@@ -2212,6 +2212,10 @@
             $folder = $this->folder;
         }
 
+        if (!$this->check_connection()) {
+            return false;
+        }
+
         // make sure folder exists
         if ($this->folder_exists($folder)) {
             if ($is_file) {
@@ -4032,6 +4036,11 @@
         return $this->delete_folder($folder);
     }
 
+    function clear_mailbox($folder = null)
+    {
+        return $this->clear_folder($folder);
+    }
+
     public function mailbox_exists($folder, $subscription=false)
     {
         return $this->folder_exists($folder, $subscription);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_imap_generic.php new/roundcubemail-0.8.3/program/include/rcube_imap_generic.php
--- old/roundcubemail-0.8.2/program/include/rcube_imap_generic.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/include/rcube_imap_generic.php	2012-11-10 15:15:21.000000000 +0100
@@ -3590,6 +3590,10 @@
      */
     static function uncompressMessageSet($messages)
     {
+        if (empty($messages)) {
+            return array();
+        }
+
         $result   = array();
         $messages = explode(',', $messages);
 
@@ -3598,7 +3602,7 @@
             $max   = max($items[0], $items[1]);
 
             for ($x=$items[0]; $x<=$max; $x++) {
-                $result[] = $x;
+                $result[] = (int)$x;
             }
             unset($messages[$idx]);
         }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_ldap.php new/roundcubemail-0.8.3/program/include/rcube_ldap.php
--- old/roundcubemail-0.8.2/program/include/rcube_ldap.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/include/rcube_ldap.php	2012-11-10 15:15:21.000000000 +0100
@@ -803,24 +803,26 @@
 
             for ($i = 0; $i < $entries['count']; $i++) {
                 $rec = $this->_ldap2result($entries[$i]);
-                foreach (array('email', 'name') as $f) {
-                    $val = mb_strtolower($rec[$f]);
-                    switch ($mode) {
-                    case 1:
-                        $got = ($val == $search);
-                        break;
-                    case 2:
-                        $got = ($search == substr($val, 0, strlen($search)));
-                        break;
-                    default:
-                        $got = (strpos($val, $search) !== false);
-                        break;
-                    }
+                foreach ($fields as $f) {
+                    foreach ((array)$rec[$f] as $val) {
+                        $val = mb_strtolower($val);
+                        switch ($mode) {
+                        case 1:
+                            $got = ($val == $search);
+                            break;
+                        case 2:
+                            $got = ($search == substr($val, 0, strlen($search)));
+                            break;
+                        default:
+                            $got = (strpos($val, $search) !== false);
+                            break;
+                        }
 
-                    if ($got) {
-                        $this->result->add($rec);
-                        $this->result->count++;
-                        break;
+                        if ($got) {
+                            $this->result->add($rec);
+                            $this->result->count++;
+                            break 2;
+                        }
                     }
                 }
             }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_mdb2.php new/roundcubemail-0.8.3/program/include/rcube_mdb2.php
--- old/roundcubemail-0.8.2/program/include/rcube_mdb2.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/include/rcube_mdb2.php	2012-11-10 15:15:21.000000000 +0100
@@ -288,7 +288,7 @@
         else {
             $params = (array)$params;
             $q = $this->db_handle->prepare($query, null, $mode=='w' ? MDB2_PREPARE_MANIP : null);
-            if ($this->db_handle->isError($q)) {
+            if (MDB2::isError($q)) {
                 $this->db_error = true;
                 $this->db_error_msg = $q->userinfo;
 
@@ -369,7 +369,7 @@
 
         $id = $this->db_handle->lastInsertID($table);
 
-        return $this->db_handle->isError($id) ? null : $id;
+        return MDB2::isError($id) ? null : $id;
     }
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_message.php new/roundcubemail-0.8.3/program/include/rcube_message.php
--- old/roundcubemail-0.8.2/program/include/rcube_message.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/include/rcube_message.php	2012-11-10 15:15:21.000000000 +0100
@@ -211,7 +211,18 @@
                     // HTML part can be on the lower level, if not...
                     if (count($level) > 1) {
                         // It can be an alternative or related message part
-                        $parent = $this->mime_parts[0];
+                        // find parent part
+                        $parent = null;
+                        foreach ($this->mime_parts as $part) {
+                            if ($part->mime_id == $level[0]) {
+                                $parent = $part;
+                            }
+                        }
+
+                        if (!$parent) {
+                            continue;
+                        }
+
                         if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
                             continue;
                         }
@@ -364,6 +375,11 @@
             foreach ($structure->parts as $p => $sub_part) {
                 $sub_mimetype = $sub_part->mimetype;
 
+                // skip empty text parts
+                if (!$sub_part->size && preg_match('#^text/(plain|html|enriched)$#', $sub_mimetype)) {
+                    continue;
+                }
+
                 // check if sub part is
                 if ($sub_mimetype == 'text/plain')
                     $plain_part = $p;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_result_thread.php new/roundcubemail-0.8.3/program/include/rcube_result_thread.php
--- old/roundcubemail-0.8.2/program/include/rcube_result_thread.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/include/rcube_result_thread.php	2012-11-10 15:15:21.000000000 +0100
@@ -478,16 +478,18 @@
             $items = explode(self::SEPARATOR_ITEM, $elem);
             $root  = (int) array_shift($items);
 
-            $result[$elem] = $elem;
-            foreach ($items as $item) {
-                list($lv, $id) = explode(self::SEPARATOR_LEVEL, $item);
+            if ($root) {
+                $result[$root] = $root;
+                foreach ($items as $item) {
+                    list($lv, $id) = explode(self::SEPARATOR_LEVEL, $item);
                     $result[$id] = $root;
+                }
             }
         }
 
         // get only unique roots
         $result = array_filter($result); // make sure there are no nulls
-        $result = array_unique($result, SORT_NUMERIC);
+        $result = array_unique($result);
 
         // Re-sort raw data
         $result = array_fill_keys($result, null);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/js/app.js new/roundcubemail-0.8.3/program/js/app.js
--- old/roundcubemail-0.8.2/program/js/app.js	2012-10-05 19:14:31.000000000 +0200
+++ new/roundcubemail-0.8.3/program/js/app.js	2012-11-10 15:15:39.000000000 +0100
@@ -207,12 +207,13 @@
 "purge","expunge","select-all","select-none","sort","expand-all","expand-unread","collapse-all",!1)),this.message_list&&this.triggerEvent("listupdate",{folder:this.env.mailbox,rowcount:this.message_list.rowcount}));break;case "check-recent":case "getunread":case "search":this.env.qsearch=null;case "list":if("mail"==this.task){if(this.enable_command("show","expunge","select-all","select-none","sort",0<this.env.messagecount),this.enable_command("purge",this.purge_mailbox_test()),this.enable_command("expand-all",
 "expand-unread","collapse-all",this.env.threading&&this.env.messagecount),("list"==a.action||"search"==a.action)&&this.message_list)this.msglist_select(this.message_list),this.triggerEvent("listupdate",{folder:this.env.mailbox,rowcount:this.message_list.rowcount})}else if("addressbook"==this.task&&(this.enable_command("export",this.contact_list&&0<this.contact_list.rowcount),"list"==a.action||"search"==a.action))this.enable_command("search-create",""==this.env.source),this.enable_command("search-delete",
 this.env.search_id),this.update_group_commands(),this.triggerEvent("listupdate",{folder:this.env.source,rowcount:this.contact_list.rowcount})}a.unlock&&this.hide_message(a.unlock);this.triggerEvent("responseafter",{response:a});this.triggerEvent("responseafter"+a.action,{response:a})}};this.http_error=function(a,b,d,e,f){d=a.statusText;this.set_busy(!1,null,e);a.abort();this.unload||(a.status&&d?this.display_message(this.get_label("servererror")+" ("+d+")","error"):"timeout"==b?this.display_message(this.get_label("requesttimedout"),
-"error"):0==a.status&&"abort"!=b&&this.display_message(this.get_label("servererror")+" (No connection)","error"),"keep-alive"==f?setTimeout(function(){j.keep_alive()},3E4):"check-recent"==f&&setTimeout(function(){j.check_for_recent(!1)},3E4))};this.async_upload_form=function(a,b,d){var e=(new Date).getTime(),f="rcmupload"+e;if(this.env.upload_progress_name){var g=this.env.upload_progress_name,h=$("input[name="+g+"]",a);h.length||(h=$("<input>").attr({type:"hidden",name:g}),h.prependTo(a));h.val(e)}document.all?
-document.body.insertAdjacentHTML("BeforeEnd",'<iframe name="'+f+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>'):(g=document.createElement("iframe"),g.name=f,g.style.border="none",g.style.width=0,g.style.height=0,g.style.visibility="hidden",document.body.appendChild(g));$(f).bind("load",{ts:e},d);$(a).attr({target:f,action:this.url(b,{_id:this.env.compose_id||"",_uploadid:e}),method:"POST"}).attr(a.encoding?"encoding":"enctype","multipart/form-data").submit();return f};
-this.start_keepalive=function(){this.env.keep_alive&&!this.env.framed&&(this._int&&clearInterval(this._int),"mail"==this.task&&this.gui_objects.mailboxlist?this._int=setInterval(function(){j.check_for_recent(!1)},1E3*this.env.keep_alive):"login"!=this.task&&"print"!=this.env.action&&(this._int=setInterval(function(){j.keep_alive()},1E3*this.env.keep_alive)))};this.keep_alive=function(){this.busy||this.http_request("keep-alive")};this.check_for_recent=function(a){if(!this.busy){var b,d="_mbox="+urlencode(this.env.mailbox);
-a&&(b=this.set_busy(!0,"checkingmail"),d+="&_refresh=1",this.start_keepalive());this.gui_objects.messagelist&&(d+="&_list=1");this.gui_objects.quotadisplay&&(d+="&_quota=1");this.env.search_request&&(d+="&_search="+this.env.search_request);this.http_request("check-recent",d,b)}};this.get_single_uid=function(){return this.env.uid?this.env.uid:this.message_list?this.message_list.get_single_selection():null};this.get_single_cid=function(){return this.env.cid?this.env.cid:this.contact_list?this.contact_list.get_single_selection():
-null};this.get_caret_pos=function(a){if(void 0!==a.selectionEnd)return a.selectionEnd;if(document.selection&&document.selection.createRange){var b=document.selection.createRange();if(b.parentElement()!=a)return 0;var d=b.duplicate();"TEXTAREA"==a.tagName?d.moveToElementText(a):d.expand("textedit");d.setEndPoint("EndToStart",b);b=d.text.length;return b<=a.value.length?b:-1}return a.value.length};this.set_caret_pos=function(a,b){if(a.setSelectionRange)a.setSelectionRange(b,b);else if(a.createTextRange){var d=
-a.createTextRange();d.collapse(!0);d.moveEnd("character",b);d.moveStart("character",b);d.select()}};this.lock_form=function(a,b){if(a&&a.elements){var d,e,f;b&&(this.disabled_form_elements=[]);d=0;for(e=a.elements.length;d<e;d++)if(f=a.elements[d],"hidden"!=f.type)if(b&&f.disabled)this.disabled_form_elements.push(f);else if(b||this.disabled_form_elements&&0>$.inArray(f,this.disabled_form_elements))f.disabled=b}};this.mailto_handler_uri=function(){return location.href.split("?")[0]+"?_task=mail&_action=compose&_to=%s"};
-this.register_protocol_handler=function(a){try{window.navigator.registerProtocolHandler("mailto",this.mailto_handler_uri(),a)}catch(b){}};this.check_protocol_handler=function(a,b){var d=window.navigator;!d||"function"!=typeof d.registerProtocolHandler||"function"==typeof d.isProtocolHandlerRegistered&&"registered"==d.isProtocolHandlerRegistered("mailto",this.mailto_handler_uri())?$(b).addClass("disabled"):$(b).click(function(){rcmail.register_protocol_handler(a);return!1})}}
-rcube_webmail.long_subject_title=function(j,t){if(!j.title){var a=$(j);a.width()+15*t>a.parent().width()&&(j.title=a.html())}};rcube_webmail.long_subject_title_ie=function(j,t){if(!j.title){var a=$(j),b=$.trim(a.text()),d=$("<span>").text(b).css({position:"absolute","float":"left",visibility:"hidden","font-size":a.css("font-size"),"font-weight":a.css("font-weight")}).appendTo($("body")),e=d.width();d.remove();e+15*t>a.width()&&(j.title=b)}};rcube_webmail.prototype.addEventListener=rcube_event_engine.prototype.addEventListener;
-rcube_webmail.prototype.removeEventListener=rcube_event_engine.prototype.removeEventListener;rcube_webmail.prototype.triggerEvent=rcube_event_engine.prototype.triggerEvent;
+"error"):0==a.status&&"abort"!=b&&this.display_message(this.get_label("servererror")+" (No connection)","error"),a=a.getResponseHeader("Location"),""!=a&&this.redirect(a),"keep-alive"==f?setTimeout(function(){j.keep_alive();j.start_keepalive()},3E4):"check-recent"==f&&setTimeout(function(){j.check_for_recent(!1);j.start_keepalive()},3E4))};this.async_upload_form=function(a,b,d){var e=(new Date).getTime(),f="rcmupload"+e;if(this.env.upload_progress_name){var g=this.env.upload_progress_name,h=$("input[name="+
+g+"]",a);h.length||(h=$("<input>").attr({type:"hidden",name:g}),h.prependTo(a));h.val(e)}document.all?document.body.insertAdjacentHTML("BeforeEnd",'<iframe name="'+f+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>'):(g=document.createElement("iframe"),g.name=f,g.style.border="none",g.style.width=0,g.style.height=0,g.style.visibility="hidden",document.body.appendChild(g));$(f).bind("load",{ts:e},d);$(a).attr({target:f,action:this.url(b,{_id:this.env.compose_id||"",
+_uploadid:e}),method:"POST"}).attr(a.encoding?"encoding":"enctype","multipart/form-data").submit();return f};this.start_keepalive=function(){this.env.keep_alive&&!this.env.framed&&(this._int&&clearInterval(this._int),"mail"==this.task&&this.gui_objects.mailboxlist?this._int=setInterval(function(){j.check_for_recent(!1)},1E3*this.env.keep_alive):"login"!=this.task&&"print"!=this.env.action&&(this._int=setInterval(function(){j.keep_alive()},1E3*this.env.keep_alive)))};this.keep_alive=function(){this.busy||
+this.http_request("keep-alive")};this.check_for_recent=function(a){if(!this.busy){var b,d="_mbox="+urlencode(this.env.mailbox);a&&(b=this.set_busy(!0,"checkingmail"),d+="&_refresh=1",this.start_keepalive());this.gui_objects.messagelist&&(d+="&_list=1");this.gui_objects.quotadisplay&&(d+="&_quota=1");this.env.search_request&&(d+="&_search="+this.env.search_request);this.http_request("check-recent",d,b)}};this.get_single_uid=function(){return this.env.uid?this.env.uid:this.message_list?this.message_list.get_single_selection():
+null};this.get_single_cid=function(){return this.env.cid?this.env.cid:this.contact_list?this.contact_list.get_single_selection():null};this.get_caret_pos=function(a){if(void 0!==a.selectionEnd)return a.selectionEnd;if(document.selection&&document.selection.createRange){var b=document.selection.createRange();if(b.parentElement()!=a)return 0;var d=b.duplicate();"TEXTAREA"==a.tagName?d.moveToElementText(a):d.expand("textedit");d.setEndPoint("EndToStart",b);b=d.text.length;return b<=a.value.length?b:
+-1}return a.value.length};this.set_caret_pos=function(a,b){if(a.setSelectionRange)a.setSelectionRange(b,b);else if(a.createTextRange){var d=a.createTextRange();d.collapse(!0);d.moveEnd("character",b);d.moveStart("character",b);d.select()}};this.lock_form=function(a,b){if(a&&a.elements){var d,e,f;b&&(this.disabled_form_elements=[]);d=0;for(e=a.elements.length;d<e;d++)if(f=a.elements[d],"hidden"!=f.type)if(b&&f.disabled)this.disabled_form_elements.push(f);else if(b||this.disabled_form_elements&&0>$.inArray(f,
+this.disabled_form_elements))f.disabled=b}};this.mailto_handler_uri=function(){return location.href.split("?")[0]+"?_task=mail&_action=compose&_to=%s"};this.register_protocol_handler=function(a){try{window.navigator.registerProtocolHandler("mailto",this.mailto_handler_uri(),a)}catch(b){}};this.check_protocol_handler=function(a,b){var d=window.navigator;!d||"function"!=typeof d.registerProtocolHandler||"function"==typeof d.isProtocolHandlerRegistered&&"registered"==d.isProtocolHandlerRegistered("mailto",
+this.mailto_handler_uri())?$(b).addClass("disabled"):$(b).click(function(){rcmail.register_protocol_handler(a);return!1})}}rcube_webmail.long_subject_title=function(j,t){if(!j.title){var a=$(j);a.width()+15*t>a.parent().width()&&(j.title=a.html())}};
+rcube_webmail.long_subject_title_ie=function(j,t){if(!j.title){var a=$(j),b=$.trim(a.text()),d=$("<span>").text(b).css({position:"absolute","float":"left",visibility:"hidden","font-size":a.css("font-size"),"font-weight":a.css("font-weight")}).appendTo($("body")),e=d.width();d.remove();e+15*t>a.width()&&(j.title=b)}};rcube_webmail.prototype.addEventListener=rcube_event_engine.prototype.addEventListener;rcube_webmail.prototype.removeEventListener=rcube_event_engine.prototype.removeEventListener;
+rcube_webmail.prototype.triggerEvent=rcube_event_engine.prototype.triggerEvent;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/js/app.js.src new/roundcubemail-0.8.3/program/js/app.js.src
--- old/roundcubemail-0.8.2/program/js/app.js.src	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/js/app.js.src	2012-11-10 15:15:21.000000000 +0100
@@ -6141,11 +6141,16 @@
     else if (request.status == 0 && status != 'abort')
       this.display_message(this.get_label('servererror') + ' (No connection)', 'error');
 
+    // redirect to url specified in location header if not empty
+    var location_url = request.getResponseHeader("Location");
+    if (location_url != '')
+      this.redirect(location_url);
+
     // re-send keep-alive requests after 30 seconds
     if (action == 'keep-alive')
-      setTimeout(function(){ ref.keep_alive(); }, 30000);
+      setTimeout(function(){ ref.keep_alive(); ref.start_keepalive(); }, 30000);
     else if (action == 'check-recent')
-      setTimeout(function(){ ref.check_for_recent(false); }, 30000);
+      setTimeout(function(){ ref.check_for_recent(false); ref.start_keepalive(); }, 30000);
   };
 
   // post the given form to a hidden iframe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/lib/washtml.php new/roundcubemail-0.8.3/program/lib/washtml.php
--- old/roundcubemail-0.8.2/program/lib/washtml.php	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/lib/washtml.php	2012-11-10 15:15:21.000000000 +0100
@@ -102,7 +102,7 @@
     'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight',
     'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border',
     'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace',
-    'cellborder', 'size', 'lang', 'dir', 'usemap',
+    'cellborder', 'size', 'lang', 'dir', 'usemap', 'shape',
     // attributes of form elements
     'type', 'rows', 'cols', 'disabled', 'readonly', 'checked', 'multiple', 'value'
   );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/steps/addressbook/save.inc new/roundcubemail-0.8.3/program/steps/addressbook/save.inc
--- old/roundcubemail-0.8.2/program/steps/addressbook/save.inc	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/steps/addressbook/save.inc	2012-11-10 15:15:21.000000000 +0100
@@ -183,18 +183,24 @@
     $insert_id = $plugin['result'];
 
   if ($insert_id) {
+    $CONTACTS->reset();
+
     // add new contact to the specified group
     if ($CONTACTS->groups && $CONTACTS->group_id) {
       $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array(
         'group_id' => $CONTACTS->group_id, 'ids' => $insert_id, 'source' => $source));
 
+      $counts = $CONTACTS->count();
+
       if (!$plugin['abort']) {
-        if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + 1 > $maxnum))
+        if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($counts->count + 1 > $maxnum))
           $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
 
         $CONTACTS->add_to_group($gid, $plugin['ids']);
       }
     }
+    else
+      $counts = $CONTACTS->count();
 
     if ((string)$source === (string)$orig_source) {
       // add contact row or jump to the page where it should appear
@@ -206,7 +212,7 @@
 
       // update record count display
       $CONTACTS->reset();
-      $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text());
+      $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text($counts));
     }
     else {
       // re-set iframe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/steps/mail/compose.inc new/roundcubemail-0.8.3/program/steps/mail/compose.inc
--- old/roundcubemail-0.8.2/program/steps/mail/compose.inc	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/steps/mail/compose.inc	2012-11-10 15:15:21.000000000 +0100
@@ -415,11 +415,11 @@
   else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
     // get drafted headers
     if ($header=='to' && !empty($MESSAGE->headers->to))
-      $fvalue = $MESSAGE->get_header('to');
+      $fvalue = $MESSAGE->get_header('to', true);
     else if ($header=='cc' && !empty($MESSAGE->headers->cc))
-      $fvalue = $MESSAGE->get_header('cc');
+      $fvalue = $MESSAGE->get_header('cc', true);
     else if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
-      $fvalue = $MESSAGE->get_header('bcc');
+      $fvalue = $MESSAGE->get_header('bcc', true);
     else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to']))
       $fvalue = $MESSAGE->get_header('mail-reply-to');
     else if ($header=='replyto' && !empty($MESSAGE->headers->replyto))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/steps/mail/func.inc new/roundcubemail-0.8.3/program/steps/mail/func.inc
--- old/roundcubemail-0.8.2/program/steps/mail/func.inc	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/steps/mail/func.inc	2012-11-10 15:15:21.000000000 +0100
@@ -1234,7 +1234,7 @@
 
   // modify HTML links to open a new window if clicked
   $GLOBALS['rcmail_html_container_id'] = $container_id;
-  $body = preg_replace_callback('/<(a|link)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body);
+  $body = preg_replace_callback('/<(a|link|area)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body);
   unset($GLOBALS['rcmail_html_container_id']);
 
   $body = preg_replace(array(
@@ -1347,7 +1347,11 @@
     $attrib['target'] = '_blank';
   }
 
-  return "<$tag" . html::attrib_string($attrib, array('href','name','target','onclick','id','class','style','title','rel','type','media')) . $end;
+  // allowed attributes for a|link|area tags
+  $allow = array('href','name','target','onclick','id','class','style','title',
+    'rel','type','media','alt','coords','nohref','hreflang','shape');
+
+  return "<$tag" . html::attrib_string($attrib, $allow) . $end;
 }
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/steps/mail/sendmail.inc new/roundcubemail-0.8.3/program/steps/mail/sendmail.inc
--- old/roundcubemail-0.8.2/program/steps/mail/sendmail.inc	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/program/steps/mail/sendmail.inc	2012-11-10 15:15:22.000000000 +0100
@@ -75,13 +75,18 @@
 // get identity record
 function rcmail_get_identity($id)
 {
-  global $RCMAIL, $OUTPUT;
+  global $RCMAIL, $message_charset;
 
   if ($sql_arr = $RCMAIL->user->get_identity($id)) {
     $out = $sql_arr;
+
+    if ($message_charset != RCMAIL_CHARSET) {
+      foreach ($out as $k => $v)
+        $out[$k] = rcube_charset_convert($v, RCMAIL_CHARSET, $message_charset);
+    }
+
     $out['mailto'] = $sql_arr['email'];
-    $out['string'] = format_email_recipient($sql_arr['email'],
-      rcube_charset_convert($sql_arr['name'], RCMAIL_CHARSET, $OUTPUT->get_charset()));
+    $out['string'] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
 
     return $out;
   }
@@ -100,7 +105,7 @@
  */
 function rcmail_fix_emoticon_paths(&$mime_message)
 {
-  global $CONFIG;
+  global $RCMAIL;
 
   $body = $mime_message->getHTMLBody();
 
@@ -125,8 +130,9 @@
 
         if (! in_array($image_name, $included_images)) {
           // add the image to the MIME message
-          if (! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name))
-            $OUTPUT->show_message("emoticonerror", 'error');
+          if (!$mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) {
+            $RCMAIL->output->show_message("emoticonerror", 'error');
+          }
           array_push($included_images, $image_name);
         }
 
@@ -428,6 +434,7 @@
   if ($CONFIG['spellcheck_before_send'] && $CONFIG['enable_spellcheck']
     && empty($COMPOSE['spell_checked']) && !empty($message_body)
   ) {
+    $message_body = str_replace("\r\n", "\n", $message_body);
     $spellchecker = new rcube_spellchecker(get_input_value('_lang', RCUBE_INPUT_GPC));
     $spell_result = $spellchecker->check($message_body, $isHtml);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/skins/classic/mail.css new/roundcubemail-0.8.3/skins/classic/mail.css
--- old/roundcubemail-0.8.2/skins/classic/mail.css	2012-10-05 19:14:22.000000000 +0200
+++ new/roundcubemail-0.8.3/skins/classic/mail.css	2012-11-10 15:15:22.000000000 +0100
@@ -299,7 +299,6 @@
   bottom: 0px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
-  overflow: hidden;
 }
 
 #messagecontframe
@@ -359,7 +358,6 @@
   bottom: 0;
   border: 1px solid #999;
   background-color: #F9F9F9;
-  overflow: hidden;
 }
 
 #mailboxlist

++++++ roundcubemail-config-dir.patch ++++++
--- /var/tmp/diff_new_pack.spZQdP/_old	2012-11-12 07:06:01.000000000 +0100
+++ /var/tmp/diff_new_pack.spZQdP/_new	2012-11-12 07:06:01.000000000 +0100
@@ -1,5 +1,5 @@
 diff --git a/installer/index.php b/installer/index.php
-index bb1b1ba..572ef80 100644
+index 4c94fea..204cdf4 100644
 --- a/installer/index.php
 +++ b/installer/index.php
 @@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
@@ -8,27 +8,19 @@
  define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
 -define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
 +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+ define('RCMAIL_CHARSET', 'UTF-8');
  
  $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
- $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
 diff --git a/program/include/iniset.php b/program/include/iniset.php
-index f223b0d..630001f 100644
+index 3809479..5004448 100644
 --- a/program/include/iniset.php
 +++ b/program/include/iniset.php
-@@ -46,15 +46,12 @@ define('RCMAIL_VERSION', '0.8.1');
- define('RCMAIL_CHARSET', 'UTF-8');
- define('JS_OBJECT_NAME', 'rcmail');
- define('RCMAIL_START', microtime(true));
-+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
- 
- if (!defined('INSTALL_PATH')) {
-     define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
+@@ -52,7 +52,7 @@ if (!defined('INSTALL_PATH')) {
  }
  
--if (!defined('RCMAIL_CONFIG_DIR')) {
+ if (!defined('RCMAIL_CONFIG_DIR')) {
 -    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
--}
--
++    define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+ }
+ 
  // make sure path_separator is defined
- if (!defined('PATH_SEPARATOR')) {
-     define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit roundcubemail for openSUSE:Factory

root＠hilbert.suse.de