Merge branch 'master' into dev

2025-08-15 01:24:40 +02:00 · 2016-01-27 18:48:28 +03:00
parent 4908967f67 46378701aa
commit bc36876eac
15 changed files with 169 additions and 170 deletions
--- a/plugins/box/editor/languages/es.lang.php
+++ b/plugins/box/editor/languages/es.lang.php
@@ -3,6 +3,6 @@
    return array(
        'Editor' => array(
            'Editor' => 'Editor',
-            'Editor plugin' => 'Plugin editor',
+            'Editor plugin' => 'Editor plugin',
        )
-    );
+    );