Merge branch 'master' into future

* master: (45 commits)
  TarLib code cleanup
  TarLib: fixed appending in non-dynamic mode
  fixed third method of adding files in TarLib
  fix lone zero block in TarLib created archives
  fix use of constructor in TarLib
  Slovak language update
  Korean language update
  Latvian language update
  removed redundant variables in tpl_include_page() (because of 3ff8773b)
  added cut off points for mobile devices as parameters to style.ini
  Corrected typo: ruke -> rule
  Persian language update
  Spanish language update
  russian language update
  Kazach language update
  correctly check hash parameter in media dispatcher FS#2648
  avoid broken browser_uid on IE
  Removed acronyms for "Perl" and "PERL" as Perl is not an acronym. See http://learn.perl.org/faq/perlfaq1.html#Whats-the-difference-between-perl-and-Perl-
  Made striplangs.php executable
  release preparations
  ...

4 files changed, 6 insertions, 2 deletions

diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php
index db91b73c6..ded7d7369 100644
--- a/lib/plugins/plugin/lang/es/lang.php
+++ b/lib/plugins/plugin/lang/es/lang.php
@@ -23,6 +23,7 @@
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
  */
 $lang['menu']                  = 'Administración de Plugins';
 $lang['download']              = 'Descargar e instalar un nuevo plugin';
@@ -66,6 +67,6 @@ $lang['error_copy']            = 'Hubo un error al copiar el fichero mientras se
 $lang['error_delete']          = 'Hubo un error al intentar eliminar el plugin <em>%s</em>. La causa más probable es que no se cuente con los permisos necesarios en el fichero o en el directorio';
 $lang['enabled']               = 'Plugin %s habilitado.';
 $lang['notenabled']            = 'Plugin %s no puede ser habilitado, verifica los permisos del archivo.';
-$lang['disabled']              = 'Plugin %s desabilitado.';
-$lang['notdisabled']           = 'Plugin %s no puede ser desabilitado, verifica los permisos de archivo.';
+$lang['disabled']              = 'Plugin %s deshabilitado.';
+$lang['notdisabled']           = 'Plugin %s no puede ser deshabilitado, verifica los permisos de archivo.';
 $lang['packageinstalled']      = 'Plugin (%d plugin(s): %s) instalado exitosamente.';
diff --git a/lib/plugins/plugin/lang/eu/lang.php b/lib/plugins/plugin/lang/eu/lang.php
index 56c03325f..2fc07fef9 100644
--- a/lib/plugins/plugin/lang/eu/lang.php
+++ b/lib/plugins/plugin/lang/eu/lang.php
@@ -3,6 +3,7 @@
  * Basque language file
  *
  * @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
  */
 $lang['menu']                  = 'Plugin-ak Kudeatu';
 $lang['download']              = 'Plugin berri bat deskargatu eta instalatu';
diff --git a/lib/plugins/plugin/lang/fa/lang.php b/lib/plugins/plugin/lang/fa/lang.php
index dbfe9ef9a..bc43ee3ef 100644
--- a/lib/plugins/plugin/lang/fa/lang.php
+++ b/lib/plugins/plugin/lang/fa/lang.php
@@ -8,6 +8,7 @@
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
  */
 $lang['menu']                  = 'مدیریت افزونه‌ها';
 $lang['download']              = 'دریافت و نصب افزونه';
diff --git a/lib/plugins/plugin/lang/lv/lang.php b/lib/plugins/plugin/lang/lv/lang.php
index 0f6103899..9a8727875 100644
--- a/lib/plugins/plugin/lang/lv/lang.php
+++ b/lib/plugins/plugin/lang/lv/lang.php
@@ -48,3 +48,4 @@ $lang['enabled']               = 'Modulis %s pieslēgts.';
 $lang['notenabled']            = 'Moduli %s nevar pieslēgt, pārbaudi failu tiesības.';
 $lang['disabled']              = 'Modulis %s atslēgts.';
 $lang['notdisabled']           = 'Moduli %s nevar atslēgt, pārbaudi failu tiesības.';
+$lang['packageinstalled']      = 'Moduļu paka (pavisam kopā %d: %s) veiksmīgi uzstādīti.';